remove GrooveGraph
This commit is contained in:
Glenn Maynard
@@ -1,161 +0,0 @@
|
||||
#include "global.h"
|
||||
#include "GrooveGraph.h"
|
||||
#include "RageUtil.h"
|
||||
#include "PrefsManager.h"
|
||||
#include "GameConstantsAndTypes.h"
|
||||
#include "ThemeManager.h"
|
||||
#include "Steps.h"
|
||||
#include "RageDisplay.h"
|
||||
#include "song.h"
|
||||
#include "GameState.h"
|
||||
#include "Style.h"
|
||||
#include "ThemeMetric.h"
|
||||
|
||||
const float GRAPH_EDGE_WIDTH = 2;
|
||||
|
||||
#define EDGE_WIDTH THEME->GetMetricF("GrooveGraph","EdgeWidth")
|
||||
#define DIFFICULTY_COLORS(dc) THEME->GetMetricC("GrooveGraph",Capitalize(DifficultyToString(dc))+"Color")
|
||||
#define SHOW_CATEGORY(cat) THEME->GetMetricB("GrooveGraph","Show"+Capitalize(RadarCategoryToString(cat)))
|
||||
#define CATEGORY_X(cat) THEME->GetMetricF("GrooveGraph",Capitalize(RadarCategoryToString(cat))+"X")
|
||||
#define MOUNTAINS_BASE_Y THEME->GetMetricF("GrooveGraph","MountainsBaseY")
|
||||
ThemeMetric<float> MOUNTAIN_WIDTH ("GrooveGraph","MountainWidth");
|
||||
ThemeMetric<float> MOUNTAIN_HEIGHT ("GrooveGraph","MountainHeight");
|
||||
|
||||
RageColor g_DifficultyColorsCache[NUM_DIFFICULTIES];
|
||||
static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
|
||||
|
||||
GrooveGraph::GrooveGraph()
|
||||
{
|
||||
for( int i=0; i<NUM_DIFFICULTIES; i++ )
|
||||
g_DifficultyColorsCache[i] = DIFFICULTY_COLORS((Difficulty)i);
|
||||
|
||||
m_sprBase.Load( THEME->GetPathG("GrooveGraph","base") );
|
||||
this->AddChild( &m_sprBase );
|
||||
|
||||
for( int c=0; c<NUM_SHOWN_RADAR_CATEGORIES; c++ )
|
||||
{
|
||||
if( !SHOW_CATEGORY((RadarCategory)c) )
|
||||
continue;
|
||||
|
||||
m_Mountains[c].SetXY( CATEGORY_X((RadarCategory)c), MOUNTAINS_BASE_Y );
|
||||
this->AddChild( &m_Mountains[c] );
|
||||
}
|
||||
}
|
||||
|
||||
void GrooveGraph::SetFromSong( Song* pSong )
|
||||
{
|
||||
RadarValues rvs[NUM_DIFFICULTIES];
|
||||
|
||||
if( pSong )
|
||||
{
|
||||
for( int i=0; i<NUM_DIFFICULTIES; i++ )
|
||||
{
|
||||
Steps* pSteps = pSong->GetStepsByDifficulty( GAMESTATE->GetCurrentStyle()->m_StepsType, (Difficulty)i );
|
||||
if( pSteps )
|
||||
rvs[i] = pSteps->GetRadarValues();
|
||||
}
|
||||
}
|
||||
|
||||
for( int j=0; j<NUM_SHOWN_RADAR_CATEGORIES; j++ )
|
||||
{
|
||||
float fValues[NUM_DIFFICULTIES];
|
||||
FOREACH_Difficulty( dc )
|
||||
{
|
||||
fValues[dc] = rvs[j][dc];
|
||||
}
|
||||
m_Mountains[j].SetValues( fValues );
|
||||
}
|
||||
}
|
||||
|
||||
void GrooveGraph::TweenOnScreen()
|
||||
{
|
||||
}
|
||||
|
||||
void GrooveGraph::TweenOffScreen()
|
||||
{
|
||||
}
|
||||
|
||||
GrooveGraph::Mountain::Mountain()
|
||||
{
|
||||
m_fPercentTowardNew = 0;
|
||||
|
||||
for( int i=0; i<NUM_DIFFICULTIES; i++ )
|
||||
{
|
||||
m_fValuesNew[i] = 0;
|
||||
m_fValuesOld[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void GrooveGraph::Mountain::SetValues( float fNewValues[NUM_DIFFICULTIES] )
|
||||
{
|
||||
m_fPercentTowardNew = 0;
|
||||
|
||||
for( int i=0; i<NUM_DIFFICULTIES; i++ )
|
||||
{
|
||||
m_fValuesOld[i] = m_fValuesNew[i];
|
||||
m_fValuesNew[i] = fNewValues[i];
|
||||
}
|
||||
}
|
||||
|
||||
void GrooveGraph::Mountain::Update( float fDeltaTime )
|
||||
{
|
||||
Actor::Update( fDeltaTime );
|
||||
|
||||
m_fPercentTowardNew += 4.0f*fDeltaTime;
|
||||
CLAMP( m_fPercentTowardNew, 0, 1 );
|
||||
}
|
||||
|
||||
void GrooveGraph::Mountain::DrawPrimitives()
|
||||
{
|
||||
DISPLAY->ClearAllTextures();
|
||||
DISPLAY->SetTextureModeModulate();
|
||||
RageSpriteVertex v[4];
|
||||
|
||||
for( int i=NUM_DIFFICULTIES-1; i>=0; i-- )
|
||||
{
|
||||
float fValue = SCALE(m_fPercentTowardNew, 0.f, 1.f, m_fValuesOld[i], m_fValuesNew[i] );
|
||||
float fHeight = MOUNTAIN_HEIGHT*fValue;
|
||||
v[0].p = v[3].p = RageVector3( -MOUNTAIN_WIDTH/2, 0, 0 );
|
||||
v[1].p = RageVector3( MOUNTAIN_WIDTH/2, 0, 0 );
|
||||
v[2].p = RageVector3( 0, -fHeight, 0 );
|
||||
v[0].c = v[1].c = v[2].c = v[3].c = g_DifficultyColorsCache[i];
|
||||
DISPLAY->DrawFan( v, 3 );
|
||||
}
|
||||
|
||||
// TODO: Add this back in
|
||||
// This shouldn't be needed anymore. -glenn
|
||||
// switch( PREFSMAN->m_iPolygonRadar )
|
||||
// {
|
||||
// case 0: DISPLAY->DrawLoop_LinesAndPoints( v, 3, 2 ); break;
|
||||
// case 1: DISPLAY->DrawLoop_Polys( v, 3, 2 ); break;
|
||||
// default:
|
||||
// case -1:
|
||||
DISPLAY->DrawLineStrip( v, 4, 2 );
|
||||
// break;
|
||||
// }
|
||||
}
|
||||
|
||||
/*
|
||||
* (c) 2003-2004 Chris Danford
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
||||
* whom the Software is furnished to do so, provided that the above
|
||||
* copyright notice(s) and this permission notice appear in all copies of
|
||||
* the Software and that both the above copyright notice(s) and this
|
||||
* permission notice appear in supporting documentation.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
@@ -1,69 +0,0 @@
|
||||
/* GrooveGraph - The song's GrooveGraph displayed in SelectSong. */
|
||||
|
||||
#ifndef GROOVE_GRAPH_H
|
||||
#define GROOVE_GRAPH_H
|
||||
|
||||
#include "ActorFrame.h"
|
||||
#include "Sprite.h"
|
||||
#include "GameConstantsAndTypes.h"
|
||||
#include "Difficulty.h"
|
||||
class Song;
|
||||
|
||||
|
||||
class GrooveGraph : public ActorFrame
|
||||
{
|
||||
public:
|
||||
GrooveGraph();
|
||||
|
||||
void SetFromSong( Song* pSong ); // NULL means no Song
|
||||
|
||||
void TweenOnScreen();
|
||||
void TweenOffScreen();
|
||||
|
||||
protected:
|
||||
|
||||
class Mountain : public Actor
|
||||
{
|
||||
public:
|
||||
Mountain();
|
||||
|
||||
virtual void Update( float fDeltaTime );
|
||||
virtual void DrawPrimitives();
|
||||
|
||||
void SetValues( float fNewValues[] );
|
||||
|
||||
float m_fPercentTowardNew;
|
||||
float m_fValuesNew[NUM_DIFFICULTIES];
|
||||
float m_fValuesOld[NUM_DIFFICULTIES];
|
||||
};
|
||||
|
||||
Sprite m_sprBase;
|
||||
Mountain m_Mountains[NUM_RADAR_CATEGORIES];
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* (c) 2003-2004 Chris Danford
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
||||
* whom the Software is furnished to do so, provided that the above
|
||||
* copyright notice(s) and this permission notice appear in all copies of
|
||||
* the Software and that both the above copyright notice(s) and this
|
||||
* permission notice appear in supporting documentation.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
@@ -228,7 +228,7 @@ DifficultyDisplay.cpp DifficultyDisplay.h DifficultyList.cpp DifficultyList.h \
|
||||
DifficultyMeter.cpp DifficultyMeter.h DifficultyRating.cpp DifficultyRating.h \
|
||||
DualScrollBar.cpp DualScrollBar.h \
|
||||
EditCoursesMenu.cpp EditCoursesMenu.h EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \
|
||||
GradeDisplay.cpp GradeDisplay.h GraphDisplay.cpp GraphDisplay.h GrooveGraph.cpp GrooveGraph.h \
|
||||
GradeDisplay.cpp GradeDisplay.h GraphDisplay.cpp GraphDisplay.h \
|
||||
GrooveRadar.cpp GrooveRadar.h GroupList.cpp GroupList.h HelpDisplay.cpp HelpDisplay.h \
|
||||
MemoryCardDisplay.cpp MemoryCardDisplay.h \
|
||||
MenuTimer.cpp MenuTimer.h ModeSwitcher.cpp ModeSwitcher.h MusicBannerWheel.cpp MusicBannerWheel.h \
|
||||
|
||||
@@ -1593,12 +1593,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
|
||||
<File
|
||||
RelativePath="GraphDisplay.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="GrooveGraph.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="GrooveGraph.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="GrooveRadar.cpp">
|
||||
</File>
|
||||
|
||||
Reference in New Issue
Block a user