Merge branch 'etternalmemestatus' of https://github.com/etternagame/e…

…tterna.git into etternalmemestatus
etternagame · Jun 13, 2017 · 96947c5 · 96947c5
2 parents 9d234b5 + da33713
commit 96947c5
Show file tree

Hide file tree

Showing 12 changed files with 186 additions and 138 deletions.
diff --git a/src/ActorMultiTexture.cpp b/src/ActorMultiTexture.cpp
@@ -97,7 +97,6 @@ void ActorMultiTexture::DrawPrimitives()
 	quadVerticies.top    = -m_size.y/2.0f;
 	quadVerticies.bottom = +m_size.y/2.0f;
 
-	DISPLAY->ClearAllTextures();
 	for( size_t i = 0; i < m_aTextureUnits.size(); ++i )
 	{
 		TextureUnit tu = enum_add2(TextureUnit_1, i);
@@ -130,7 +129,8 @@ void ActorMultiTexture::DrawPrimitives()
 	for( size_t i = 0; i < m_aTextureUnits.size(); ++i )
 		DISPLAY->SetTexture( enum_add2(TextureUnit_1, i), 0 );
 
-	DISPLAY->SetEffectMode( EffectMode_Normal );
+	if ( m_EffectMode != EffectMode_Normal )
+		DISPLAY->SetEffectMode(EffectMode_Normal);
 }
 
 bool ActorMultiTexture::EarlyAbortDraw() const

diff --git a/src/ActorMultiVertex.cpp b/src/ActorMultiVertex.cpp
@@ -218,7 +218,6 @@ void ActorMultiVertex::DrawPrimitives()
 {
 	Actor::SetGlobalRenderStates();	// set Actor-specified render states
 
-	DISPLAY->ClearAllTextures();
 	DISPLAY->SetTexture( TextureUnit_1, _Texture->GetTexHandle() );
 
 	Actor::SetTextureRenderStates();
@@ -330,7 +329,8 @@ void ActorMultiVertex::DrawInternal( const AMV_TweenState *TS )
 			break;
 	}
 
-	DISPLAY->SetEffectMode( EffectMode_Normal );
+	if ( _EffectMode != EffectMode_Normal )
+		DISPLAY->SetEffectMode(EffectMode_Normal);
 }
 
 bool ActorMultiVertex::EarlyAbortDraw() const

diff --git a/src/BitmapText.cpp b/src/BitmapText.cpp
@@ -424,7 +424,6 @@ void BitmapText::DrawChars( bool bUseStrokeTexture )
 	bool haveTextures = false;
 	int startingPoint = iStartGlyph;
 
-	DISPLAY->ClearAllTextures();
 	for ( int start = iStartGlyph; start < iEndGlyph; )
 	{
 		int end = start;
@@ -465,7 +464,6 @@ void BitmapText::DrawChars( bool bUseStrokeTexture )
 			DISPLAY->DrawQuads(&m_aVertices[startingPoint * 4], (end - startingPoint) * 4);
 
 			// Setup for the next render pass
-			DISPLAY->ClearAllTextures();
 			startingPoint = end;
 			haveTextures = false;
 		}

diff --git a/src/GraphDisplay.cpp b/src/GraphDisplay.cpp
@@ -26,8 +26,6 @@ class GraphLine: public Actor
 	{
 		Actor::SetGlobalRenderStates();	// set Actor-specified render states
 
-		DISPLAY->ClearAllTextures();
-
 		// Must call this after setting the texture or else texture 
 		// parameters have no effect.
 		Actor::SetTextureRenderStates();
@@ -133,7 +131,6 @@ class GraphBody: public Actor
 	{
 		Actor::SetGlobalRenderStates();	// set Actor-specified render states
 
-		DISPLAY->ClearAllTextures();
 		DISPLAY->SetTexture( TextureUnit_1, m_pTexture->GetTexHandle() );
 
 		// Must call this after setting the texture or else texture 

diff --git a/src/GrooveRadar.cpp b/src/GrooveRadar.cpp
@@ -146,7 +146,6 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
 	// draw radar filling
 	const float fRadius = GetUnzoomedWidth()/2.0f*1.1f;
 
-	DISPLAY->ClearAllTextures();
 	DISPLAY->SetTextureMode( TextureUnit_1, TextureMode_Modulate );
 	RageSpriteVertex v[12]; // needed to draw 5 fan primitives and 10 strip primitives
 

diff --git a/src/Model.cpp b/src/Model.cpp
@@ -418,7 +418,6 @@ void Model::DrawPrimitives()
 				static const RageColor specular( 0.2f,0.2f,0.2f,1 );
 				static const float shininess = 1;
 				DISPLAY->SetMaterial( emissive, ambient, diffuse, specular, shininess );
-				DISPLAY->ClearAllTextures();
 				DISPLAY->SetSphereEnvironmentMapping( TextureUnit_1, false );
 				DrawMesh( i );
 			}
@@ -445,18 +444,13 @@ void Model::DrawPrimitives()
 			float shininess = 1;
 
 			DISPLAY->SetMaterial( emissive, ambient, diffuse, specular, shininess );
-			DISPLAY->ClearAllTextures();
 
 			if( pMesh->nMaterialIndex != -1 )
 			{
 				msMaterial& mat = m_Materials[ pMesh->nMaterialIndex ];
 				DISPLAY->SetTexture( TextureUnit_1, mat.diffuse.GetCurrentTexture() ? mat.diffuse.GetCurrentTexture()->GetTexHandle() : 0 );
 				Actor::SetTextureRenderStates();	// set Actor-specified render states
 			}
-			else
-			{
-				// hey why is this otherwise empty else block here? -aj
-			}
 
 			DrawMesh( i );
 		}

diff --git a/src/NoteDisplay.cpp b/src/NoteDisplay.cpp
@@ -789,8 +789,6 @@ void NoteDisplay::DrawHoldPart(vector<Sprite*> &vpSpr,
 		}
 	}
 
-	DISPLAY->ClearAllTextures();
-
 	const float fTexCoordLeft	= rect.left;
 	const float fTexCoordRight	= rect.right;
 	const float fTexCoordCenter	= (fTexCoordLeft+fTexCoordRight)/2;