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

make NumItemsToDraw a float

Browse Source
This commit is contained in:
Chris Danford
2005-01-06 21:09:13 +00:00
parent a07ebba4ff
commit 95b83d1ee5
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActorScroller.cpp
+8 -8
View File
@@ -12,7 +12,7 @@ ActorScroller::ActorScroller()
m_fCurrentItem = 0; m_fCurrentItem = 0;
m_fDestinationItem = 0; m_fDestinationItem = 0;
m_fSecondsPerItem = 1; m_fSecondsPerItem = 1;
m_iNumItemsToDraw = 7; m_fNumItemsToDraw = 7;
m_vRotationDegrees = RageVector3(0,0,0); m_vRotationDegrees = RageVector3(0,0,0);
m_vTranslateTerm0 = RageVector3(0,0,0); m_vTranslateTerm0 = RageVector3(0,0,0);
@@ -22,7 +22,7 @@ ActorScroller::ActorScroller()
void ActorScroller::Load( void ActorScroller::Load(
float fSecondsPerItem, float fSecondsPerItem,
int iNumItemsToDraw, float fNumItemsToDraw,
const RageVector3 &vRotationDegrees, const RageVector3 &vRotationDegrees,
const RageVector3 &vTranslateTerm0, const RageVector3 &vTranslateTerm0,
const RageVector3 &vTranslateTerm1, const RageVector3 &vTranslateTerm1,
@@ -30,7 +30,7 @@ void ActorScroller::Load(
) )
{ {
m_fSecondsPerItem = fSecondsPerItem; m_fSecondsPerItem = fSecondsPerItem;
m_iNumItemsToDraw = iNumItemsToDraw; m_fNumItemsToDraw = fNumItemsToDraw;
m_vRotationDegrees = vRotationDegrees; m_vRotationDegrees = vRotationDegrees;
m_vTranslateTerm0 = vTranslateTerm0; m_vTranslateTerm0 = vTranslateTerm0;
m_vTranslateTerm1 = vTranslateTerm1; m_vTranslateTerm1 = vTranslateTerm1;
@@ -103,14 +103,14 @@ void ActorScroller::DrawPrimitives()
} }
else else
{ {
int iFirstItemToDraw = (int)roundf( m_fCurrentItem - m_iNumItemsToDraw/2.f ); int iFirstItemToDraw = (int)roundf( m_fCurrentItem - m_fNumItemsToDraw/2.f );
for( int i=iFirstItemToDraw; i<iFirstItemToDraw+m_iNumItemsToDraw; i++ ) for( int i=0; i<m_SubActors.size(); i++ )
{ {
if( i < 0 || i >= (int)m_SubActors.size() )
continue; // skip
float fItemOffset = i - m_fCurrentItem; float fItemOffset = i - m_fCurrentItem;
if( fabsf(fItemOffset) > m_fNumItemsToDraw / 2 )
continue;
DISPLAY->PushMatrix(); DISPLAY->PushMatrix();
if( m_vRotationDegrees[0] ) if( m_vRotationDegrees[0] )
stepmania/src/ActorScroller.h
+2 -2
View File
@@ -14,7 +14,7 @@ public:
void Load( void Load(
float fScrollSecondsPerItem, float fScrollSecondsPerItem,
int iNumItemsToDraw, float fNumItemsToDraw,
const RageVector3 &vRotationDegrees, const RageVector3 &vRotationDegrees,
const RageVector3 &vTranslateTerm0, const RageVector3 &vTranslateTerm0,
const RageVector3 &vTranslateTerm1, const RageVector3 &vTranslateTerm1,
@@ -32,7 +32,7 @@ protected:
float m_fCurrentItem; // usually between 0 and m_SubActors.size() float m_fCurrentItem; // usually between 0 and m_SubActors.size()
float m_fDestinationItem; float m_fDestinationItem;
float m_fSecondsPerItem; // <= 0 means don't scroll float m_fSecondsPerItem; // <= 0 means don't scroll
int m_iNumItemsToDraw; float m_fNumItemsToDraw;
// Note: Rotation is applied before translation. // Note: Rotation is applied before translation.
stepmania/src/ScreenNameEntryTraditional.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ void HighScoreWheel::Load( const HighScoreList& hsl, int iIndexToFocus )
ActorScroller::Load( ActorScroller::Load(
0.2f, // fSecondsPerItem 0.2f, // fSecondsPerItem
8, // iNumItemsToDraw 8, // fNumItemsToDraw
RageVector3(18,0,0), // vRotationDegrees RageVector3(18,0,0), // vRotationDegrees
RageVector3(0,0,90), // vTranslateTerm0 RageVector3(0,0,90), // vTranslateTerm0
RageVector3(0,0,0), // vTranslateTerm1 RageVector3(0,0,0), // vTranslateTerm1