Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use fixed time count

Browse source
This commit is contained in:
Sezz 2025-03-22 12:13:52 +11:00
parent 4045f0c46d
commit 41f5118cba
3 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TombEngine/Game/collision/Interaction.cpp
View file

@ -140,7 +140,7 @@ namespace TEN::Collision::Interaction
// Set interactor parameters.
interactor.Animation.Velocity = Vector3::Zero;
interactor.OffsetBlend.SetLogarithmic(absPosOffset, absOrientOffset, OFFSET_BLEND_ALPHA);
interactor.OffsetBlend.SetSmooth(absPosOffset, absOrientOffset, OFFSET_BLEND_ALPHA);
// Set player parameters.
if (interactor.IsLara())
@ -168,7 +168,7 @@ namespace TEN::Collision::Interaction
player.Control.WaterStatus != WaterStatus::Wade)
{
SetLatchInteraction(interactor, interactable, basis, routine);
TENLog("SetWalkInteraction(): player not grounded. Setting latch interaction instead.", LogLevel::Warning);
TENLog("SetWalkInteraction(): Player not grounded. Setting latch interaction instead.", LogLevel::Warning);
return;
}
@ -182,7 +182,7 @@ namespace TEN::Collision::Interaction
// FAILSAFE.
SetLatchInteraction(interactor, interactable, basis, routine);
TENLog("SetWalkInteraction(): non-player passed as interactor. Setting latch interaction instead.", LogLevel::Warning);
TENLog("SetWalkInteraction(): Non-player passed as interactor. Setting latch interaction instead.", LogLevel::Warning);
}
void SetInteraction(ItemInfo& interactor, ItemInfo& interactable, const InteractionBasis& basis, const InteractionRoutine& routine, InteractionType type)

33
TombEngine/Game/items.cpp
View file

