[Hgengine-cvs] SF.net SVN: hgengine:[445] Mercury2/src

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

Revision: 445
          http://hgengine.svn.sourceforge.net/hgengine/?rev=445&view=rev
Author:   axlecrusher
Date:     2009-08-01 02:44:35 +0000 (Sat, 01 Aug 2009)

Log Message:
-----------
int4 (ivec4)

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

Modified: Mercury2/src/Shader.cpp
===================================================================
--- Mercury2/src/Shader.cpp	2009-08-01 02:43:14 UTC (rev 444)
+++ Mercury2/src/Shader.cpp	2009-08-01 02:44:35 UTC (rev 445)
@@ -485,10 +485,14 @@
 				break;
 			case ShaderAttribute::TYPE_FLOAT:
 			case ShaderAttribute::TYPE_FLOATV4:
-				glUniform4fvARB( location, 4, &x.value.fFloatV4[0] );
+				glUniform4fvARB( location, 1, &x.value.fFloatV4[0] );
 				break;
 			case ShaderAttribute::TYPE_MATRIX:
 				glUniformMatrix4fvARB(location, 1, 1, x.value.matrix); //transpase too
+				break;
+			case ShaderAttribute::TYPE_INT4:
+				glUniform4ivARB( location, 1, x.value.iInts );
+				break;
 		};
 		GLERRORCHECK;
 	}

Modified: Mercury2/src/Shader.h
===================================================================
--- Mercury2/src/Shader.h	2009-08-01 02:43:14 UTC (rev 444)
+++ Mercury2/src/Shader.h	2009-08-01 02:44:35 UTC (rev 445)
@@ -17,6 +17,7 @@
 	enum ShaderAttributeTyp
 	{
 		TYPE_INT,		///Synonomous to 'int' when passing into a shader
+		TYPE_INT4,		///Synonomous to 'ivec4' when passing into a shader
 		TYPE_SAMPLER,		///Synonomous to 'sampler2D' when passing into a shader
 		TYPE_FLOAT,		///Synonomous to 'float' when passing into a shader
 		TYPE_FLOATV4,		///Synonomous to 'vec4' when passing into a shader
@@ -31,6 +32,7 @@
 		float 		fFloat;		///Synonomous to 'float'
 		float		fFloatV4[4]; 	///Synonomous to 'vec4'
 		const float*	matrix;		///Synonomous to 'mat4'
+		int		iInts[4];	///Synonomous to 'int4'
 	} value;
 };
 


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