*Bugfixing the Material

src/Renderer/Dbg.cpp

@@ -109,7 +109,7 @@ void init()
 	fbo.unbind();
 
 	// shader
-	sProg.customLoad( "shaders/dbg.glsl" );
+	sProg.customLoad( "shaders/Dbg.glsl" );
 }
 
 

src/Resources/Material.cpp

@@ -200,20 +200,22 @@ bool Material::load( const char* filename )
 			// loop all the vars
 			do
 			{
-				userDefinedVars.push_back( UserDefinedVar() ); // create new var
-				UserDefinedVar& var = userDefinedVars.back();
-
 				// read the name
-				string varName;
 				token = &scanner.getNextToken();
-				if( token->code == Scanner::TC_IDENTIFIER )
-					varName = token->value.string;
-				else
+				if( token->code == Scanner::TC_RBRACKET ) break;
+
+				if( token->code != Scanner::TC_IDENTIFIER )
 				{
 					PARSE_ERR_EXPECTED( "identifier" );
 					return false;
 				}
 
+				string varName;
+				varName = token->value.string;
+
+				userDefinedVars.push_back( UserDefinedVar() ); // create new var
+				UserDefinedVar& var = userDefinedVars.back();
+
 				// check if the uniform exists
 				if( !shaderProg->uniVarExists( varName.c_str() ) )
 				{
@@ -224,7 +226,7 @@ bool Material::load( const char* filename )
 				var.sProgVar = & shaderProg->getUniVar( varName.c_str() );
 
 				// read the values
-				switch( var.sProgVar->getType() )
+				switch( var.sProgVar->getGlDataType() )
 				{
 					// texture
 					case GL_SAMPLER_2D:
@@ -398,15 +400,15 @@ void Material::setup()
 
 
 	// now loop all the user defined vars and set them
-	uint texture_unit = 0;
+	uint texture_Unit = 0;
 	Vec<UserDefinedVar>::iterator udv;
 	for( udv=userDefinedVars.begin(); udv!=userDefinedVars.end(); udv++ )
 	{
-		switch( udv->sProgVar->getType() )
+		switch( udv->sProgVar->getGlDataType() )
 		{
 			// texture
 			case GL_SAMPLER_2D:
-				shaderProg->locTexUnit( udv->sProgVar->getLoc(), *udv->value.texture, texture_unit++ );
+				shaderProg->locTexUnit( udv->sProgVar->getLoc(), *udv->value.texture, texture_Unit++ );
 				break;
 			// float
 			case GL_FLOAT:

src/Resources/ShaderProg.h

@@ -41,6 +41,10 @@ class ShaderProg: public Resource
 				Var( int loc_, const char* name_, GLenum glDataType_, uint type_ ):
 					loc(loc_), name(name_), glDataType(glDataType_), type(type_)
 				{}
+
+				Var( const Var& var ):
+					loc(var.loc), name(var.name), glDataType(var.glDataType), type(var.type)
+				{}
 		};
 
 		Var dummyVar; ///< Returned on error