@ -44,18 +44,18 @@ void OffsetBlendData::SetLinear(const Vector3& posOffset, const EulerAngles& ori
{
Mode = OffsetBlendMode::Linear;
IsActive = true;
DelayTime = std::round(delayInSec / DELTA_TIME);
TimeDelay = (int)std::round(delayInSec / (float)FPS);
PosOffset = posOffset / vel;
OrientOffset = orientOffset / turnRate;
}
void OffsetBlendData::SetLogarithmic(const Vector3& posOffset, const EulerAngles& orientOffset, float alpha, float delayInSec)
void OffsetBlendData::SetSmooth(const Vector3& posOffset, const EulerAngles& orientOffset, float alpha, float delayInSec)
{
alpha = std::clamp(alpha, 0.0f, 1.0f);
Mode = OffsetBlendMode::Logarithmic;
Mode = OffsetBlendMode::Smooth;
IsActive = true;
DelayTime = std::round(delayInSec / DELTA_TIME);
TimeDelay = (int)std::round(delayInSec / (float)FPS);
PosOffset = posOffset;
OrientOffset = orientOffset;
Alpha = alpha;
@ -69,8 +69,8 @@ void OffsetBlendData::Clear()
void OffsetBlendData::DrawDebug() const
{
g_Renderer.PrintDebugMessage("IsActive: %d", IsActive);
g_Renderer.PrintDebugMessage("TimeAcive: %.3f", TimeActive);
g_Renderer.PrintDebugMessage("DelayTime: %.3f", DelayTime);
g_Renderer.PrintDebugMessage("TimeAcive: %d", TimeActive);
g_Renderer.PrintDebugMessage("DelayTime: %d", TimeDelay);
g_Renderer.PrintDebugMessage("PosOffset: %.3f, %.3f, %.3f", PosOffset.x, PosOffset.y, PosOffset.z);
g_Renderer.PrintDebugMessage("OrientOffset: %.3f, %.3f, %.3f", TO_DEGREES(OrientOffset.x), TO_DEGREES(OrientOffset.y), TO_DEGREES(OrientOffset.z));
g_Renderer.PrintDebugMessage("Alpha: %.3f", Alpha);
@ -82,7 +82,7 @@ void ItemInfo::HandleOffsetBlend()
if (IsLara())
{
g_Renderer.PrintDebugMessage("Interacted item number: %d", GetLaraInfo(*this).Context.InteractedItem);
g_Renderer.PrintDebugMessage("Interacted moveable ID: %d", GetLaraInfo(*this).Context.InteractedItem);
OffsetBlend.DrawDebug();
}
@ -90,18 +90,18 @@ void ItemInfo::HandleOffsetBlend()
if (!OffsetBlend.IsActive)
return;
// Update delay.
if (OffsetBlend.DelayTime > 0.0f)
// Update time delay.
if (OffsetBlend.TimeDelay > 0)
{
OffsetBlend.DelayTime -= 1.0f;// DELTA_TIME;
if (OffsetBlend.DelayTime < 0.0f)
OffsetBlend.DelayTime = 0.0f;
OffsetBlend.TimeDelay--;
if (OffsetBlend.TimeDelay < 0)
OffsetBlend.TimeDelay = 0;
return;
}
// Update time active.
OffsetBlend.TimeActive += 1.0f;// DELTA_TIME;
OffsetBlend.TimeActive++;
// Handle offset blend.
switch (OffsetBlend.Mode)
@ -112,7 +112,7 @@ void ItemInfo::HandleOffsetBlend()
break;
case OffsetBlendMode::Logarithmic:
case OffsetBlendMode::Smooth:
{
// Calculate offset steps.
auto posOffsetStep = Vector3::Lerp(Vector3::Zero, OffsetBlend.PosOffset, OffsetBlend.Alpha);
@ -133,13 +133,12 @@ void ItemInfo::HandleOffsetBlend()
break;
}
// Offset blend complete; apply remainig values and clear data.
// Offset blending complete; apply remaining offset and clear.
if ((OffsetBlend.PosOffset.Length() <= EPSILON && EulerAngles::Compare(OffsetBlend.OrientOffset, EulerAngles::Identity)) ||
OffsetBlend.TimeActive >= (int)round(TIME_ACTIVE_MAX * FPS))
OffsetBlend.TimeActive >= (int)round(TIME_ACTIVE_MAX * (float)FPS))
{
Pose.Position += OffsetBlend.PosOffset;
Pose.Orientation += OffsetBlend.OrientOffset;
OffsetBlend.Clear();
}
}

17
TombEngine/Game/items.h
View file

@ -60,23 +60,22 @@ enum AIObjectType
enum class OffsetBlendMode
{
Linear,
Logarithmic
Smooth
};
struct OffsetBlendData
{
OffsetBlendMode Mode = OffsetBlendMode::Linear;
bool IsActive = false;
float TimeActive = 0.0f;
float DelayTime = 0.0f;
OffsetBlendMode Mode = OffsetBlendMode::Linear;
bool IsActive = false;
int TimeActive = 0; // Time in game frames.
int TimeDelay = 0; // Time in game frames.
Vector3 PosOffset = Vector3::Zero;
EulerAngles OrientOffset = EulerAngles::Identity;
float Alpha = 0.0f;
void SetLinear(const Vector3& posOffset, const EulerAngles& orientOffset, float vel, short turnRate, float delayInSec = 0.0f);
void SetLogarithmic(const Vector3& posOffset, const EulerAngles& orientOffset, float alpha, float delayInSec = 0.0f);
void SetSmooth(const Vector3& posOffset, const EulerAngles& orientOffset, float alpha, float delayInSec = 0.0f);
void Clear();
void DrawDebug() const;
@ -177,10 +176,10 @@ struct ItemInfo
short AfterDeath = 0;
short CarriedItem = 0;
// OCB utilities
void HandleOffsetBlend();
// OCB utilities
bool TestOcb(short ocbFlags) const;
void RemoveOcb(short ocbFlags);
void ClearAllOcb();