diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index 50933dbaab..0f026901f7 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -321,7 +321,6 @@ AA29CDD50558741A00961A51 /* ScreenSelectCharacter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E005B047711F3005F316C /* ScreenSelectCharacter.cpp */; }; AA29CDDB0558741A00961A51 /* ScreenSelectMusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E0069047711F3005F316C /* ScreenSelectMusic.cpp */; }; AA29CDDD0558741A00961A51 /* ScreenSongOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E006F047711F3005F316C /* ScreenSongOptions.cpp */; }; - AA29CDE10558741A00961A51 /* ScreenTestFonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E0079047711F3005F316C /* ScreenTestFonts.cpp */; }; AA29CDE20558741A00961A51 /* ScreenTestSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E007B047711F3005F316C /* ScreenTestSound.cpp */; }; AA29CDE30558741A00961A51 /* ScreenTextEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E007D047711F3005F316C /* ScreenTextEntry.cpp */; }; AA29CDE40558741A00961A51 /* ScreenTitleMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E007F047711F3005F316C /* ScreenTitleMenu.cpp */; }; @@ -535,7 +534,6 @@ AA40D24209A08D650068C0D5 /* ScreenSelectCharacter.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E005C047711F3005F316C /* ScreenSelectCharacter.h */; }; AA40D24609A08D650068C0D5 /* ScreenSelectMusic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E006A047711F3005F316C /* ScreenSelectMusic.h */; }; AA40D24809A08D650068C0D5 /* ScreenSongOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E0070047711F3005F316C /* ScreenSongOptions.h */; }; - AA40D24A09A08D650068C0D5 /* ScreenTestFonts.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E007A047711F3005F316C /* ScreenTestFonts.h */; }; AA40D24B09A08D650068C0D5 /* ScreenTestSound.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E007C047711F3005F316C /* ScreenTestSound.h */; }; AA40D24C09A08D650068C0D5 /* ScreenTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E007E047711F3005F316C /* ScreenTextEntry.h */; }; AA40D24D09A08D650068C0D5 /* ScreenTitleMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E0080047711F3005F316C /* ScreenTitleMenu.h */; }; @@ -862,7 +860,6 @@ AA40D3FF09A08D650068C0D5 /* ScreenSelectCharacter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E005B047711F3005F316C /* ScreenSelectCharacter.cpp */; }; AA40D40309A08D650068C0D5 /* ScreenSelectMusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E0069047711F3005F316C /* ScreenSelectMusic.cpp */; }; AA40D40509A08D650068C0D5 /* ScreenSongOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E006F047711F3005F316C /* ScreenSongOptions.cpp */; }; - AA40D40709A08D650068C0D5 /* ScreenTestFonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E0079047711F3005F316C /* ScreenTestFonts.cpp */; }; AA40D40809A08D650068C0D5 /* ScreenTestSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E007B047711F3005F316C /* ScreenTestSound.cpp */; }; AA40D40909A08D650068C0D5 /* ScreenTextEntry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E007D047711F3005F316C /* ScreenTextEntry.cpp */; }; AA40D40A09A08D650068C0D5 /* ScreenTitleMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E007F047711F3005F316C /* ScreenTitleMenu.cpp */; }; @@ -2163,8 +2160,6 @@ AA6E006A047711F3005F316C /* ScreenSelectMusic.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ScreenSelectMusic.h; path = ../src/ScreenSelectMusic.h; sourceTree = ""; }; AA6E006F047711F3005F316C /* ScreenSongOptions.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = ScreenSongOptions.cpp; path = ../src/ScreenSongOptions.cpp; sourceTree = ""; }; AA6E0070047711F3005F316C /* ScreenSongOptions.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ScreenSongOptions.h; path = ../src/ScreenSongOptions.h; sourceTree = ""; }; - AA6E0079047711F3005F316C /* ScreenTestFonts.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = ScreenTestFonts.cpp; path = ../src/ScreenTestFonts.cpp; sourceTree = ""; }; - AA6E007A047711F3005F316C /* ScreenTestFonts.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ScreenTestFonts.h; path = ../src/ScreenTestFonts.h; sourceTree = ""; }; AA6E007B047711F3005F316C /* ScreenTestSound.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = ScreenTestSound.cpp; path = ../src/ScreenTestSound.cpp; sourceTree = ""; }; AA6E007C047711F3005F316C /* ScreenTestSound.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = ScreenTestSound.h; path = ../src/ScreenTestSound.h; sourceTree = ""; }; AA6E007D047711F3005F316C /* ScreenTextEntry.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = ScreenTextEntry.cpp; path = ../src/ScreenTextEntry.cpp; sourceTree = ""; }; @@ -3540,8 +3535,6 @@ AA07A55E0843E72B00E33D21 /* ScreenSyncOverlay.h */, AA1145DB075DFADF0050A3D1 /* ScreenSystemLayer.cpp */, AA1145DC075DFADF0050A3D1 /* ScreenSystemLayer.h */, - AA6E0079047711F3005F316C /* ScreenTestFonts.cpp */, - AA6E007A047711F3005F316C /* ScreenTestFonts.h */, AAC622FA05389A0500D02EE9 /* ScreenTestInput.cpp */, AAC622FB05389A0500D02EE9 /* ScreenTestInput.h */, AAF7435906110E8D00B19AD1 /* ScreenTestLights.cpp */, @@ -5283,7 +5276,6 @@ AA40D24209A08D650068C0D5 /* ScreenSelectCharacter.h in Headers */, AA40D24609A08D650068C0D5 /* ScreenSelectMusic.h in Headers */, AA40D24809A08D650068C0D5 /* ScreenSongOptions.h in Headers */, - AA40D24A09A08D650068C0D5 /* ScreenTestFonts.h in Headers */, AA40D24B09A08D650068C0D5 /* ScreenTestSound.h in Headers */, AA40D24C09A08D650068C0D5 /* ScreenTextEntry.h in Headers */, AA40D24D09A08D650068C0D5 /* ScreenTitleMenu.h in Headers */, @@ -6207,7 +6199,6 @@ AA29CDD50558741A00961A51 /* ScreenSelectCharacter.cpp in Sources */, AA29CDDB0558741A00961A51 /* ScreenSelectMusic.cpp in Sources */, AA29CDDD0558741A00961A51 /* ScreenSongOptions.cpp in Sources */, - AA29CDE10558741A00961A51 /* ScreenTestFonts.cpp in Sources */, AA29CDE20558741A00961A51 /* ScreenTestSound.cpp in Sources */, AA29CDE30558741A00961A51 /* ScreenTextEntry.cpp in Sources */, AA29CDE40558741A00961A51 /* ScreenTitleMenu.cpp in Sources */, @@ -6615,7 +6606,6 @@ AA40D3FF09A08D650068C0D5 /* ScreenSelectCharacter.cpp in Sources */, AA40D40309A08D650068C0D5 /* ScreenSelectMusic.cpp in Sources */, AA40D40509A08D650068C0D5 /* ScreenSongOptions.cpp in Sources */, - AA40D40709A08D650068C0D5 /* ScreenTestFonts.cpp in Sources */, AA40D40809A08D650068C0D5 /* ScreenTestSound.cpp in Sources */, AA40D40909A08D650068C0D5 /* ScreenTextEntry.cpp in Sources */, AA40D40A09A08D650068C0D5 /* ScreenTitleMenu.cpp in Sources */, diff --git a/src/Makefile.am b/src/Makefile.am index 7b7c57d5ab..34443e1708 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -107,7 +107,7 @@ ScreenSyncOverlay.cpp ScreenSyncOverlay.h \ ScreenSystemLayer.cpp ScreenSystemLayer.h ScreenSetTime.cpp ScreenSetTime.h \ ScreenSongOptions.cpp ScreenSongOptions.h \ ScreenSplash.cpp ScreenSplash.h \ -ScreenTestFonts.cpp ScreenTestFonts.h ScreenTestInput.cpp ScreenTestInput.h \ +ScreenTestInput.cpp ScreenTestInput.h \ ScreenTestLights.cpp ScreenTestLights.h ScreenTestSound.cpp ScreenTestSound.h ScreenTextEntry.cpp ScreenTextEntry.h \ ScreenTitleMenu.cpp ScreenTitleMenu.h \ ScreenUnlockBrowse.cpp ScreenUnlockBrowse.h \ diff --git a/src/ScreenTestFonts.cpp b/src/ScreenTestFonts.cpp deleted file mode 100644 index 708a2d711a..0000000000 --- a/src/ScreenTestFonts.cpp +++ /dev/null @@ -1,153 +0,0 @@ -#include "global.h" -#include "ScreenTestFonts.h" -#include "FontManager.h" -#include "RageTextureManager.h" -#include "ScreenTextEntry.h" -#include "ScreenDimensions.h" -#include "InputEventPlus.h" -#include "RageUtil.h" - - -static const float LineWidth = 400; -static const float LineHeight = 50; - -/** @brief A quick way of getting a font metric. */ -#define FONT( i ) THEME->GetMetric (m_sName,ssprintf("Font%i",i)) -/** @brief A quick way of getting a particular string. */ -#define TEXT( i ) THEME->GetString (m_sName,ssprintf("Text%i",i)) - -static RString g_sCustomText; - -static void ChangeText( const RString &sText ) -{ - g_sCustomText = sText; -} - -AutoScreenMessage( SM_ChangeText ); - -void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM ) -{ - if( SM == ScreenMessage(SM_ChangeText) ) - SetText( g_sCustomText ); -} - -REGISTER_SCREEN_CLASS( ScreenTestFonts ); - -void ScreenTestFonts::Init() -{ - Screen::Init(); - - Hline.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y); - Hline.SetZoomX(LineWidth); - Hline.SetDiffuse( RageColor(1, 1, 1, 1) ); - this->AddChild(&Hline); - - Vline.SetXY(SCREEN_CENTER_X, SCREEN_CENTER_Y); - Vline.SetZoomY(LineHeight); - Vline.SetDiffuse( RageColor(0, 1, 0, .8f) ); - this->AddChild(&Vline); - - font.SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y+100 ); - font.LoadFromFont( THEME->GetPathF("Common", "normal") ); - font.SetZoom(.5f); - this->AddChild(&font); - - txt.SetName( "Text" ); - SetFont( THEME->GetPathF("", FONT(1)) ); - LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( txt ); - SetText( "Foo" ); -} - -void ScreenTestFonts::SetText( RString sText ) -{ - txt.SetShadowLength( 0 ); - txt.SetText( "" ); /* force it */ - txt.SetText( sText ); - m_sCurText = sText; -} - -void ScreenTestFonts::SetFont( RString sFont ) -{ - m_sFont = sFont; - - txt.LoadFromFont( m_sFont ); - font.SetText( m_sFont ); - /* The font changed, so we need to reset the text or it'll be - * misaligned. */ - SetText( m_sCurText ); -} - -void ScreenTestFonts::DrawPrimitives() -{ - Screen::DrawPrimitives(); - - /* Draw this manually, so we can breakpoint here. */ - txt.Draw(); -} - - -void ScreenTestFonts::Input( const InputEventPlus &input ) -{ - if( input.type != IET_FIRST_PRESS ) - return; - switch( input.DeviceI.button ) - { - case '[': txt.SetVertAlign( align_bottom ); break; - case '\\': txt.SetVertAlign( align_middle ); break; - case ']': txt.SetVertAlign( align_top ); break; - - case ',': txt.SetHorizAlign( align_left ); break; - case '.': txt.SetHorizAlign( align_center ); break; - case '/': txt.SetHorizAlign( align_right ); break; - - case '`': if( m_sCurText != g_sCustomText ) - SetText( g_sCustomText ); - else - ScreenTextEntry::TextEntry( SM_ChangeText, "Edit text.", g_sCustomText, 100, NULL, ChangeText, NULL); - break; - case '1': SetText( TEXT(1) ); break; - case '2': SetText( TEXT(2) ); break; - case '3': SetText( TEXT(3) ); break; - case '4': SetText( TEXT(4) ); break; - case '5': SetText( TEXT(5) ); break; - - case 'q': SetFont( THEME->GetPathF("", FONT(1)) ); break; - case 'w': SetFont( THEME->GetPathF("", FONT(2)) ); break; - case 'e': SetFont( THEME->GetPathF("", FONT(3)) ); break; - case 'r': SetFont( THEME->GetPathF("", FONT(4)) ); break; - case 't': SetFont( THEME->GetPathF("", FONT(5)) ); break; - - case 'a': SetFont( THEME->GetPathF("", FONT(1)) ); break; - - case 'z': FONT->ReloadFonts(); - TEXTUREMAN->ReloadAll(); - SetText( m_sCurText ); - SetFont( m_sFont ); - break; - } -} - -/* - * (c) 2003-2005 Glenn Maynard - * 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/src/ScreenTestFonts.h b/src/ScreenTestFonts.h deleted file mode 100644 index c6cdf7e2cf..0000000000 --- a/src/ScreenTestFonts.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef SCREEN_TEST_FONTS_H -#define SCREEN_TEST_FONTS_H - -#include "Screen.h" -#include "BitmapText.h" -#include "Quad.h" - -/** @brief Display and test fonts. */ -class ScreenTestFonts: public Screen -{ -public: - virtual void Init(); - - void Input( const InputEventPlus &input ); - void DrawPrimitives(); - void HandleScreenMessage( const ScreenMessage SM ); - -private: - void SetText( RString sText ); - void SetFont( RString sFont ); - - /** @brief The current text to display. */ - RString m_sCurText; - /** @brief The current font in use. */ - RString m_sFont; - BitmapText txt, font; - Quad Vline, Hline; -}; - -#endif - -/* - * (c) 2003-2005 Glenn Maynard - * 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. - */