[Hgengine-cvs] SF.net SVN: hgengine:[342] Mercury2/src/Shader.cpp

[<axl...@us...>]

Revision: 342
          http://hgengine.svn.sourceforge.net/hgengine/?rev=342&view=rev
Author:   axlecrusher
Date:     2009-06-16 00:45:40 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
set uniforms when activating

Modified Paths:
--------------
    Mercury2/src/Shader.cpp

Modified: Mercury2/src/Shader.cpp
===================================================================
--- Mercury2/src/Shader.cpp	2009-06-16 00:27:10 UTC (rev 341)
+++ Mercury2/src/Shader.cpp	2009-06-16 00:45:40 UTC (rev 342)
@@ -328,13 +328,6 @@
 		glGetActiveUniformARB( iProgramID, i, 1024, &bufflen, &size, &type, buffer );
 		buffer[bufflen] = 0;
 		m_uniforms[buffer] = glGetUniformLocationARB( iProgramID, buffer );
-		
-		//load in global data if it exists
-		std::map< MString, ShaderAttribute >::iterator sai = m_globalAttributes.find( buffer );
-		if (sai != m_globalAttributes.end())
-		{
-			SetAttributeInternal(sai->first, sai->second);
-		}
 	}
 	return true;
 }
@@ -417,7 +410,16 @@
 	glUseProgramObjectARB( iProgramID );
 	GLERRORCHECK;
 	
-	//set global attributes here
+	//set attributes here
+	std::map< MString, int >::iterator ui = m_uniforms.begin();
+	for (;ui != m_uniforms.end(); ++ui)
+	{
+		std::map< MString, ShaderAttribute >::iterator sai = m_globalAttributes.find( ui->first );
+		if (sai != m_globalAttributes.end())
+		{
+			SetAttributeInternal(sai->first, sai->second);
+		}
+	}
 }
 
 void Shader::DeactivateShader()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.