birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)

Browse Source 
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.

* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
 - updated parts to use the time conversion functions.
 - in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
This commit is contained in:
amzn-sean
2021-11-15 12:11:58 +00:00
committed by GitHub
parent 0ada8b335b
commit 38a03817bb
142 changed files with 1215 additions and 2090 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
+22 -25
View File
@@ -6,12 +6,12 @@
*
*/
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Math/Quaternion.h>
#include <AzCore/Math/Transform.h>
#include <AzCore/Component/ComponentApplicationBus.h>
#include <AzCore/Component/TransformBus.h>
#include <AzCore/Time/ITime.h>
#include <AzFramework/Components/CameraBus.h>
#include "MathConversion.h"
@@ -24,7 +24,6 @@
#include "GotoTrack.h"
#include "CaptureTrack.h"
#include "ISystem.h"
#include "ITimer.h"
#include "AnimAZEntityNode.h"
#include "AnimComponentNode.h"
#include "Movie.h"
@@ -198,7 +197,6 @@ CAnimSceneNode::CAnimSceneNode(const int id)
m_lastCaptureKey = -1;
m_bLastCapturingEnded = true;
m_captureFrameCount = 0;
m_cvar_t_FixedStep = NULL;
m_pCamNodeOnHoldForInterp = 0;
m_CurrentSelectTrack = 0;
m_CurrentSelectTrackKeyNumber = 0;
@@ -303,7 +301,6 @@ void CAnimSceneNode::Activate(bool bActivate)
pSequenceTrack->GetKey(currKey, &key);
IAnimSequence* pSequence = GetSequenceFromSequenceKey(key);
if (pSequence)
{
if (bActivate)
@@ -328,11 +325,6 @@ void CAnimSceneNode::Activate(bool bActivate)
}
}
}
if (m_cvar_t_FixedStep == NULL)
{
m_cvar_t_FixedStep = gEnv->pConsole->GetCVar("t_FixedStep");
}
}
//////////////////////////////////////////////////////////////////////////
@@ -421,14 +413,15 @@ void CAnimSceneNode::Animate(SAnimContext& ec)
timeScale = .0f;
}
// if set, disable fixed time step cvar so timewarping will have an affect. We never set it back though - that is
// likely a bug!
if (m_cvar_t_FixedStep && m_cvar_t_FixedStep->GetFVal() != .0f)
if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
{
m_cvar_t_FixedStep->Set(.0f);
m_simulationTickOverrideBackup = timeSystem->GetSimulationTickDeltaOverride();
// if set, disable fixed time step cvar so timewarping will have an affect.
timeSystem->SetSimulationTickDeltaOverride(AZ::Time::ZeroTimeMs);
m_timeScaleBackup = timeSystem->GetSimulationTickScale();
timeSystem->SetSimulationTickScale(timeScale);
}
gEnv->pTimer->SetTimeScale(timeScale, ITimer::eTSC_Trackview);
}
break;
case AnimParamType::FixedTimeStep:
@@ -439,9 +432,12 @@ void CAnimSceneNode::Animate(SAnimContext& ec)
{
timeStep = 0;
}
if (m_cvar_t_FixedStep)
if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
{
m_cvar_t_FixedStep->Set(timeStep);
m_simulationTickOverrideBackup = timeSystem->GetSimulationTickDeltaOverride();
// if set, disable fixed time step cvar so timewarping will have an affect.
timeSystem->SetSimulationTickDeltaOverride(AZ::SecondsToTimeMs(timeStep));
}
}
break;
@@ -621,17 +617,18 @@ void CAnimSceneNode::OnReset()
m_bLastCapturingEnded = true;
m_captureFrameCount = 0;
if (GetTrackForParameter(AnimParamType::TimeWarp))
if (auto* timeSystem = AZ::Interface<AZ::ITime>::Get())
{
gEnv->pTimer->SetTimeScale(1.0f, ITimer::eTSC_Trackview);
if (m_cvar_t_FixedStep)
if (GetTrackForParameter(AnimParamType::TimeWarp))
{
m_cvar_t_FixedStep->Set(0);
timeSystem->SetSimulationTickScale(m_timeScaleBackup);
timeSystem->SetSimulationTickDeltaOverride(m_simulationTickOverrideBackup);
}
if (GetTrackForParameter(AnimParamType::FixedTimeStep))
{
timeSystem->SetSimulationTickDeltaOverride(m_simulationTickOverrideBackup);
}
}
if (GetTrackForParameter(AnimParamType::FixedTimeStep) && m_cvar_t_FixedStep)
{
m_cvar_t_FixedStep->Set(0);
}
}