actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-24 01:00:49 +00:00
parent 6fecb35dfa
commit 63368f99da
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BitmapText.cpp
+6 -6
View File
@@ -222,17 +222,17 @@ void BitmapText::BuildChars()
iX -= g.m_iHadvance; iX -= g.m_iHadvance;
/* set vertex positions */ /* set vertex positions */
v[0].p = RageVector3( iX+g.m_fHshift, iY+g.m_pPage->m_fVshift, 0 ); // top left v[0].p = RageVector3( iX+g.m_fHshift, iY+g.m_pPage->m_fVshift, 0 ); // top left
v[1].p = RageVector3( iX+g.m_fHshift, iY+g.m_pPage->m_fVshift+g.m_fHeight, 0 ); // bottom left v[1].p = RageVector3( iX+g.m_fHshift, iY+g.m_pPage->m_fVshift+g.m_fHeight, 0 ); // bottom left
v[2].p = RageVector3( iX+g.m_fHshift+g.m_fWidth, iY+g.m_pPage->m_fVshift+g.m_fHeight, 0 ); // bottom right v[2].p = RageVector3( iX+g.m_fHshift+g.m_fWidth, iY+g.m_pPage->m_fVshift+g.m_fHeight, 0 ); // bottom right
v[3].p = RageVector3( iX+g.m_fHshift+g.m_fWidth, iY+g.m_pPage->m_fVshift, 0 ); // top right v[3].p = RageVector3( iX+g.m_fHshift+g.m_fWidth, iY+g.m_pPage->m_fVshift, 0 ); // top right
/* Advance the cursor. */ /* Advance the cursor. */
iX += g.m_iHadvance; iX += g.m_iHadvance;
/* set texture coordinates */ /* set texture coordinates */
v[0].t = RageVector2( g.m_TexRect.left, g.m_TexRect.top ); v[0].t = RageVector2( g.m_TexRect.left, g.m_TexRect.top );
v[1].t = RageVector2( g.m_TexRect.left, g.m_TexRect.bottom ); v[1].t = RageVector2( g.m_TexRect.left, g.m_TexRect.bottom );
v[2].t = RageVector2( g.m_TexRect.right, g.m_TexRect.bottom ); v[2].t = RageVector2( g.m_TexRect.right, g.m_TexRect.bottom );
v[3].t = RageVector2( g.m_TexRect.right, g.m_TexRect.top ); v[3].t = RageVector2( g.m_TexRect.right, g.m_TexRect.top );
stepmania/src/ScreenTestInput.cpp
+5 -13
View File
@@ -38,12 +38,6 @@ void ScreenTestInput::Init()
} }
ScreenTestInput::~ScreenTestInput()
{
LOG->Trace( "ScreenTestInput::~ScreenTestInput()" );
}
static LocalizedString CONTROLLER ( "ScreenTestInput", "Controller" ); static LocalizedString CONTROLLER ( "ScreenTestInput", "Controller" );
static LocalizedString SECONDARY ( "ScreenTestInput", "secondary" ); static LocalizedString SECONDARY ( "ScreenTestInput", "secondary" );
static LocalizedString NOT_MAPPED ( "ScreenTestInput", "not mapped" ); static LocalizedString NOT_MAPPED ( "ScreenTestInput", "not mapped" );
@@ -120,14 +114,12 @@ void ScreenTestInput::Input( const InputEventPlus &input )
{ {
case IET_FIRST_PRESS: case IET_FIRST_PRESS:
case IET_RELEASE: case IET_RELEASE:
switch( input.type )
{ {
switch( input.type ) case IET_FIRST_PRESS: sMessage += "Pressed"; break;
{ case IET_RELEASE: sMessage += "Released"; break;
case IET_FIRST_PRESS: sMessage += "Pressed"; break;
case IET_RELEASE: sMessage += "Released"; break;
}
MESSAGEMAN->Broadcast( sMessage );
} }
MESSAGEMAN->Broadcast( sMessage );
} }
if( input.type != IET_FIRST_PRESS && input.type != IET_SLOW_REPEAT ) if( input.type != IET_FIRST_PRESS && input.type != IET_SLOW_REPEAT )
@@ -143,7 +135,7 @@ void ScreenTestInput::MenuStart( PlayerNumber pn )
void ScreenTestInput::MenuBack( PlayerNumber pn ) void ScreenTestInput::MenuBack( PlayerNumber pn )
{ {
if(!IsTransitioning()) if( !IsTransitioning() )
{ {
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
StartTransitioningScreen( SM_GoToPrevScreen ); StartTransitioningScreen( SM_GoToPrevScreen );
stepmania/src/ScreenTestInput.h
-1
View File
@@ -11,7 +11,6 @@ class ScreenTestInput : public ScreenWithMenuElements
{ {
public: public:
virtual void Init(); virtual void Init();
virtual ~ScreenTestInput();
virtual void Update( float fDelta ); virtual void Update( float fDelta );
virtual void Input( const InputEventPlus &input ); virtual void Input( const InputEventPlus &input );