OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 12:49:10 +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/plDrawable/plDynaWakeMgr.cpp
View File

@ -140,7 +140,7 @@ hsVector3 plDynaWakeMgr::IGetDirection(const plDynaDecalInfo& info, const hsPoin
{
hsVector3 animDir;
hsPoint3 p = pos;
hsScalar t = fAnimPath->GetExtremePoint(p);
float t = fAnimPath->GetExtremePoint(p);
fAnimPath->SetCurTime(t, plAnimPath::kNone);
fAnimPath->GetVelocity(&animDir);
@ -151,8 +151,8 @@ hsVector3 plDynaWakeMgr::IGetDirection(const plDynaDecalInfo& info, const hsPoin
}
// Now if we want to factor in velocity, we can use (pos - info.fLastPos) / (hsTimer::GetSysSeconds() - info.fLastTime)
hsScalar dt = hsScalar(hsTimer::GetSysSeconds() - info.fLastTime);
const hsScalar kMinDt = 1.e-3f;
float dt = float(hsTimer::GetSysSeconds() - info.fLastTime);
const float kMinDt = 1.e-3f;
if( (info.fFlags & plDynaDecalInfo::kImmersed) && (dt > kMinDt) )
{
hsVector3 velDir(&pos, &info.fLastPos);
@ -177,10 +177,10 @@ hsBool plDynaWakeMgr::IRippleFromShape(const plPrintShape* shape, hsBool force)
const hsMatrix44& shapeL2W = shape->GetOwner()->GetLocalToWorld();
static hsScalar kMinDist = 1.0f;
static hsScalar kMinTime = 0.25f;
static float kMinDist = 1.0f;
static float kMinTime = 0.25f;
double t = hsTimer::GetSysSeconds();
hsScalar dt = hsScalar(t - info.fLastTime) * sRand.RandZeroToOne();
float dt = float(t - info.fLastTime) * sRand.RandZeroToOne();
hsBool longEnough = (dt >= kMinTime);
hsPoint3 xlate = shapeL2W.GetTranslate();
hsBool farEnough = (hsVector3(&info.fLastPos, &xlate).Magnitude() > kMinDist);
@ -197,19 +197,19 @@ hsBool plDynaWakeMgr::IRippleFromShape(const plPrintShape* shape, hsBool force)
randPert.Normalize();
if( !farEnough )
{
static hsScalar kRandPert = 0.05f;
static float kRandPert = 0.05f;
randPert *= kRandPert * shape->GetWidth();
}
else
{
static hsScalar kRandPert = 0.05f;
static float kRandPert = 0.05f;
randPert *= kRandPert * shape->GetWidth();
}
pos += randPert;
hsVector3 up(0.f, 0.f, 1.f);
static hsScalar kHeightScale = 1.f;
static float kHeightScale = 1.f;
pos.fZ += (shape->GetHeight() * fScale.fZ * kHeightScale) * 0.25f;
pos += dir * shape->GetLength() * 0.5f * (1.f - fScale.fY);