diff --git a/include/core/types.h b/include/core/types.h index ee93b7d..5e5b619 100644 --- a/include/core/types.h +++ b/include/core/types.h @@ -3,7 +3,6 @@ #include #include #include -#include namespace extra2d { diff --git a/include/extra2d.h b/include/extra2d.h index 1f5b758..5081969 100644 --- a/include/extra2d.h +++ b/include/extra2d.h @@ -26,8 +26,7 @@ #include #include #include -#include - +#include // Scene #include diff --git a/include/renderer/render_command.h b/include/renderer/render_command.h index 6f7521c..38aed2a 100644 --- a/include/renderer/render_command.h +++ b/include/renderer/render_command.h @@ -4,11 +4,13 @@ #include #include #include -#include -#include #include +#include +#include +#include #include + namespace extra2d { // 前向声明 @@ -20,39 +22,39 @@ class FontAtlas; */ enum class RenderCommandType : uint8_t { None = 0, - Sprite, // 精灵绘制 - Line, // 线条绘制 - Rect, // 矩形绘制 - FilledRect, // 填充矩形 - Circle, // 圆形绘制 - FilledCircle, // 填充圆形 - Triangle, // 三角形绘制 + Sprite, // 精灵绘制 + Line, // 线条绘制 + Rect, // 矩形绘制 + FilledRect, // 填充矩形 + Circle, // 圆形绘制 + FilledCircle, // 填充圆形 + Triangle, // 三角形绘制 FilledTriangle, // 填充三角形 - Polygon, // 多边形绘制 - FilledPolygon, // 填充多边形 - Text, // 文本绘制 - Custom // 自定义绘制 + Polygon, // 多边形绘制 + FilledPolygon, // 填充多边形 + Text, // 文本绘制 + Custom // 自定义绘制 }; /** * @brief 精灵渲染命令数据 */ struct SpriteCommandData { - const Texture* texture; + const Texture *texture; Rect destRect; Rect srcRect; Color tint; float rotation; Vec2 anchor; - uint32_t sortKey; // 用于自动排序的键值 - - SpriteCommandData() - : texture(nullptr), destRect(), srcRect(), tint(Colors::White), - rotation(0.0f), anchor(0.0f, 0.0f), sortKey(0) {} - SpriteCommandData(const Texture* tex, const Rect& dest, const Rect& src, - const Color& t, float rot, const Vec2& anc, uint32_t key) - : texture(tex), destRect(dest), srcRect(src), tint(t), - rotation(rot), anchor(anc), sortKey(key) {} + uint32_t sortKey; // 用于自动排序的键值 + + SpriteCommandData() + : texture(nullptr), destRect(), srcRect(), tint(Colors::White), + rotation(0.0f), anchor(0.0f, 0.0f), sortKey(0) {} + SpriteCommandData(const Texture *tex, const Rect &dest, const Rect &src, + const Color &t, float rot, const Vec2 &anc, uint32_t key) + : texture(tex), destRect(dest), srcRect(src), tint(t), rotation(rot), + anchor(anc), sortKey(key) {} }; /** @@ -63,10 +65,10 @@ struct LineCommandData { Vec2 end; Color color; float width; - + LineCommandData() : start(), end(), color(Colors::White), width(1.0f) {} - LineCommandData(const Vec2& s, const Vec2& e, const Color& c, float w) - : start(s), end(e), color(c), width(w) {} + LineCommandData(const Vec2 &s, const Vec2 &e, const Color &c, float w) + : start(s), end(e), color(c), width(w) {} }; /** @@ -77,10 +79,11 @@ struct RectCommandData { Color color; float width; bool filled; - - RectCommandData() : rect(), color(Colors::White), width(1.0f), filled(false) {} - RectCommandData(const Rect& r, const Color& c, float w, bool f) - : rect(r), color(c), width(w), filled(f) {} + + RectCommandData() + : rect(), color(Colors::White), width(1.0f), filled(false) {} + RectCommandData(const Rect &r, const Color &c, float w, bool f) + : rect(r), color(c), width(w), filled(f) {} }; /** @@ -93,11 +96,13 @@ struct CircleCommandData { int segments; float width; bool filled; - - CircleCommandData() : center(), radius(0.0f), color(Colors::White), - segments(32), width(1.0f), filled(false) {} - CircleCommandData(const Vec2& c, float r, const Color& col, int seg, float w, bool f) - : center(c), radius(r), color(col), segments(seg), width(w), filled(f) {} + + CircleCommandData() + : center(), radius(0.0f), color(Colors::White), segments(32), width(1.0f), + filled(false) {} + CircleCommandData(const Vec2 &c, float r, const Color &col, int seg, float w, + bool f) + : center(c), radius(r), color(col), segments(seg), width(w), filled(f) {} }; /** @@ -108,11 +113,12 @@ struct TriangleCommandData { Color color; float width; bool filled; - - TriangleCommandData() : p1(), p2(), p3(), color(Colors::White), - width(1.0f), filled(false) {} - TriangleCommandData(const Vec2& a, const Vec2& b, const Vec2& c, const Color& col, float w, bool f) - : p1(a), p2(b), p3(c), color(col), width(w), filled(f) {} + + TriangleCommandData() + : p1(), p2(), p3(), color(Colors::White), width(1.0f), filled(false) {} + TriangleCommandData(const Vec2 &a, const Vec2 &b, const Vec2 &c, + const Color &col, float w, bool f) + : p1(a), p2(b), p3(c), color(col), width(w), filled(f) {} }; /** @@ -123,21 +129,21 @@ struct PolygonCommandData { Color color; float width; bool filled; - + PolygonCommandData() : color(Colors::White), width(1.0f), filled(false) {} - PolygonCommandData(std::vector pts, const Color& col, float w, bool f) - : points(std::move(pts)), color(col), width(w), filled(f) {} + PolygonCommandData(std::vector pts, const Color &col, float w, bool f) + : points(std::move(pts)), color(col), width(w), filled(f) {} }; /** * @brief 文本渲染命令数据 */ struct TextCommandData { - const FontAtlas* font; + const FontAtlas *font; std::string text; Vec2 position; Color color; - + TextCommandData() : font(nullptr), text(), position(), color(Colors::White) {} }; @@ -147,33 +153,29 @@ struct TextCommandData { */ struct RenderCommand { RenderCommandType type; - uint32_t layer; // 渲染层级，用于排序 - uint32_t order; // 提交顺序，保证同层级内稳定排序 - glm::mat4 transform; // 变换矩阵 - + uint32_t layer; // 渲染层级，用于排序 + uint32_t order; // 提交顺序，保证同层级内稳定排序 + glm::mat4 transform; // 变换矩阵 + // 使用 variant 存储具体数据 - std::variant< - SpriteCommandData, - LineCommandData, - RectCommandData, - CircleCommandData, - TriangleCommandData, - PolygonCommandData, - TextCommandData - > data; - - RenderCommand() : type(RenderCommandType::None), layer(0), order(0), - transform(1.0f) {} - + std::variant + data; + + RenderCommand() + : type(RenderCommandType::None), layer(0), order(0), transform(1.0f) {} + // 便捷构造函数 - static RenderCommand makeSprite(const Texture* tex, const Rect& dest, - const Rect& src, const Color& tint, - float rot = 0.0f, const Vec2& anc = Vec2(0, 0), - uint32_t lyr = 0); - static RenderCommand makeLine(const Vec2& s, const Vec2& e, const Color& c, - float w = 1.0f, uint32_t lyr = 0); - static RenderCommand makeRect(const Rect& r, const Color& c, - float w = 1.0f, bool fill = false, uint32_t lyr = 0); + static RenderCommand makeSprite(const Texture *tex, const Rect &dest, + const Rect &src, const Color &tint, + float rot = 0.0f, + const Vec2 &anc = Vec2(0, 0), + uint32_t lyr = 0); + static RenderCommand makeLine(const Vec2 &s, const Vec2 &e, const Color &c, + float w = 1.0f, uint32_t lyr = 0); + static RenderCommand makeRect(const Rect &r, const Color &c, float w = 1.0f, + bool fill = false, uint32_t lyr = 0); }; /** @@ -184,41 +186,41 @@ class RenderCommandBuffer { public: static constexpr size_t INITIAL_CAPACITY = 1024; static constexpr size_t MAX_CAPACITY = 65536; - + RenderCommandBuffer(); ~RenderCommandBuffer(); - + // 添加渲染命令 - void addCommand(const RenderCommand& cmd); - void addCommand(RenderCommand&& cmd); - + void addCommand(const RenderCommand &cmd); + void addCommand(RenderCommand &&cmd); + // 批量添加（预留空间后使用） - RenderCommand& emplaceCommand(); - + RenderCommand &emplaceCommand(); + // 排序命令（按纹理、层级等） void sortCommands(); - + // 清空缓冲区 void clear(); - + // 获取命令列表 - const std::vector& getCommands() const { return commands_; } - std::vector& getCommands() { return commands_; } - + const std::vector &getCommands() const { return commands_; } + std::vector &getCommands() { return commands_; } + // 统计 size_t size() const { return commands_.size(); } bool empty() const { return commands_.empty(); } size_t capacity() const { return commands_.capacity(); } - + // 预分配空间 void reserve(size_t capacity); - + private: std::vector commands_; uint32_t nextOrder_; - + // 排序比较函数 - static bool compareCommands(const RenderCommand& a, const RenderCommand& b); + static bool compareCommands(const RenderCommand &a, const RenderCommand &b); }; } // namespace extra2d diff --git a/include/renderer/shader_system.h b/include/renderer/shader.h similarity index 100% rename from include/renderer/shader_system.h rename to include/renderer/shader.h diff --git a/include/renderer/shader_preset.h b/include/renderer/shader_preset.h deleted file mode 100644 index 146f25e..0000000 --- a/include/renderer/shader_preset.h +++ /dev/null @@ -1,319 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -namespace extra2d { - -struct WaterParams { - float waveSpeed = 1.0f; - float waveAmplitude = 0.02f; - float waveFrequency = 4.0f; -}; - -struct OutlineParams { - Color color = Colors::Black; - float thickness = 2.0f; -}; - -struct DistortionParams { - float distortionAmount = 0.02f; - float timeScale = 1.0f; -}; - -struct PixelateParams { - float pixelSize = 8.0f; -}; - -struct InvertParams { - float strength = 1.0f; -}; - -struct GrayscaleParams { - float intensity = 1.0f; -}; - -struct BlurParams { - float radius = 5.0f; -}; - -namespace ShaderSource { - -static const char* StandardVert = R"( -#version 300 es -precision highp float; -layout(location = 0) in vec2 a_position; -layout(location = 1) in vec2 a_texCoord; -layout(location = 2) in vec4 a_color; - -uniform mat4 u_viewProjection; -uniform mat4 u_model; - -out vec2 v_texCoord; -out vec4 v_color; - -void main() { - gl_Position = u_viewProjection * u_model * vec4(a_position, 0.0, 1.0); - v_texCoord = a_texCoord; - v_color = a_color; -} -)"; - -static const char* StandardFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform float u_opacity; - -out vec4 fragColor; - -void main() { - vec4 texColor = texture(u_texture, v_texCoord); - fragColor = texColor * v_color; - fragColor.a *= u_opacity; - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -static const char* WaterFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform float u_waveSpeed; -uniform float u_waveAmplitude; -uniform float u_waveFrequency; -uniform float u_time; - -out vec4 fragColor; - -void main() { - vec2 uv = v_texCoord; - - // 水波纹效果 - float wave = sin(uv.y * u_waveFrequency + u_time * u_waveSpeed) * u_waveAmplitude; - uv.x += wave; - - vec4 texColor = texture(u_texture, uv); - fragColor = texColor * v_color; - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -static const char* OutlineFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform vec4 u_outlineColor; -uniform float u_thickness; -uniform vec2 u_textureSize; - -out vec4 fragColor; - -void main() { - vec4 color = texture(u_texture, v_texCoord); - - // 简单的描边检测 - float alpha = 0.0; - vec2 offset = u_thickness / u_textureSize; - - alpha += texture(u_texture, v_texCoord + vec2(-offset.x, 0.0)).a; - alpha += texture(u_texture, v_texCoord + vec2(offset.x, 0.0)).a; - alpha += texture(u_texture, v_texCoord + vec2(0.0, -offset.y)).a; - alpha += texture(u_texture, v_texCoord + vec2(0.0, offset.y)).a; - - if (color.a < 0.1 && alpha > 0.0) { - fragColor = u_outlineColor; - } else { - fragColor = color; - } - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -static const char* DistortionFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform float u_distortionAmount; -uniform float u_time; -uniform float u_timeScale; - -out vec4 fragColor; - -void main() { - vec2 uv = v_texCoord; - - // 扭曲效果 - float t = u_time * u_timeScale; - float dx = sin(uv.y * 10.0 + t) * u_distortionAmount; - float dy = cos(uv.x * 10.0 + t) * u_distortionAmount; - uv += vec2(dx, dy); - - vec4 texColor = texture(u_texture, uv); - fragColor = texColor * v_color; - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -static const char* PixelateFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform float u_pixelSize; -uniform vec2 u_textureSize; -uniform float u_opacity; - -out vec4 fragColor; - -void main() { - vec2 pixel = u_pixelSize / u_textureSize; - vec2 uv = floor(v_texCoord / pixel) * pixel + pixel * 0.5; - - vec4 texColor = texture(u_texture, uv); - fragColor = texColor * v_color; - fragColor.a *= u_opacity; - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -static const char* InvertFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform float u_strength; -uniform float u_opacity; - -out vec4 fragColor; - -void main() { - vec4 texColor = texture(u_texture, v_texCoord) * v_color; - vec3 inverted = vec3(1.0) - texColor.rgb; - texColor.rgb = mix(texColor.rgb, inverted, u_strength); - - fragColor = texColor; - fragColor.a *= u_opacity; - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -static const char* GrayscaleFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform float u_intensity; -uniform float u_opacity; - -out vec4 fragColor; - -void main() { - vec4 texColor = texture(u_texture, v_texCoord) * v_color; - - float gray = dot(texColor.rgb, vec3(0.299, 0.587, 0.114)); - texColor.rgb = mix(texColor.rgb, vec3(gray), u_intensity); - - fragColor = texColor; - fragColor.a *= u_opacity; - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -static const char* BlurFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; -in vec4 v_color; - -uniform sampler2D u_texture; -uniform float u_radius; -uniform vec2 u_textureSize; -uniform float u_opacity; - -out vec4 fragColor; - -void main() { - vec2 texel = u_radius / u_textureSize; - - vec4 sum = vec4(0.0); - sum += texture(u_texture, v_texCoord + texel * vec2(-1.0, -1.0)); - sum += texture(u_texture, v_texCoord + texel * vec2( 0.0, -1.0)); - sum += texture(u_texture, v_texCoord + texel * vec2( 1.0, -1.0)); - sum += texture(u_texture, v_texCoord + texel * vec2(-1.0, 0.0)); - sum += texture(u_texture, v_texCoord + texel * vec2( 0.0, 0.0)); - sum += texture(u_texture, v_texCoord + texel * vec2( 1.0, 0.0)); - sum += texture(u_texture, v_texCoord + texel * vec2(-1.0, 1.0)); - sum += texture(u_texture, v_texCoord + texel * vec2( 0.0, 1.0)); - sum += texture(u_texture, v_texCoord + texel * vec2( 1.0, 1.0)); - - vec4 texColor = sum / 9.0; - fragColor = texColor * v_color; - fragColor.a *= u_opacity; - - if (fragColor.a < 0.01) { - discard; - } -} -)"; - -} // namespace ShaderSource - -class ShaderPreset { -public: - static Ptr Water(const WaterParams& params); - static Ptr Outline(const OutlineParams& params); - static Ptr Distortion(const DistortionParams& params); - static Ptr Pixelate(const PixelateParams& params); - static Ptr Invert(const InvertParams& params); - static Ptr Grayscale(const GrayscaleParams& params); - static Ptr Blur(const BlurParams& params); - - static Ptr GrayscaleOutline(const GrayscaleParams& grayParams, - const OutlineParams& outlineParams); - static Ptr PixelateInvert(const PixelateParams& pixParams, - const InvertParams& invParams); -}; - -} // namespace extra2d diff --git a/src/renderer/shader_preset.cpp b/src/renderer/shader_preset.cpp deleted file mode 100644 index b1bf3cb..0000000 --- a/src/renderer/shader_preset.cpp +++ /dev/null @@ -1,231 +0,0 @@ -#include -#include - -namespace extra2d { - -// ============================================================================ -// ShaderPreset实现 -// ============================================================================ - -Ptr ShaderPreset::Water(const WaterParams ¶ms) { - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, - ShaderSource::WaterFrag)) { - E2D_ERROR("编译水波纹Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_waveSpeed", params.waveSpeed); - shader->setFloat("u_waveAmplitude", params.waveAmplitude); - shader->setFloat("u_waveFrequency", params.waveFrequency); - - E2D_INFO("创建水波纹Shader预设"); - return shader; -} - -Ptr ShaderPreset::Outline(const OutlineParams ¶ms) { - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, - ShaderSource::OutlineFrag)) { - E2D_ERROR("编译描边Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setVec4("u_outlineColor", glm::vec4(params.color.r, params.color.g, - params.color.b, params.color.a)); - shader->setFloat("u_thickness", params.thickness); - - E2D_INFO("创建描边Shader预设"); - return shader; -} - -Ptr ShaderPreset::Distortion(const DistortionParams ¶ms) { - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, - ShaderSource::DistortionFrag)) { - E2D_ERROR("编译扭曲Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_distortionAmount", params.distortionAmount); - shader->setFloat("u_timeScale", params.timeScale); - - E2D_INFO("创建扭曲Shader预设"); - return shader; -} - -Ptr ShaderPreset::Pixelate(const PixelateParams ¶ms) { - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, - ShaderSource::PixelateFrag)) { - E2D_ERROR("编译像素化Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_pixelSize", params.pixelSize); - - E2D_INFO("创建像素化Shader预设"); - return shader; -} - -Ptr ShaderPreset::Invert(const InvertParams ¶ms) { - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, - ShaderSource::InvertFrag)) { - E2D_ERROR("编译反相Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_strength", params.strength); - - E2D_INFO("创建反相Shader预设"); - return shader; -} - -Ptr ShaderPreset::Grayscale(const GrayscaleParams ¶ms) { - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, - ShaderSource::GrayscaleFrag)) { - E2D_ERROR("编译灰度Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_intensity", params.intensity); - - E2D_INFO("创建灰度Shader预设"); - return shader; -} - -Ptr ShaderPreset::Blur(const BlurParams ¶ms) { - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, - ShaderSource::BlurFrag)) { - E2D_ERROR("编译模糊Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_radius", params.radius); - - E2D_INFO("创建模糊Shader预设"); - return shader; -} - -Ptr -ShaderPreset::GrayscaleOutline(const GrayscaleParams &grayParams, - const OutlineParams &outlineParams) { - // 创建组合效果的片段着色器 (GLES 3.2) - const char *combinedFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; - -uniform sampler2D u_texture; -uniform float u_grayIntensity; -uniform vec4 u_outlineColor; -uniform float u_thickness; -uniform vec2 u_textureSize; - -out vec4 fragColor; - -void main() { - vec4 color = texture(u_texture, v_texCoord); - - // 灰度效果 - float gray = dot(color.rgb, vec3(0.299, 0.587, 0.114)); - color.rgb = mix(color.rgb, vec3(gray), u_grayIntensity); - - // 描边效果 - float alpha = 0.0; - vec2 offset = u_thickness / u_textureSize; - - alpha += texture(u_texture, v_texCoord + vec2(-offset.x, 0.0)).a; - alpha += texture(u_texture, v_texCoord + vec2(offset.x, 0.0)).a; - alpha += texture(u_texture, v_texCoord + vec2(0.0, -offset.y)).a; - alpha += texture(u_texture, v_texCoord + vec2(0.0, offset.y)).a; - - if (color.a < 0.1 && alpha > 0.0) { - fragColor = u_outlineColor; - } else { - fragColor = color; - } -} -)"; - - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, combinedFrag)) { - E2D_ERROR("编译灰度+描边Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_grayIntensity", grayParams.intensity); - shader->setVec4("u_outlineColor", - glm::vec4(outlineParams.color.r, outlineParams.color.g, - outlineParams.color.b, outlineParams.color.a)); - shader->setFloat("u_thickness", outlineParams.thickness); - - E2D_INFO("创建灰度+描边组合Shader预设"); - return shader; -} - -Ptr ShaderPreset::PixelateInvert(const PixelateParams &pixParams, - const InvertParams &invParams) { - // 创建组合效果的片段着色器 (GLES 3.2) - const char *combinedFrag = R"( -#version 300 es -precision highp float; -in vec2 v_texCoord; - -uniform sampler2D u_texture; -uniform float u_pixelSize; -uniform vec2 u_textureSize; -uniform float u_invertStrength; - -out vec4 fragColor; - -void main() { - // 像素化 - vec2 pixel = u_pixelSize / u_textureSize; - vec2 uv = floor(v_texCoord / pixel) * pixel + pixel * 0.5; - - vec4 color = texture(u_texture, uv); - - // 反相 - vec3 inverted = 1.0 - color.rgb; - color.rgb = mix(color.rgb, inverted, u_invertStrength); - - fragColor = color; -} -)"; - - auto shader = std::make_shared(); - - if (!shader->compileFromSource(ShaderSource::StandardVert, combinedFrag)) { - E2D_ERROR("编译像素化+反相Shader失败"); - return nullptr; - } - - // 设置默认参数 - shader->setFloat("u_pixelSize", pixParams.pixelSize); - shader->setFloat("u_invertStrength", invParams.strength); - - E2D_INFO("创建像素化+反相组合Shader预设"); - return shader; -} - -} // namespace extra2d diff --git a/src/renderer/shader_system.cpp b/src/renderer/shader_system.cpp index 84c6303..718b4d0 100644 --- a/src/renderer/shader_system.cpp +++ b/src/renderer/shader_system.cpp @@ -1,9 +1,10 @@ #include -#include -#include #include +#include #include #include +#include + #ifdef _WIN32 #include