summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-06-28 13:57:05 +0200
committerwithmorten <morten.with@gmail.com>2021-06-28 13:57:05 +0200
commitd17d437de319ca4c388dc724cffea91702d3a699 (patch)
tree806104fa5fe0e994cd7f55f1b7b48dc64a998c44 /src/peds
parentRedo ReadSaveBuf + common.h cleanup (diff)
downloadre3-d17d437de319ca4c388dc724cffea91702d3a699.tar
re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.gz
re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.bz2
re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.lz
re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.xz
re3-d17d437de319ca4c388dc724cffea91702d3a699.tar.zst
re3-d17d437de319ca4c388dc724cffea91702d3a699.zip
Diffstat (limited to '')
-rw-r--r--src/peds/PedFight.cpp6
-rw-r--r--src/peds/PedIK.cpp16
-rw-r--r--src/peds/Population.cpp2
3 files changed, 12 insertions, 12 deletions
diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp
index 9ea0ae4e..7bcf6b6c 100644
--- a/src/peds/PedFight.cpp
+++ b/src/peds/PedFight.cpp
@@ -3915,7 +3915,7 @@ CPed::DriveVehicle(void)
targetLRLean = 0.0f;
timeBlend = Pow(0.86f, CTimer::GetTimeStep());
} else {
- targetLRLean = clamp(bike->m_fLeanLRAngle / bike->pBikeHandling->fFullAnimLean, -1.0f, 1.0f);
+ targetLRLean = Clamp(bike->m_fLeanLRAngle / bike->pBikeHandling->fFullAnimLean, -1.0f, 1.0f);
timeBlend = Pow(0.86f, CTimer::GetTimeStep());
}
@@ -4102,7 +4102,7 @@ CPed::DriveVehicle(void)
lDriveAssoc->blendAmount = 0.0f;
if (rDriveAssoc)
- rDriveAssoc->blendAmount = clamp(steerAngle * -100.0f / 61.0f, 0.0f, 1.0f);
+ rDriveAssoc->blendAmount = Clamp(steerAngle * -100.0f / 61.0f, 0.0f, 1.0f);
else if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_STD_BOAT_DRIVE_RIGHT);
else if (m_pMyVehicle->bLowVehicle)
@@ -4115,7 +4115,7 @@ CPed::DriveVehicle(void)
rDriveAssoc->blendAmount = 0.0f;
if (lDriveAssoc)
- lDriveAssoc->blendAmount = clamp(steerAngle * 100.0f / 61.0f, 0.0f, 1.0f);
+ lDriveAssoc->blendAmount = Clamp(steerAngle * 100.0f / 61.0f, 0.0f, 1.0f);
else if (m_pMyVehicle->IsBoat() && !(m_pMyVehicle->pHandling->Flags & HANDLING_SIT_IN_BOAT))
CAnimManager::AddAnimation(GetClump(), ASSOCGRP_STD, ANIM_STD_BOAT_DRIVE_LEFT);
else if (m_pMyVehicle->bLowVehicle)
diff --git a/src/peds/PedIK.cpp b/src/peds/PedIK.cpp
index 475e04f1..6730d731 100644
--- a/src/peds/PedIK.cpp
+++ b/src/peds/PedIK.cpp
@@ -79,7 +79,7 @@ CPedIK::MoveLimb(LimbOrientation &limb, float targetYaw, float targetPitch, Limb
}
if (limb.yaw > moveInfo.maxYaw || limb.yaw < moveInfo.minYaw) {
- limb.yaw = clamp(limb.yaw, moveInfo.minYaw, moveInfo.maxYaw);
+ limb.yaw = Clamp(limb.yaw, moveInfo.minYaw, moveInfo.maxYaw);
result = ANGLES_SET_TO_MAX;
}
@@ -97,7 +97,7 @@ CPedIK::MoveLimb(LimbOrientation &limb, float targetYaw, float targetPitch, Limb
}
if (limb.pitch > moveInfo.maxPitch || limb.pitch < moveInfo.minPitch) {
- limb.pitch = clamp(limb.pitch, moveInfo.minPitch, moveInfo.maxPitch);
+ limb.pitch = Clamp(limb.pitch, moveInfo.minPitch, moveInfo.maxPitch);
result = ANGLES_SET_TO_MAX;
}
return result;
@@ -122,14 +122,14 @@ CPedIK::LookInDirection(float targetYaw, float targetPitch)
m_headOrient.yaw = Atan2(-m->at.y, -m->at.x);
m_headOrient.yaw -= m_ped->m_fRotationCur;
m_headOrient.yaw = CGeneral::LimitRadianAngle(m_headOrient.yaw);
- float up = clamp(m->up.z, -1.0f, 1.0f);
+ float up = Clamp(m->up.z, -1.0f, 1.0f);
m_headOrient.pitch = Atan2(-up, Sqrt(1.0f - SQR(-up)));
}
// parent of head is neck
RwMatrix *m = GetComponentMatrix(m_ped, PED_NECK);
yaw = CGeneral::LimitRadianAngle(Atan2(-m->at.y, -m->at.x));
- float up = clamp(m->up.z, -1.0f, 1.0f);
+ float up = Clamp(m->up.z, -1.0f, 1.0f);
pitch = Atan2(-up, Sqrt(1.0f - SQR(-up)));
float headYaw = CGeneral::LimitRadianAngle(targetYaw - (yaw + m_torsoOrient.yaw));
float headPitch = CGeneral::LimitRadianAngle(targetPitch - pitch) * Cos(Min(Abs(headYaw), HALFPI));
@@ -336,11 +336,11 @@ CPedIK::RestoreLookAt(void)
void
CPedIK::ExtractYawAndPitchWorld(RwMatrix *mat, float *yaw, float *pitch)
{
- float f = clamp(DotProduct(mat->up, CVector(0.0f, 1.0f, 0.0f)), -1.0f, 1.0f);
+ float f = Clamp(DotProduct(mat->up, CVector(0.0f, 1.0f, 0.0f)), -1.0f, 1.0f);
*yaw = Acos(f);
if (mat->up.x > 0.0f) *yaw = -*yaw;
- f = clamp(DotProduct(mat->right, CVector(0.0f, 0.0f, 1.0f)), -1.0f, 1.0f);
+ f = Clamp(DotProduct(mat->right, CVector(0.0f, 0.0f, 1.0f)), -1.0f, 1.0f);
*pitch = Acos(f);
if (mat->up.z > 0.0f) *pitch = -*pitch;
}
@@ -348,11 +348,11 @@ CPedIK::ExtractYawAndPitchWorld(RwMatrix *mat, float *yaw, float *pitch)
void
CPedIK::ExtractYawAndPitchLocal(RwMatrix *mat, float *yaw, float *pitch)
{
- float f = clamp(DotProduct(mat->at, CVector(0.0f, 0.0f, 1.0f)), -1.0f, 1.0f);
+ float f = Clamp(DotProduct(mat->at, CVector(0.0f, 0.0f, 1.0f)), -1.0f, 1.0f);
*yaw = Acos(f);
if (mat->at.y > 0.0f) *yaw = -*yaw;
- f = clamp(DotProduct(mat->right, CVector(1.0f, 0.0f, 0.0f)), -1.0f, 1.0f);
+ f = Clamp(DotProduct(mat->right, CVector(1.0f, 0.0f, 0.0f)), -1.0f, 1.0f);
*pitch = Acos(f);
if (mat->up.x > 0.0f) *pitch = -*pitch;
}
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 6a41b0c1..384cef99 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -413,7 +413,7 @@ CPopulation::PedCreationDistMultiplier()
return 1.0f;
float vehSpeed = veh->m_vecMoveSpeed.Magnitude2D();
- return clamp(vehSpeed - 0.1f + 1.0f, 1.0f, 1.5f);
+ return Clamp(vehSpeed - 0.1f + 1.0f, 1.0f, 1.5f);
}
CPed*