From 8743ae52fa13969cf3a7d233e97a3c8fc03fba03 Mon Sep 17 00:00:00 2001 From: Diren D Bharwani Date: Fri, 3 Mar 2023 21:38:57 +0800 Subject: [PATCH 1/3] Fixed errors with publish build in physics debug draw --- .../src/Physics/System/Routines/SHPhysicsDebugDrawRoutine.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SHADE_Engine/src/Physics/System/Routines/SHPhysicsDebugDrawRoutine.cpp b/SHADE_Engine/src/Physics/System/Routines/SHPhysicsDebugDrawRoutine.cpp index efb412f7..b263df71 100644 --- a/SHADE_Engine/src/Physics/System/Routines/SHPhysicsDebugDrawRoutine.cpp +++ b/SHADE_Engine/src/Physics/System/Routines/SHPhysicsDebugDrawRoutine.cpp @@ -36,6 +36,7 @@ namespace SHADE void SHPhysicsDebugDrawSystem::PhysicsDebugDraw::Execute(double) noexcept { +#ifdef SHEDITOR auto* physicsDebugDrawSystem = reinterpret_cast(GetSystem()); if (!physicsDebugDrawSystem->IsDebugDrawActive()) @@ -109,6 +110,7 @@ namespace SHADE debugDrawSystem->DrawWireCube(TRS, AABB_COLOUR); } } +#endif } } // namespace SHADE From 98d0021b326c82ff83722625b0dcde428fdeee33 Mon Sep 17 00:00:00 2001 From: SHAM-DP Date: Fri, 3 Mar 2023 21:57:20 +0800 Subject: [PATCH 2/3] sheditor ifdef checks --- .../src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp | 2 ++ SHADE_Engine/src/Editor/SHEditor.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp b/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp index a0aaf0fa..a6e506b5 100644 --- a/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp +++ b/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp @@ -376,7 +376,9 @@ namespace SHADE { if(editor->LoadScene(asset->id)) { +#ifdef SHEDITOR editor->editorConfig->workingSceneID = asset->id; +#endif } } break; diff --git a/SHADE_Engine/src/Editor/SHEditor.cpp b/SHADE_Engine/src/Editor/SHEditor.cpp index 346bfbed..6d71f98d 100644 --- a/SHADE_Engine/src/Editor/SHEditor.cpp +++ b/SHADE_Engine/src/Editor/SHEditor.cpp @@ -592,8 +592,10 @@ namespace SHADE { //Load the scene sceneToLoad = 0; +#ifdef SHEDITOR editorConfig->workingSceneID = assetID; SHConfigurationManager::SaveEditorConfig(); +#endif SHSceneManager::RestartScene(assetID); return true; } From c4d2091b994cb46df1f8d9417339f08009553d83 Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Fri, 3 Mar 2023 23:54:16 +0800 Subject: [PATCH 3/3] Camera system update for line without editor --- SHADE_Engine/src/Camera/SHCameraSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SHADE_Engine/src/Camera/SHCameraSystem.cpp b/SHADE_Engine/src/Camera/SHCameraSystem.cpp index bbda90f8..3b07ad4c 100644 --- a/SHADE_Engine/src/Camera/SHCameraSystem.cpp +++ b/SHADE_Engine/src/Camera/SHCameraSystem.cpp @@ -560,7 +560,7 @@ namespace SHADE } #else - return SHVec2{ GetDirector(index)->GetWidth(),GetDirector(index)->GetHeight() }; + return SHVec2{ GetDirector(index)->GetWidth(),GetDirector(index)->GetWidth() / screenAspectRatio }; #endif }