OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 20:29: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

14
Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp
View File

@ -376,7 +376,7 @@ uint16_t plMatrixBlend::GetPriority() {
hsBool plMatrixBlend::IsStoppedAt(double time)
{
hsScalar blend = fChannelBias->Value(time);
float blend = fChannelBias->Value(time);
if (blend == 0)
return fChannelA->IsStoppedAt(time);
if (blend == 1)
@ -401,7 +401,7 @@ const hsMatrix44 & plMatrixBlend::Value(double time, bool peek)
// ------------
const hsAffineParts & plMatrixBlend::AffineValue(double time, bool peek)
{
const hsScalar &blend = fChannelBias->Value(time);
const float &blend = fChannelBias->Value(time);
if(blend == 0) {
return fOptimizedA->AffineValue(time, peek);
} else {
@ -452,7 +452,7 @@ plAGChannel *plMatrixBlend::Optimize(double time)
{
fOptimizedA = (plMatrixChannel *)fChannelA->Optimize(time);
fOptimizedB = (plMatrixChannel *)fChannelB->Optimize(time);
hsScalar blend = fChannelBias->Value(time);
float blend = fChannelBias->Value(time);
if(blend == 0.0f)
return fOptimizedA;
if(blend == 1.0f)
@ -526,7 +526,7 @@ const hsMatrix44 & plMatrixControllerChannel::Value(double time, bool peek,
plControllerCacheInfo *cache)
{
plProfile_BeginTiming(AffineInterp);
fController->Interp((hsScalar)time, &fAP, cache);
fController->Interp((float)time, &fAP, cache);
plProfile_EndTiming(AffineInterp);
plProfile_BeginTiming(AffineCompose);
@ -548,7 +548,7 @@ const hsAffineParts & plMatrixControllerChannel::AffineValue(double time, bool p
plControllerCacheInfo *cache)
{
plProfile_BeginTiming(AffineInterp);
fController->Interp((hsScalar)time, &fAP, cache);
fController->Interp((float)time, &fAP, cache);
plProfile_EndTiming(AffineInterp);
return fAP;
}
@ -764,7 +764,7 @@ void plMatrixChannelApplicator::IApply(const plAGModifier *mod, double time)
//
///////////////////////////////////////////////////////////////////////////////////////////
const hsScalar plMatrixDelayedCorrectionApplicator::fDelayLength = 1.f; // seconds
const float plMatrixDelayedCorrectionApplicator::fDelayLength = 1.f; // seconds
void plMatrixDelayedCorrectionApplicator::SetCorrection(hsMatrix44 &cor)
{
@ -822,7 +822,7 @@ void plMatrixDelayedCorrectionApplicator::IApply(const plAGModifier *mod, double
hsAffineParts interpAP;
hsMatrix44 interpResult;
hsScalar blend = (hsScalar)((time - fDelayStart) / fDelayLength);
float blend = (float)((time - fDelayStart) / fDelayLength);
hsInterp::LinInterp(&fCorAP, &identAP, blend, &interpAP);
interpAP.ComposeMatrix(&interpResult);