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

2
Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
View File

@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
hsBool plListener::fPrintDbgInfo = false;
hsBool plListener::IEval(double secs, hsScalar del, uint32_t dirty)
hsBool plListener::IEval(double secs, float del, uint32_t dirty)
{
// if (!plgAudioSys::Active())
// return true;

4
Sources/Plasma/FeatureLib/pfAudio/plListener.h
View File

@ -83,12 +83,12 @@ protected:
plVirtualCam1* fVCam;
hsScalar fPosRatio, fFacingRatio, fVelRatio; // 0 is vCam, 1 is refObject
float fPosRatio, fFacingRatio, fVelRatio; // 0 is vCam, 1 is refObject
hsBool fInitMe;
static hsBool fPrintDbgInfo;
virtual hsBool IEval(double secs, hsScalar del, uint32_t dirty);
virtual hsBool IEval(double secs, float del, uint32_t dirty);
void ISetRef( const plKey &ref, hsBool binding, int type );
void ICheckAudio( void ) const;

10
Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.cpp
View File

@ -185,7 +185,7 @@ void plRandomSoundMod::IPlayNext()
fFirstTimePlay = false;
if( !(fMode & kOneCmd) )
{
hsScalar delay = IGetDelay(0);
float delay = IGetDelay(0);
double t = hsTimer::GetSysSeconds() + delay;
plAnimCmdMsg* anim = TRACKED_NEW plAnimCmdMsg(GetKey(), GetKey(), &t);
@ -203,7 +203,7 @@ void plRandomSoundMod::IPlayNext()
// We don't want random sounds to synch, since we don't synch the randomness. So force this next
// sound to not synch
hsScalar currLen;
float currLen;
if( fGroups != nil && fGroups[ fCurrentGroup ].fGroupedIdx != -1 )
{
currentSndIdx = fGroups[ fCurrentGroup ].fIndices[ fCurrent ];
@ -245,7 +245,7 @@ void plRandomSoundMod::IPlayNext()
}
if (ai->GetSound(currentSndIdx))
currLen = (hsScalar)(ai->GetSound(currentSndIdx)->GetLength());
currLen = (float)(ai->GetSound(currentSndIdx)->GetLength());
else
currLen = 0;
}
@ -262,7 +262,7 @@ void plRandomSoundMod::IPlayNext()
if( !(fMode & kOneCmd) )
{
hsScalar delay = IGetDelay(currLen);
float delay = IGetDelay(currLen);
double t = hsTimer::GetSysSeconds() + delay;
@ -386,7 +386,7 @@ hsBool plRandomSoundMod::MsgReceive(plMessage* msg)
return plRandomCommandMod::MsgReceive(msg);
}
void plRandomSoundMod::ISetVolume(hsScalar volume)
void plRandomSoundMod::ISetVolume(float volume)
{
plSound *pSound = nil;

2
Sources/Plasma/FeatureLib/pfAudio/plRandomSoundMod.h
View File

@ -77,7 +77,7 @@ protected:
virtual void IPlayNext();
virtual void IPlayNextIfMaster();
virtual void IStop();
void ISetVolume(hsScalar volume);
void ISetVolume(float volume);
void ISetPosition(hsPoint3);
plSound *IGetSoundPtr();