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

12
Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthConvert.cpp
View File

@ -144,7 +144,7 @@ SegmentSpec *plAnimStealthNode::IGetSegmentSpec( void ) const
}
hsScalar plAnimStealthNode::GetSegStart( void ) const
float plAnimStealthNode::GetSegStart( void ) const
{
SegmentSpec *spec = IGetSegmentSpec();
if( spec != nil )
@ -153,7 +153,7 @@ hsScalar plAnimStealthNode::GetSegStart( void ) const
return 0.f;
}
hsScalar plAnimStealthNode::GetSegEnd( void ) const
float plAnimStealthNode::GetSegEnd( void ) const
{
SegmentSpec *spec = IGetSegmentSpec();
if( spec != nil )
@ -162,7 +162,7 @@ hsScalar plAnimStealthNode::GetSegEnd( void ) const
return 0.f;
}
void plAnimStealthNode::GetLoopPoints( hsScalar &start, hsScalar &end ) const
void plAnimStealthNode::GetLoopPoints( float &start, float &end ) const
{
start = GetSegStart();
end = GetSegEnd();
@ -172,7 +172,7 @@ void plAnimStealthNode::GetLoopPoints( hsScalar &start, hsScalar &end ) const
GetSegMapAnimTime( loopName, fCachedSegMap, SegmentSpec::kLoop, start, end );
}
void plAnimStealthNode::GetAllStopPoints( hsTArray<hsScalar> &out )
void plAnimStealthNode::GetAllStopPoints( hsTArray<float> &out )
{
if( fCachedSegMap == nil )
return;
@ -191,7 +191,7 @@ void plAnimStealthNode::GetAllStopPoints( hsTArray<hsScalar> &out )
// Handles converting all the settings we have that are applicable for an
// animTimeConvert and stuffing it into said ATC.
void plAnimStealthNode::StuffToTimeConvert( plAnimTimeConvert &convert, hsScalar maxLength )
void plAnimStealthNode::StuffToTimeConvert( plAnimTimeConvert &convert, float maxLength )
{
const char *segName = GetSegmentName();
bool isEntire = ( segName == nil || strcmp( segName, ENTIRE_ANIMATION_NAME ) == 0 ) ? true : false;
@ -214,7 +214,7 @@ void plAnimStealthNode::StuffToTimeConvert( plAnimTimeConvert &convert, hsSca
convert.SetLoopPoints( 0, maxLength );
else
{
hsScalar loopStart, loopEnd;
float loopStart, loopEnd;
GetLoopPoints( loopStart, loopEnd );
convert.SetLoopPoints( loopStart, loopEnd );
}

16
Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.cpp
View File

@ -904,10 +904,10 @@ void plAnimStealthNode::SetLoop( bool b, const char *name )
}
uint8_t plAnimStealthNode::GetEaseInType( void ) const { return (uint8_t)fParamBlock->GetInt( (ParamID)kPBEaseInType ); }
hsScalar plAnimStealthNode::GetEaseInLength( void ) const { return (hsScalar)fParamBlock->GetFloat( (ParamID)kPBEaseInLength ); }
hsScalar plAnimStealthNode::GetEaseInMin( void ) const { return (hsScalar)fParamBlock->GetFloat( (ParamID)kPBEaseInMin ); }
hsScalar plAnimStealthNode::GetEaseInMax( void ) const { return (hsScalar)fParamBlock->GetFloat( (ParamID)kPBEaseInMax ); }
void plAnimStealthNode::SetEaseIn( uint8_t type, hsScalar length, hsScalar min, hsScalar max )
float plAnimStealthNode::GetEaseInLength( void ) const { return (float)fParamBlock->GetFloat( (ParamID)kPBEaseInLength ); }
float plAnimStealthNode::GetEaseInMin( void ) const { return (float)fParamBlock->GetFloat( (ParamID)kPBEaseInMin ); }
float plAnimStealthNode::GetEaseInMax( void ) const { return (float)fParamBlock->GetFloat( (ParamID)kPBEaseInMax ); }
void plAnimStealthNode::SetEaseIn( uint8_t type, float length, float min, float max )
{
fParamBlock->SetValue( (ParamID)kPBEaseInType, 0, (int)type );
fParamBlock->SetValue( (ParamID)kPBEaseInLength, 0, (float)length );
@ -916,10 +916,10 @@ void plAnimStealthNode::SetEaseIn( uint8_t type, hsScalar length, hsScala
}
uint8_t plAnimStealthNode::GetEaseOutType( void ) const { return (uint8_t)fParamBlock->GetInt( (ParamID)kPBEaseOutType ); }
hsScalar plAnimStealthNode::GetEaseOutLength( void ) const { return (hsScalar)fParamBlock->GetFloat( (ParamID)kPBEaseOutLength ); }
hsScalar plAnimStealthNode::GetEaseOutMin( void ) const { return (hsScalar)fParamBlock->GetFloat( (ParamID)kPBEaseOutMin ); }
hsScalar plAnimStealthNode::GetEaseOutMax( void ) const { return (hsScalar)fParamBlock->GetFloat( (ParamID)kPBEaseOutMax ); }
void plAnimStealthNode::SetEaseOut( uint8_t type, hsScalar length, hsScalar min, hsScalar max )
float plAnimStealthNode::GetEaseOutLength( void ) const { return (float)fParamBlock->GetFloat( (ParamID)kPBEaseOutLength ); }
float plAnimStealthNode::GetEaseOutMin( void ) const { return (float)fParamBlock->GetFloat( (ParamID)kPBEaseOutMin ); }
float plAnimStealthNode::GetEaseOutMax( void ) const { return (float)fParamBlock->GetFloat( (ParamID)kPBEaseOutMax ); }
void plAnimStealthNode::SetEaseOut( uint8_t type, float length, float min, float max )
{
fParamBlock->SetValue( (ParamID)kPBEaseOutType, 0, (int)type );
fParamBlock->SetValue( (ParamID)kPBEaseOutLength, 0, (float)length );

26
Sources/Tools/MaxPlasmaMtls/Materials/plAnimStealthNode.h
View File

@ -207,23 +207,23 @@ public:
void SetLoop( bool b, const char *name );
uint8_t GetEaseInType( void ) const;
hsScalar GetEaseInLength( void ) const;
hsScalar GetEaseInMin( void ) const;
hsScalar GetEaseInMax( void ) const;
void SetEaseIn( uint8_t type, hsScalar length, hsScalar min, hsScalar max );
float GetEaseInLength( void ) const;
float GetEaseInMin( void ) const;
float GetEaseInMax( void ) const;
void SetEaseIn( uint8_t type, float length, float min, float max );
uint8_t GetEaseOutType( void ) const;
hsScalar GetEaseOutLength( void ) const;
hsScalar GetEaseOutMin( void ) const;
hsScalar GetEaseOutMax( void ) const;
void SetEaseOut( uint8_t type, hsScalar length, hsScalar min, hsScalar max );
float GetEaseOutLength( void ) const;
float GetEaseOutMin( void ) const;
float GetEaseOutMax( void ) const;
void SetEaseOut( uint8_t type, float length, float min, float max );
// Conversion stuff
void GetAllStopPoints( hsTArray<hsScalar> &out );
hsScalar GetSegStart( void ) const;
hsScalar GetSegEnd( void ) const;
void GetLoopPoints( hsScalar &start, hsScalar &end ) const;
void StuffToTimeConvert( plAnimTimeConvert &convert, hsScalar maxLength );
void GetAllStopPoints( hsTArray<float> &out );
float GetSegStart( void ) const;
float GetSegEnd( void ) const;
void GetLoopPoints( float &start, float &end ) const;
void StuffToTimeConvert( plAnimTimeConvert &convert, float maxLength );
// plAnimObjInterface functions
virtual void PickTargetNode( IParamBlock2 *destPB, ParamID destParamID, ParamID typeID );

12
Sources/Tools/MaxPlasmaMtls/Materials/plPassMtlBase.cpp
View File

@ -537,13 +537,13 @@ void plPassMtlBase::PostLoadAnimPBFixup( void )
myNew->SetLoop( (bool)fAnimPB->GetInt( (ParamID)kPBAnimLoop ),
(char *)fAnimPB->GetStr( (ParamID)kPBAnimLoopName ) );
myNew->SetEaseIn( (uint8_t)fAnimPB->GetInt( (ParamID)kPBAnimEaseInType ),
(hsScalar)fAnimPB->GetFloat( (ParamID)kPBAnimEaseInLength ),
(hsScalar)fAnimPB->GetFloat( (ParamID)kPBAnimEaseInMin ),
(hsScalar)fAnimPB->GetFloat( (ParamID)kPBAnimEaseInMax ) );
(float)fAnimPB->GetFloat( (ParamID)kPBAnimEaseInLength ),
(float)fAnimPB->GetFloat( (ParamID)kPBAnimEaseInMin ),
(float)fAnimPB->GetFloat( (ParamID)kPBAnimEaseInMax ) );
myNew->SetEaseOut( (uint8_t)fAnimPB->GetInt( (ParamID)kPBAnimEaseOutType ),
(hsScalar)fAnimPB->GetFloat( (ParamID)kPBAnimEaseOutLength ),
(hsScalar)fAnimPB->GetFloat( (ParamID)kPBAnimEaseOutMin ),
(hsScalar)fAnimPB->GetFloat( (ParamID)kPBAnimEaseOutMax ) );
(float)fAnimPB->GetFloat( (ParamID)kPBAnimEaseOutLength ),
(float)fAnimPB->GetFloat( (ParamID)kPBAnimEaseOutMin ),
(float)fAnimPB->GetFloat( (ParamID)kPBAnimEaseOutMax ) );
#pragma warning( pop )
}
}