xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge remote-tracking branch 'origin/PlayerControllerWIthNewPhysics' into PlayerControllerWIthNewPhysics

This commit is contained in:
Glence 2023-03-04 00:05:34 +08:00
parent daad6699f1 c4d2091b99
commit 0c4f154c24
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SHADE_Engine/src/Camera/SHCameraSystem.cpp
View File

@ -558,7 +558,7 @@ namespace SHADE
} }
#else #else
return SHVec2{ GetDirector(index)->GetWidth(),GetDirector(index)->GetHeight() }; return SHVec2{ GetDirector(index)->GetWidth(),GetDirector(index)->GetWidth() / screenAspectRatio };
#endif #endif
} }

2
SHADE_Engine/src/Physics/System/Routines/SHPhysicsDebugDrawRoutine.cpp
View File

@ -36,6 +36,7 @@ namespace SHADE
void SHPhysicsDebugDrawSystem::PhysicsDebugDraw::Execute(double) noexcept void SHPhysicsDebugDrawSystem::PhysicsDebugDraw::Execute(double) noexcept
{ {
#ifdef SHEDITOR
auto* physicsDebugDrawSystem = reinterpret_cast<SHPhysicsDebugDrawSystem*>(GetSystem()); auto* physicsDebugDrawSystem = reinterpret_cast<SHPhysicsDebugDrawSystem*>(GetSystem());
if (!physicsDebugDrawSystem->IsDebugDrawActive()) if (!physicsDebugDrawSystem->IsDebugDrawActive())
@ -109,6 +110,7 @@ namespace SHADE
debugDrawSystem->DrawWireCube(TRS, AABB_COLOUR); debugDrawSystem->DrawWireCube(TRS, AABB_COLOUR);
} }
} }
#endif
} }
} // namespace SHADE } // namespace SHADE