From ba207c5140699672ba6fe16a6bee4f53740f23ba Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 23 Jun 2005 02:47:43 +0000 Subject: [PATCH] remove GrooveGraph --- stepmania/src/GrooveGraph.cpp | 161 --------------------------------- stepmania/src/GrooveGraph.h | 69 -------------- stepmania/src/Makefile.am | 2 +- stepmania/src/StepMania.vcproj | 6 -- 4 files changed, 1 insertion(+), 237 deletions(-) delete mode 100644 stepmania/src/GrooveGraph.cpp delete mode 100644 stepmania/src/GrooveGraph.h diff --git a/stepmania/src/GrooveGraph.cpp b/stepmania/src/GrooveGraph.cpp deleted file mode 100644 index b8b67d2bb0..0000000000 --- a/stepmania/src/GrooveGraph.cpp +++ /dev/null @@ -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 MOUNTAIN_WIDTH ("GrooveGraph","MountainWidth"); -ThemeMetric MOUNTAIN_HEIGHT ("GrooveGraph","MountainHeight"); - -RageColor g_DifficultyColorsCache[NUM_DIFFICULTIES]; -static const int NUM_SHOWN_RADAR_CATEGORIES = 5; - -GrooveGraph::GrooveGraph() -{ - for( int i=0; iGetPathG("GrooveGraph","base") ); - this->AddChild( &m_sprBase ); - - for( int c=0; cAddChild( &m_Mountains[c] ); - } -} - -void GrooveGraph::SetFromSong( Song* pSong ) -{ - RadarValues rvs[NUM_DIFFICULTIES]; - - if( pSong ) - { - for( int i=0; iGetStepsByDifficulty( GAMESTATE->GetCurrentStyle()->m_StepsType, (Difficulty)i ); - if( pSteps ) - rvs[i] = pSteps->GetRadarValues(); - } - } - - for( int j=0; jClearAllTextures(); - 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. - */ diff --git a/stepmania/src/GrooveGraph.h b/stepmania/src/GrooveGraph.h deleted file mode 100644 index 8d82e99bbc..0000000000 --- a/stepmania/src/GrooveGraph.h +++ /dev/null @@ -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. - */ diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 552b4f813e..1b6f407434 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -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 \ diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index a0cb0c71f5..0d9db0d7f3 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1593,12 +1593,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - -