diff --git a/GlitchyEngine/BeefProj.toml b/GlitchyEngine/BeefProj.toml index c6a7464..ad26236 100644 --- a/GlitchyEngine/BeefProj.toml +++ b/GlitchyEngine/BeefProj.toml @@ -1,11 +1,9 @@ FileVersion = 1 -Dependencies = {GlitchLog = "*", corlib = "*", DirectX = "*", DirectXTK = "*", FreeType = "*", cgltf-beef = "*", msdfgen-beef = "*", ImGui = "*", ImGuiImplDX11 = "*", ImGuiImplWin32 = "*", ImGuizmo = "*", Beefy2D = "*"} +Dependencies = {GlitchLog = "*", corlib = "*", DirectX = "*", DirectXTK = "*", FreeType = "*", cgltf-beef = "*", msdfgen-beef = "*", ImGui = "*", ImGuiImplDX11 = "*", ImGuiImplWin32 = "*", ImGuizmo = "*", Beefy2D = "*", LodePng = "*"} [Project] Name = "GlitchyEngine" - -[Configs.Debug.Win64] -PreprocessorMacros = ["DEBUG", "GE_GRAPHICS_DX11", "GE_PROFILE", "GE_SHADER_MATRIX_MISMATCH_IS_ERROR", "GE_SHADER_VAR_TYPE_MISMATCH_IS_ERROR", "GE_SHADER_UNUSED_VARIABLE_IS_WARNING"] +ProcessorMacros = ["GE_GRAPHICS_DX11", "GE_PROFILE", "GE_SHADER_MATRIX_MISMATCH_IS_ERROR", "GE_SHADER_VAR_TYPE_MISMATCH_IS_ERROR", "GE_SHADER_UNUSED_VARIABLE_IS_WARNING", "GE_WINDOWS"] [Configs.Paranoid.Win32] PreprocessorMacros = ["DEBUG", "PARANOID", "GE_WINDOWS"] @@ -16,9 +14,6 @@ PreprocessorMacros = ["DEBUG", "PARANOID", "GE_WINDOWS"] [Configs.Release.Win32] PreprocessorMacros = ["RELEASE", "GE_WINDOWS"] -[Configs.Release.Win64] -PreprocessorMacros = ["RELEASE", "GE_WINDOWS"] - [Configs.Test.Win32] PreprocessorMacros = ["TEST", "GE_WINDOWS"] diff --git a/GlitchyEngine/src/Renderer/Renderer2D.bf b/GlitchyEngine/src/Renderer/Renderer2D.bf index bccb4d4..548fe44 100644 --- a/GlitchyEngine/src/Renderer/Renderer2D.bf +++ b/GlitchyEngine/src/Renderer/Renderer2D.bf @@ -280,7 +280,9 @@ namespace GlitchyEngine.Renderer public static void Deinit() { +#if DEBUG Log.EngineLogger.AssertDebug(s_initialized, "Renderer2D was not initialized."); +#endif FontRenderer.Deinit(); @@ -311,8 +313,10 @@ namespace GlitchyEngine.Renderer public static void BeginScene(OrthographicCamera camera, DrawOrder drawOrder = .SortByTexture, Effect effect = null, Effect circleEffect = null) { +#if DEBUG Log.EngineLogger.AssertDebug(s_initialized, "Renderer2D was not initialized."); Log.EngineLogger.AssertDebug(!s_sceneRunning, "You have to call EndScene before you can make another call to BeginScene."); +#endif //s_textureColorEffect.Bind(Renderer._context); @@ -348,7 +352,9 @@ namespace GlitchyEngine.Renderer public static void EndScene() { +#if DEBUG Log.EngineLogger.AssertDebug(s_sceneRunning, "Missing call of BeginScene."); +#endif Flush(); #if DEBUG @@ -358,7 +364,9 @@ namespace GlitchyEngine.Renderer public static void Flush() { +#if DEBUG Log.EngineLogger.AssertDebug(s_sceneRunning, "Missing call of BeginScene."); +#endif if(s_drawOrder != .Immediate) DrawDeferred(); @@ -575,8 +583,10 @@ namespace GlitchyEngine.Renderer public static void DrawQuad(Vector3 position, Vector2 size, float rotation, Texture2D texture, ColorRGBA color = .White, Vector4 uvTransform = .(0, 0, 1, 1)) { +#if DEBUG Log.EngineLogger.AssertDebug(s_sceneRunning, "Missing call of BeginScene."); - +#endif + Matrix transform = Matrix.Translation(position) * Matrix.RotationZ(rotation) * Matrix.Scaling(size.X, size.Y, 1.0f); QueueQuadInstance(transform, color, texture, position.Z, uvTransform); @@ -611,7 +621,9 @@ namespace GlitchyEngine.Renderer public static void DrawCircle(Vector3 position, Vector2 size, Texture2D texture, ColorRGBA color = .White, float innerRadius = 1.0f, Vector4 uvTransform = .(0, 0, 1, 1)) { +#if DEBUG Log.EngineLogger.AssertDebug(s_sceneRunning, "Missing call of BeginScene."); +#endif Matrix transform = Matrix.Translation(position) * Matrix.Scaling(size.X, size.Y, 1.0f); diff --git a/GlitchyEngine/vendor/gltf b/GlitchyEngine/vendor/gltf index 16335c0..d881f98 160000 --- a/GlitchyEngine/vendor/gltf +++ b/GlitchyEngine/vendor/gltf @@ -1 +1 @@ -Subproject commit 16335c09bf06602f7ca9d91a690ab97065ebe037 +Subproject commit d881f985c239e529df2c1faa51efa0e437b07229