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

partial ARRAYSIZE -> ARRAYLEN

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-08 18:57:00 +00:00
parent 2d9b15746f
commit beef1efa87
3 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageMath.cpp
+10 -10
View File
@@ -600,9 +600,9 @@ float RageFastSin( float x )
if( !bInited )
{
bInited = true;
for( unsigned i=0; i<ARRAYSIZE(table); i++ )
for( unsigned i=0; i<ARRAYLEN(table); i++ )
{
float x = SCALE(i,0,ARRAYSIZE(table),0.0f,PI);
float x = SCALE(i,0,ARRAYLEN(table),0.0f,PI);
table[i] = sinf(x);
}
}
@@ -611,7 +611,7 @@ float RageFastSin( float x )
if( x == 0 )
return 0;
float fIndex = SCALE( x, 0.0f, PI*2, 0, ARRAYSIZE(table)*2 );
float fIndex = SCALE( x, 0.0f, PI*2, 0, ARRAYLEN(table)*2 );
// lerp using samples from the table
int iSampleIndex[2];
@@ -619,22 +619,22 @@ float RageFastSin( float x )
iSampleIndex[1] = iSampleIndex[0]+1;
float fRemainder = fIndex - iSampleIndex[0];
for( unsigned i=0; i<ARRAYSIZE(iSampleIndex); i++ )
iSampleIndex[i] %= ARRAYSIZE(table) * 2;
for( unsigned i=0; i<ARRAYLEN(iSampleIndex); i++ )
iSampleIndex[i] %= ARRAYLEN(table) * 2;
DEBUG_ASSERT( fRemainder>=0 && fRemainder<=1 );
float fValue[ARRAYSIZE(iSampleIndex)];
for( unsigned i=0; i<ARRAYSIZE(iSampleIndex); i++ )
float fValue[ARRAYLEN(iSampleIndex)];
for( unsigned i=0; i<ARRAYLEN(iSampleIndex); i++ )
{
int &iSample = iSampleIndex[i];
float &fVal = fValue[i];
if( iSample >= int(ARRAYSIZE(table)) ) // PI <= iSample < 2*PI
if( iSample >= int(ARRAYLEN(table)) ) // PI <= iSample < 2*PI
{
// sin(x) == -sin(PI+x)
iSample -= ARRAYSIZE(table);
DEBUG_ASSERT( iSample>=0 && iSample<int(ARRAYSIZE(table)) );
iSample -= ARRAYLEN(table);
DEBUG_ASSERT( iSample>=0 && iSample<int(ARRAYLEN(table)) );
fVal = -table[iSample];
}
else