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

Merge conflict

This commit is contained in:
maverickdgg 2022-11-01 15:35:50 +08:00
parent d917159f67
commit a45432ef66
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SHADE_Managed/src/Engine/Time.cxx
View File

@ -34,6 +34,7 @@ namespace SHADE
float Time::DeltaTimeF::get() float Time::DeltaTimeF::get()
{ {
return static_cast<float>(SHFrameRateController::GetRawDeltaTime()); return static_cast<float>(SHFrameRateController::GetRawDeltaTime());
}
double Time::FixedDeltaTime::get() double Time::FixedDeltaTime::get()
{ {
return SHPhysicsSystemInterface::GetFixedDT(); return SHPhysicsSystemInterface::GetFixedDT();

1
SHADE_Managed/src/Engine/Time.hxx
View File

@ -41,6 +41,7 @@ namespace SHADE
static property float DeltaTimeF static property float DeltaTimeF
{ {
float get(); float get();
}
/// <summary> /// <summary>
/// Time taken for Physics simulations. You should use this for operations /// Time taken for Physics simulations. You should use this for operations
/// within Script.FixedUpdate() /// within Script.FixedUpdate()