From d2ef9a8441fbc97ea40cfd8a905c8ee4f5cb1897 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 15 Nov 2002 21:27:13 +0000 Subject: [PATCH] The default OpenGL ortho matrix looks down the negative Z axis, not the positive one. I could have fixed this by reversing them at the glOrtho call, but I figured it'd be cleaner to just switch these. It also makes it match the 3d projection. --- stepmania/src/CourseContentsFrame.cpp | 2 +- stepmania/src/LifeMeterBar.cpp | 2 +- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenEz2SelectMusic.cpp | 2 +- stepmania/src/ScreenSelectStyle5th.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/CourseContentsFrame.cpp b/stepmania/src/CourseContentsFrame.cpp index f8ecc085af..eb811d8c70 100644 --- a/stepmania/src/CourseContentsFrame.cpp +++ b/stepmania/src/CourseContentsFrame.cpp @@ -143,7 +143,7 @@ void CourseContentsFrame::DrawPrimitives() DISPLAY->EnableZBuffer(); // write to z buffer so that top and bottom are clipped - m_quad.SetZ( -1 ); + m_quad.SetZ( 1 ); RectI rectBarSize(-(int)CONTENTS_BAR_WIDTH/2, -(int)CONTENTS_BAR_HEIGHT/2, (int)CONTENTS_BAR_WIDTH/2, (int)CONTENTS_BAR_HEIGHT/2); m_quad.StretchTo( rectBarSize ); diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index d31f3ce883..6e5849f70d 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -54,7 +54,7 @@ public: bool bExtra = GAMESTATE->IsExtraStage()||GAMESTATE->IsExtraStage2(); m_quadMask.SetDiffuse( RageColor(0,0,0,0) ); - m_quadMask.SetZ( -1 ); + m_quadMask.SetZ( 1 ); CString sGraphicPath; diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 8d3cc8c544..d6cc3c110c 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -435,7 +435,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) // Ez2dancer should control the grade tween using theme metrics m_Grades[p].SetXY( GRADE_X(p), GRADE_Y ); - m_Grades[p].SetZ( -2 ); + m_Grades[p].SetZ( 2 ); m_Grades[p].SetZoom( 1.0f ); m_Grades[p].SetEffectGlowing( 5.0f, GRADES_GLOW_COLOR_1, GRADES_GLOW_COLOR_2 ); if( SPIN_GRADES ) diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 3f830856f8..c8c53c2f78 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -129,7 +129,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() m_textHoldForOptions.SetZoom( 1 ); m_textHoldForOptions.SetZoomY( 0 ); m_textHoldForOptions.SetDiffuse( RageColor(1,1,1,0) ); - m_textHoldForOptions.SetZ( -2 ); + m_textHoldForOptions.SetZ( 2 ); this->AddChild( &m_textHoldForOptions ); diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp index c3c594ffba..03be5cd186 100644 --- a/stepmania/src/ScreenSelectStyle5th.cpp +++ b/stepmania/src/ScreenSelectStyle5th.cpp @@ -151,7 +151,7 @@ ScreenSelectStyle5th::ScreenSelectStyle5th() m_textExplanation1.LoadFromFont( THEME->GetPathTo("Fonts","header1") ); m_textExplanation1.SetDiffuse( RageColor(0,0.7f,0,1) ); m_textExplanation1.SetXY( EXPLANATION1_X, EXPLANATION1_Y ); - m_textExplanation1.SetZ( -1 ); + m_textExplanation1.SetZ( 1 ); m_textExplanation1.SetZoomX( EXPLANATION1_ZOOM_X ); m_textExplanation1.SetZoomY( EXPLANATION1_ZOOM_Y ); m_textExplanation1.SetHorizAlign( BitmapText::align_left ); @@ -160,7 +160,7 @@ ScreenSelectStyle5th::ScreenSelectStyle5th() m_textExplanation2.LoadFromFont( THEME->GetPathTo("Fonts","header1") ); m_textExplanation2.SetDiffuse( RageColor(0,0.7f,0,1) ); m_textExplanation2.SetXY( EXPLANATION2_X, EXPLANATION2_Y ); - m_textExplanation2.SetZ( -1 ); + m_textExplanation2.SetZ( 1 ); m_textExplanation2.SetZoomX( EXPLANATION2_ZOOM_X ); m_textExplanation2.SetZoomY( EXPLANATION2_ZOOM_Y ); m_textExplanation2.SetHorizAlign( BitmapText::align_left );