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

30
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
View File

@ -123,9 +123,9 @@ class pfEsHTMLChunk
uint16_t fAbsoluteX, fAbsoluteY;
hsScalar fCurrOpacity; // For SFX images
hsScalar fSFXTime; // For SFX images
hsScalar fMinOpacity, fMaxOpacity;
float fCurrOpacity; // For SFX images
float fSFXTime; // For SFX images
float fMinOpacity, fMaxOpacity;
hsColorRGBA fCurrColor;
hsColorRGBA fOffColor, fOnColor;
@ -563,7 +563,7 @@ hsBool pfBookData::MsgReceive(plMessage *pMsg)
plTimeMsg *time = plTimeMsg::ConvertNoRef( pMsg );
if( time != nil && fCurrSFXPages != kNoSides && !fCurrentlyTurning && fCurrentlyOpen )
{
IHandleSFX( (hsScalar)time->DSeconds() );
IHandleSFX( (float)time->DSeconds() );
return true;
}
@ -714,7 +714,7 @@ void pfBookData::RegisterForSFX(WhichSide whichPages)
// calced, pointers bad, etc) just bail, since the SFX are just for visual
// flair and not really needed.
void pfBookData::IHandleSFX(hsScalar currTime, WhichSide whichSide /*= kNoSides*/)
void pfBookData::IHandleSFX(float currTime, WhichSide whichSide /*= kNoSides*/)
{
if(fCurrBook == nil)
return;
@ -737,7 +737,7 @@ void pfBookData::IHandleSFX(hsScalar currTime, WhichSide whichSide /*= kNoSides*
}
// Update all SFX images for this page first
hsScalar deltaT = currTime - fBaseSFXTime;
float deltaT = currTime - fBaseSFXTime;
uint32_t idx, inc = (whichSide == kLeftSide) ? 0 : 1;
if(fCurrBook->fPageStarts.GetCount() <= fCurrBook->fCurrentPage + inc + 1)
@ -752,7 +752,7 @@ void pfBookData::IHandleSFX(hsScalar currTime, WhichSide whichSide /*= kNoSides*
{
// Glow SFX: animate opacity based on time offset
uint8_t isOdd = 0;
hsScalar newDelta = deltaT;
float newDelta = deltaT;
while(newDelta > chunk->fSFXTime)
{
isOdd = ~isOdd;
@ -1080,7 +1080,7 @@ void pfBookData::UpdatePageCorners(WhichSide which)
//// SetCurrSize ////////////////////////////////////////////////////////////
// Seeks the width and height animations to set the desired book size. Sizes are in % across the animation
void pfBookData::SetCurrSize(hsScalar w, hsScalar h)
void pfBookData::SetCurrSize(float w, float h)
{
fWidthCtrl->SetCurrValue(w);
fHeightCtrl->SetCurrValue(h);
@ -1647,8 +1647,8 @@ int32_t pfJournalBook::IFindCurrVisibleLink( hsBool rightNotLeft, hsBool hover
// This should be 0-1 in the context of the control, so scale to our DTMap size
plDynamicTextMap *dtMap = fBookGUIs[fCurBookGUI]->GetDTMap( rightNotLeft ? pfJournalDlgProc::kTagRightDTMap : pfJournalDlgProc::kTagLeftDTMap );
pt.fX *= (hsScalar)dtMap->GetWidth();
pt.fY *= (hsScalar)dtMap->GetHeight();
pt.fX *= (float)dtMap->GetWidth();
pt.fY *= (float)dtMap->GetHeight();
if( rightNotLeft )
{
// Clicks on the right side are offsetted in x by the left side's width
@ -1937,20 +1937,20 @@ hsBool pfJournalBook::ICompileSource( const wchar_t *source, const plLocation &
char *comma2 = strchr( comma + 1, ',' );
if( comma2 != nil )
{
chunk->fMaxOpacity = (hsScalar)atof( comma2 + 1 );
chunk->fMaxOpacity = (float)atof( comma2 + 1 );
*comma2 = 0;
}
chunk->fMinOpacity = (hsScalar)atof( comma + 1 );
chunk->fMinOpacity = (float)atof( comma + 1 );
*comma = 0;
}
chunk->fSFXTime = (hsScalar)atof( cOption );
chunk->fSFXTime = (float)atof( cOption );
delete [] cOption;
}
else if( wcsicmp( name, L"opacity" ) == 0 )
{
chunk->fFlags |= pfEsHTMLChunk::kTranslucent;
char *cOption = hsWStringToString(option);
chunk->fCurrOpacity = (hsScalar)atof( cOption );
chunk->fCurrOpacity = (float)atof( cOption );
delete [] cOption;
}
else if( wcsicmp( name, L"check" ) == 0 )
@ -3491,7 +3491,7 @@ void pfJournalBook::ISendNotify( uint32_t type, uint32_t linkID )
// Note: internally we store these as the seek positions on our animations,
// so the incoming parameters are actually inverse of what we finally want
void pfJournalBook::SetBookSize( hsScalar width, hsScalar height )
void pfJournalBook::SetBookSize( float width, float height )
{
fWidthScale = 1.f - width;
fHeightScale = 1.f - height;

10
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h
View File

@ -252,7 +252,7 @@ public:
pfGUIMultiLineEditCtrl *GetEditCtrl(uint32_t which);
// Seeks the width and height animations to set the desired book size. Sizes are in % across the animation
void SetCurrSize(hsScalar w, hsScalar h);
void SetCurrSize(float w, float h);
// Enables or disables the left and right page corners, to indicate current turnage state
void UpdatePageCorners(WhichSide which);
@ -317,7 +317,7 @@ protected:
WhichSide fCurrSFXPages;
// Base time to calc SFX anim positions from
hsScalar fBaseSFXTime;
float fBaseSFXTime;
hsBool fResetSFXFlag;
hsBool fSFXUpdateFlip; // So we only update alternating pages every frame, to save processor time
@ -331,7 +331,7 @@ protected:
void IInitTemplate(pfGUIDialogMod *templateDlg);
// Process SFX for this frame
void IHandleSFX(hsScalar currTime, WhichSide whichSide = kNoSides);
void IHandleSFX(float currTime, WhichSide whichSide = kNoSides);
// Yet another step in the page flip, to make SURE we're already showing the turning page before we fill in the page behind it
void IFillUncoveringPage(hsBool rightSide);
@ -424,7 +424,7 @@ class pfJournalBook : public hsKeyedObject
void CloseAndHide( void );
// Sets the book size scaling. 1,1 would be full size, 0,0 is the smallest size possible
void SetBookSize( hsScalar width, hsScalar height );
void SetBookSize( float width, float height );
// What page are we on?
uint32_t GetCurrentPage( void ) const { return fCurrentPage; }
@ -494,7 +494,7 @@ class pfJournalBook : public hsKeyedObject
uint32_t fLastPage;
// Per book size
hsScalar fWidthScale, fHeightScale;
float fWidthScale, fHeightScale;
// Per book margin around the edge (defaults to 16 pixels)
uint32_t fPageTMargin, fPageLMargin, fPageBMargin, fPageRMargin;