merge ListDisplay into ActorScroller

This commit is contained in:
Chris Danford
2005-04-10 23:42:47 +00:00
parent c9c9e5dbeb
commit 8e6637dd0d
12 changed files with 232 additions and 423 deletions
+6 -22
View File
@@ -3,31 +3,17 @@
#ifndef COURSE_CONTENTS_LIST_H
#define COURSE_CONTENTS_LIST_H
#include "BitmapText.h"
#include "ActorFrame.h"
#include "Sprite.h"
#include "Quad.h"
#include "CourseEntryDisplay.h"
class Course;
class Song;
class Steps;
#include "ActorScroller.h"
class CourseEntryDisplay;
const int MAX_VISIBLE_CONTENTS = 5;
const int MAX_TOTAL_CONTENTS = 56;
class CourseContentsList : public ActorFrame
class CourseContentsList : public ActorScroller
{
public:
CourseContentsList();
~CourseContentsList();
void Load();
virtual void Update( float fDeltaTime );
virtual void DrawPrimitives();
void SetFromGameState();
void TweenInAfterChangedCourse();
@@ -35,12 +21,10 @@ protected:
Quad m_quad;
int m_iNumContents;
CourseEntryDisplay m_CourseContentDisplays[MAX_TOTAL_CONTENTS];
float ContentsBarHeight, ContentsBarWidth;
vector<CourseEntryDisplay*> m_vpDisplay;
float m_fTimeUntilScroll;
float m_fItemAtTopOfList; // between 0 and m_iNumContents
float m_fItemAtPosition0InList; // 0 <= val < m_vpDisplay.size()
};
#endif