fixed interaction between arrow brightness and boomerang

fixing more course problems
2003-02-17 02:45:30 +00:00
parent 91d5ac72a2
commit 5028fab1bc
22 changed files with 442 additions and 342 deletions
@@ -0,0 +1,148 @@
+#include "global.h"
+/*
+-----------------------------------------------------------------------------
+ Class: CourseContentsList
+
+ Desc: See header.
+
+ Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
+	Chris Danford
+-----------------------------------------------------------------------------
+*/
+
+#include "CourseContentsList.h"
+#include "RageUtil.h"
+#include "GameConstantsAndTypes.h"
+#include "PrefsManager.h"
+#include "RageLog.h"
+#include "PrefsManager.h"
+#include "Course.h"
+#include "SongManager.h"
+#include <math.h>
+#include "RageDisplay.h"
+#include "ThemeManager.h"
+#include "Notes.h"
+#include "GameState.h"
+#include "StyleDef.h"
+
+
+CourseContentsList::CourseContentsList()
+{
+	m_iNumContents = 0;
+	m_quad.SetDiffuse( RageColor(0,0,0,0) );	// invisible, since we want to write only to the Zbuffer
+
+	m_fTimeUntilScroll = 0;
+	m_fItemAtTopOfList = 0;
+
+	/* These are all the same; grab the dimensions. */
+	ContentsBarHeight = m_CourseContentDisplays[0].m_sprFrame.GetTexture()->GetSourceFrameHeight();
+	ContentsBarWidth = m_CourseContentDisplays[0].m_sprFrame.GetTexture()->GetSourceFrameWidth();
+}
+
+
+void CourseContentsList::SetFromCourse( Course* pCourse )
+{
+	ASSERT( pCourse != NULL );
+
+	m_iNumContents = 0; 
+
+	vector<Song*> vSongs;
+	vector<Notes*> vNotes;
+	vector<CString> vsModifiers;
+	pCourse->GetStageInfo( vSongs, vNotes, vsModifiers, GAMESTATE->GetCurrentStyleDef()->m_NotesType, false );
+
+	for( int i=0; i<min((int)vSongs.size(), MAX_TOTAL_CONTENTS); i++ )
+	{
+		CourseEntryDisplay& display = m_CourseContentDisplays[m_iNumContents];
+	
+		if( pCourse->IsMysterySong(i) )
+		{
+			Difficulty dc = pCourse->GetDifficulty(i);
+			int iMeterLow, iMeterHigh;
+			pCourse->GetMeterRange(i, iMeterLow, iMeterHigh);
+
+			if( dc == DIFFICULTY_INVALID )
+				display.LoadFromMeterRange( m_iNumContents+1, iMeterLow, iMeterHigh, vsModifiers[i] );
+			else
+				display.LoadFromDifficulty( m_iNumContents+1, dc, vsModifiers[i] );
+		}
+		else
+		{
+			Song* pSong = vSongs[i];
+			Notes* pNotes = vNotes[i];
+			CString sModifiers = vsModifiers[i];
+			display.LoadFromSongAndNotes( m_iNumContents+1, pSong, pNotes, vsModifiers[i] );
+		}
+		
+		m_iNumContents ++;
+	}
+}
+
+void CourseContentsList::Update( float fDeltaTime )
+{
+	ActorFrame::Update( fDeltaTime );
+
+	if( m_fTimeUntilScroll > 0  &&  m_iNumContents > MAX_VISIBLE_CONTENTS)
+		m_fTimeUntilScroll -= fDeltaTime;
+	if( m_fTimeUntilScroll <= 0 ) {
+		m_fItemAtTopOfList += fDeltaTime;
+		m_fItemAtTopOfList = fmodf(m_fItemAtTopOfList, float(m_iNumContents));
+	}
+
+	for( int i=0; i<m_iNumContents; i++ )
+		m_CourseContentDisplays[i].Update( fDeltaTime );
+}
+
+void CourseContentsList::DrawPrimitives()
+{
+	// turn on Z buffer to clip items
+	DISPLAY->EnableZBuffer();
+
+	// write to z buffer so that top and bottom are clipped
+	m_quad.SetZ( 1 );
+
+	RectI rectBarSize(-ContentsBarWidth/2, -ContentsBarHeight/2,
+						ContentsBarWidth/2, ContentsBarHeight/2);
+	m_quad.StretchTo( rectBarSize );
+
+	m_quad.SetY( (-(MAX_VISIBLE_CONTENTS-1)/2 - 1) * float(ContentsBarHeight) );
+	m_quad.Draw();
+
+	m_quad.SetY( ((MAX_VISIBLE_CONTENTS-1)/2 + 1) * float(ContentsBarHeight) );
+	m_quad.Draw();
+
+	int iItemToDraw = (int)m_fItemAtTopOfList;
+
+	// HACK:  Insert a little pause as a new item appears on the screen
+	float fRemainder = m_fItemAtTopOfList - (int)m_fItemAtTopOfList;
+	fRemainder = min( fRemainder*1.5f, 1 );
+
+	const float fY = (-fRemainder-(MAX_VISIBLE_CONTENTS-1)/2) * ContentsBarHeight;
+
+	for( int i=0; i<min(MAX_VISIBLE_CONTENTS+1, m_iNumContents); i++ )
+	{
+		if( m_fTimeUntilScroll <= 0 )
+			m_CourseContentDisplays[iItemToDraw].SetY( fY + i*ContentsBarHeight);
+		m_CourseContentDisplays[iItemToDraw].Draw();
+		iItemToDraw = (iItemToDraw+1) % m_iNumContents;
+	}
+
+	// turn off Z buffer
+	DISPLAY->DisableZBuffer();
+}
+
+void CourseContentsList::TweenInAfterChangedCourse()
+{
+	m_fItemAtTopOfList = 0;
+	m_fTimeUntilScroll = 3;
+
+	for( int i=0; i<m_iNumContents; i++ )
+	{
+		CourseEntryDisplay& display = m_CourseContentDisplays[i];
+
+		display.SetXY( 0, -((MAX_VISIBLE_CONTENTS-1)/2) * float(ContentsBarHeight) );
+		display.StopTweening();
+		display.BeginTweening( i*0.1f );
+		display.SetTweenY( (-(MAX_VISIBLE_CONTENTS-1)/2 + i) * float(ContentsBarHeight) );
+	}
+}