OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 04:09:16 +00:00
Code Releases Activity

Eliminate hsScalar and hsFixed

Browse Source 
Modern CPUs support floats just fine... hsFixed was crazy.
This commit is contained in:
Adam Johnson
2012-01-21 02:03:37 -05:00
parent 5027b5a4ac
commit e020651e4b
584 changed files with 5401 additions and 6399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp
View File

@ -64,7 +64,7 @@ void plSwimRegionInterface::Write(hsStream* s, hsResMgr* mgr)
s->WriteLEScalar(fMaxUpwardVel);
}
void plSwimRegionInterface::GetCurrent(plPhysicalControllerCore *physical, hsVector3 &linearResult, hsScalar &angularResult, hsScalar elapsed)
void plSwimRegionInterface::GetCurrent(plPhysicalControllerCore *physical, hsVector3 &linearResult, float &angularResult, float elapsed)
{
linearResult.Set(0.f, 0.f, 0.f);
angularResult = 0.f;
@ -126,7 +126,7 @@ hsBool plSwimCircularCurrentRegion::MsgReceive(plMessage* msg)
return plSwimRegionInterface::MsgReceive(msg);
}
void plSwimCircularCurrentRegion::GetCurrent(plPhysicalControllerCore *physical, hsVector3 &linearResult, hsScalar &angularResult, hsScalar elapsed)
void plSwimCircularCurrentRegion::GetCurrent(plPhysicalControllerCore *physical, hsVector3 &linearResult, float &angularResult, float elapsed)
{
if (elapsed <= 0.f || fCurrentSO == nil || GetProperty(kDisable))
{
@ -151,8 +151,8 @@ void plSwimCircularCurrentRegion::GetCurrent(plPhysicalControllerCore *physical,
hsBool applyPull = true;
hsVector3 pos2Center(center.fX - pos.fX, center.fY - pos.fY, 0.f);
hsScalar pullVel;
hsScalar distSq = pos2Center.MagnitudeSquared();
float pullVel;
float distSq = pos2Center.MagnitudeSquared();
if (distSq < .5)
{
// Don't want to pull us too close to the center, or we
@ -176,12 +176,12 @@ void plSwimCircularCurrentRegion::GetCurrent(plPhysicalControllerCore *physical,
hsVector3 v1 = linearResult * elapsed - pos2Center;
hsVector3 v2 = -pos2Center;
hsScalar invCos = v1.InnerProduct(v2) / v1.Magnitude() / v2.Magnitude();
float invCos = v1.InnerProduct(v2) / v1.Magnitude() / v2.Magnitude();
if (invCos > 1)
invCos = 1;
if (invCos < -1)
invCos = -1;
angularResult = hsACosine(invCos) / elapsed;
angularResult = acos(invCos) / elapsed;
// hsAssert(real_finite(linearResult.fX) &&
// real_finite(linearResult.fY) &&
@ -242,7 +242,7 @@ hsBool plSwimStraightCurrentRegion::MsgReceive(plMessage* msg)
return plSwimRegionInterface::MsgReceive(msg);
}
void plSwimStraightCurrentRegion::GetCurrent(plPhysicalControllerCore *physical, hsVector3 &linearResult, hsScalar &angularResult, hsScalar elapsed)
void plSwimStraightCurrentRegion::GetCurrent(plPhysicalControllerCore *physical, hsVector3 &linearResult, float &angularResult, float elapsed)
{
angularResult = 0.f;
@ -267,8 +267,8 @@ void plSwimStraightCurrentRegion::GetCurrent(plPhysicalControllerCore *physical,
}
hsVector3 pos2Center(center.fX - pos.fX, center.fY - pos.fY, 0.f);
hsScalar dist = current.InnerProduct(pos - center);
hsScalar pullVel;
float dist = current.InnerProduct(pos - center);
float pullVel;
if (dist <= fNearDist)
pullVel = fNearVel;