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

Merge remote-tracking branch 'origin/main' into SP3-2-Physics

This commit is contained in:
Diren D Bharwani 2023-03-06 17:56:52 +08:00
parent 78a3bf4575 99f7c3c799
commit 8506298fd3
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SHADE_Application/src/Application/SBApplication.cpp
View File

@ -179,9 +179,6 @@ namespace Sandbox
// Link up SHDebugDraw // Link up SHDebugDraw
SHDebugDraw::Init(SHSystemManager::GetSystem<SHDebugDrawSystem>()); SHDebugDraw::Init(SHSystemManager::GetSystem<SHDebugDrawSystem>());
auto clip = SHResourceManager::LoadOrGet<SHAnimationClip>(77816045);
auto rig = SHResourceManager::LoadOrGet<SHRig>(77816045);
} }
void SBApplication::Update(void) void SBApplication::Update(void)

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

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