actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mostly 64 - 32 float warning fixes.

Browse Source
This commit is contained in:
Jason Felds
2011-06-12 03:37:10 -04:00
parent 4bb0b28fc8
commit 2ab5a4ddb8
10 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Actor.cpp
+3 -3
View File
@@ -105,9 +105,9 @@ void Actor::InitState()
#endif
m_fSecsIntoEffect = 0;
m_fEffectDelta = 0;
m_fEffectRampUp = 0.5;
m_fEffectRampUp = 0.5f;
m_fEffectHoldAtHalf = 0;
m_fEffectRampDown = 0.5;
m_fEffectRampDown = 0.5f;
m_fEffectHoldAtZero = 0;
m_fEffectOffset = 0;
m_EffectClock = CLOCK_TIMER;
@@ -118,7 +118,7 @@ void Actor::InitState()
m_bVisible = true;
m_fShadowLengthX = 0;
m_fShadowLengthY = 0;
m_ShadowColor = RageColor(0,0,0,0.5);
m_ShadowColor = RageColor(0,0,0,0.5f);
m_bIsAnimating = true;
m_fHibernateSecondsLeft = 0;
m_iDrawOrder = 0;
src/AdjustSync.cpp
+1 -1
View File
@@ -256,7 +256,7 @@ void AdjustSync::AutosyncTempo()
// keep only a fraction of the data, such as the 80% with the lowest
// error. However, throwing away the ones with high error should
// be enough in most cases.
float fFilteredError = 0.0;
float fFilteredError = 0;
s_iStepsFiltered = s_vAutosyncTempoData.size();
FilterHighErrorPoints( s_vAutosyncTempoData, fSlope, fIntercept, ERROR_TOO_HIGH );
s_iStepsFiltered -= s_vAutosyncTempoData.size();
src/ArrowEffects.cpp
+6 -1
View File
@@ -60,6 +60,8 @@ static ThemeMetric<float> MINI_PERCENT_BASE( "ArrowEffects", "MiniPercentBase" )
static ThemeMetric<float> MINI_PERCENT_GATE( "ArrowEffects", "MiniPercentGate" );
static ThemeMetric<bool> DIZZY_HOLD_HEADS( "ArrowEffects", "DizzyHoldHeads" );
float ArrowGetPercentVisible( const PlayerState* pPlayerState, float fYPosWithoutReverse );
static float GetNoteFieldHeight( const PlayerState* pPlayerState )
{
return SCREEN_HEIGHT + fabsf(pPlayerState->m_PlayerOptions.GetCurrent().m_fPerspectiveTilt)*200;
@@ -236,7 +238,10 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float
if( bShowEffects )
fBeatsUntilStep = pCurSteps->m_Timing.GetDisplayedBeat(fNoteBeat) - pCurSteps->m_Timing.GetDisplayedBeat(fSongBeat);
float fYOffsetBeatSpacing = fBeatsUntilStep;
float fSpeedMultiplier = bShowEffects ? pCurSteps->m_Timing.GetDisplayedSpeedPercent( position.m_fSongBeatVisible, position.m_fMusicSecondsVisible ) : 1.0;
float fSpeedMultiplier = bShowEffects ?
pCurSteps->m_Timing.GetDisplayedSpeedPercent(
position.m_fSongBeatVisible,
position.m_fMusicSecondsVisible ) : 1.0f;
fYOffset += fSpeedMultiplier * fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing);
}
src/BeginnerHelper.cpp
+2 -2
View File
@@ -242,7 +242,7 @@ void BeginnerHelper::DrawPrimitives()
DISPLAY->SetLighting( true );
DISPLAY->SetLightDirectional(
0,
RageColor(0.5,0.5,0.5,1),
RageColor(0.5f,0.5f,0.5f,1),
RageColor(1,1,1,1),
RageColor(0,0,0,1),
RageVector3(0, 0, 1) );
@@ -271,7 +271,7 @@ void BeginnerHelper::DrawPrimitives()
DISPLAY->SetLighting( true );
DISPLAY->SetLightDirectional(
0,
RageColor(0.5,0.5,0.5,1),
RageColor(0.5f,0.5f,0.5f,1),
RageColor(1,1,1,1),
RageColor(0,0,0,1),
RageVector3(0, 0, 1) );
src/LifeMeterBar.cpp
+1 -1
View File
@@ -172,7 +172,7 @@ void LifeMeterBar::ChangeLife( HoldNoteScore score, TapNoteScore tscore )
switch( score )
{
case HNS_Held: fDeltaLife = +0; break;
case HNS_LetGo: fDeltaLife = -1.0; break;
case HNS_LetGo: fDeltaLife = -1.0f; break;
default:
ASSERT(0);
}
src/RageSoundReader_Pan.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
RageSoundReader_Pan::RageSoundReader_Pan( RageSoundReader *pSource ):
RageSoundReader_Filter( pSource )
{
m_fPan = 0.0;
m_fPan = 0;
}
src/ScreenTestFonts.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ void ScreenTestFonts::Init()
font.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y+100 );
font.LoadFromFont( THEME->GetPathF("Common", "normal") );
font.SetZoom(.5);
font.SetZoom(.5f);
this->AddChild(&font);
txt.SetName( "Text" );
src/ScreenTestSound.cpp
+2 -2
View File
@@ -17,7 +17,7 @@ void ScreenTestSound::Init()
HEEEEEEEEELP.SetXY(450, 400);
HEEEEEEEEELP.LoadFromFont( THEME->GetPathF("Common","normal") );
HEEEEEEEEELP.SetZoom(.5);
HEEEEEEEEELP.SetZoom(.5f);
HEEEEEEEEELP.SetText(
"p Play\n"
"s Stop\n"
@@ -29,7 +29,7 @@ void ScreenTestSound::Init()
{
this->AddChild(&s[i].txt);
s[i].txt.LoadFromFont( THEME->GetPathF("Common","normal") );
s[i].txt.SetZoom(.5);
s[i].txt.SetZoom(.5f);
}
s[0].txt.SetXY(150, 100);
src/ScreenUnlockStatus.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ void ScreenUnlockStatus::Init()
break;
default:
text->SetText( "" );
text->SetDiffuse( RageColor(0.5,0,0,1) );
text->SetDiffuse( RageColor(0.5f,0,0,1) );
break;
}
src/TimingData.cpp
+6 -6
View File
@@ -821,10 +821,10 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
int iLastRow = 0;
float fLastTime = -m_fBeat0OffsetInSeconds;
float fBPS = GetBPMAtRow(0) / 60.0;
float fBPS = GetBPMAtRow(0) / 60.0f;
float bIsWarping = false;
float fWarpDestination = 0.0;
float fWarpDestination = 0;
for( ;; )
{
@@ -923,10 +923,10 @@ float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const
int iLastRow = 0;
float fLastTime = -m_fBeat0OffsetInSeconds;
float fBPS = GetBPMAtRow(0) / 60.0;
float fBPS = GetBPMAtRow(0) / 60.0f;
float bIsWarping = false;
float fWarpDestination = 0.0;
float fWarpDestination = 0;
for( ;; )
{
@@ -1004,7 +1004,7 @@ float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const
float TimingData::GetDisplayedBeat( float fBeat ) const
{
vector<ScrollSegment>::const_iterator it = m_ScrollSegments.begin(), end = m_ScrollSegments.end();
float fOutBeat = 0.0;
float fOutBeat = 0;
for( ; it != end; it++ )
{
if( it+1 == end || fBeat <= (it+1)->GetBeat() )
@@ -1508,7 +1508,7 @@ float TimingData::GetDisplayedSpeedPercent( float fSongBeat, float fMusicSeconds
if( ( index == 0 && m_SpeedSegments[0].GetLength() > 0.0 ) && fCurTime < fStartTime )
{
return 1.0;
return 1.0f;
}
else if( fEndTime >= fCurTime && ( index > 0 || m_SpeedSegments[0].GetLength() > 0.0 ) )
{