diff --git a/SHADE_CSharp/premake5.lua b/SHADE_CSharp/premake5.lua index 8844b84c..f735b515 100644 --- a/SHADE_CSharp/premake5.lua +++ b/SHADE_CSharp/premake5.lua @@ -53,15 +53,16 @@ project "SHADE_CSharp" function configElementCS(cfg) _p(2,'Debug;Release;Publish') end - function docsElementCS(cfg) - _p(2,'true') - end - function docsLocationElementCS(cfg) - _p(2,'$(OutDir)') - end + -- function docsElementCS(cfg) + -- _p(2,'true') + -- end + -- function docsLocationElementCS(cfg) + -- _p(2,'$(OutDir)') + -- end premake.override(premake.vstudio.cs2005.elements, "projectProperties", function (oldfn, cfg) return table.join(oldfn(cfg), { - platformsElementCS, configElementCS, docsElementCS, docsLocationElementCS, +-- platformsElementCS, configElementCS, docsElementCS, docsLocationElementCS, + platformsElementCS, configElementCS, }) end) \ No newline at end of file diff --git a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp index 94c133dd..38d44984 100644 --- a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp +++ b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp @@ -47,14 +47,14 @@ namespace SHADE { // Get the current scene graph to traverse and update const auto& SCENE_GRAPH = SHSceneManager::GetCurrentSceneGraph(); - UpdateEntity(SCENE_GRAPH.GetRoot(), !IsRunInEditorPause); + UpdateEntity(SCENE_GRAPH.GetRoot(), false); } void SHTransformSystem::TransformPostPhysicsUpdate::Execute(double) noexcept { // Get the current scene graph to traverse and update const auto& SCENE_GRAPH = SHSceneManager::GetCurrentSceneGraph(); - UpdateEntity(SCENE_GRAPH.GetRoot(), IsRunInEditorPause); + UpdateEntity(SCENE_GRAPH.GetRoot(), true); } void SHTransformSystem::Init() diff --git a/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp b/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp index 45f236f3..24bd2f81 100644 --- a/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp +++ b/SHADE_Engine/src/Physics/System/SHPhysicsSystemRoutines.cpp @@ -302,9 +302,12 @@ namespace SHADE { colliderComponent->position = WORLD_POS; colliderComponent->orientation = WORLD_ROT; - colliderComponent->scale = WORLD_SCL; - colliderComponent->RecomputeCollisionShapes(); + if (colliderComponent->scale != WORLD_SCL) + { + colliderComponent->scale = WORLD_SCL; + colliderComponent->RecomputeCollisionShapes(); + } } } @@ -325,7 +328,11 @@ namespace SHADE if (physicsObject.GetRigidBody()->isActive()) physicsObject.prevTransform = CURRENT_TF; - // Sync with rigid bodies. If an object doesn't have a rigidbody, no update is needed here as it is done in pre-update. + // Skip sleeping objects + if (physicsObject.GetRigidBody()->isSleeping()) + return; + + // Sync with rigid bodies if (rigidBodyComponent && SHSceneManager::CheckNodeAndComponentsActive(physicsObject.entityID)) { // Skip static bodies diff --git a/SHADE_Managed/premake5.lua b/SHADE_Managed/premake5.lua index 463e80b8..9253c81b 100644 --- a/SHADE_Managed/premake5.lua +++ b/SHADE_Managed/premake5.lua @@ -119,14 +119,14 @@ project "SHADE_Managed" links{"librttr_core.lib"} links{"fmodstudio_vc.lib", "fmod_vc.lib"} - require "vstudio" + -- require "vstudio" - function docsElementCPP(cfg) - _p(3,'true') - end + -- function docsElementCPP(cfg) + -- _p(3,'true') + -- end - premake.override(premake.vstudio.vc2010.elements, "clCompile", function (oldfn, cfg) - return table.join(oldfn(cfg), { - docsElementCPP, - }) - end) \ No newline at end of file + -- premake.override(premake.vstudio.vc2010.elements, "clCompile", function (oldfn, cfg) + -- return table.join(oldfn(cfg), { + -- docsElementCPP, + -- }) + -- end) \ No newline at end of file