added mat4 support for (shader-set\!)

resetting some variables on (clear): (show-axis), (fog), (show-fps), (clear-colour)
zzkt · Jun 30, 2011 · 618e4c9 · 618e4c9
1 parent 309e258
commit 618e4c9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/libfluxus/src/GLSLShader.cpp b/libfluxus/src/GLSLShader.cpp
@@ -302,8 +302,20 @@ void GLSLShader::SetVector(const string &name, dVector s, int size /* = 4 */)
 		case 4:
 			glUniform4f(param, s.x, s.y, s.z, s.w);
 			break;
+		default:
+			assert(false);
+			break;
 	}
-	CHECK_GL_ERRORS("glUniform");
+	#endif
+}
+
+void GLSLShader::SetMatrix(const string &name, dMatrix &m)
+{
+	#ifdef GLSL
+	if (!m_Enabled) return;
+
+	GLuint param = glGetUniformLocation(m_Program, name.c_str());
+	glUniformMatrix4fv(param, 1, GL_FALSE, m.arr());
 	#endif
 }
 

diff --git a/libfluxus/src/GLSLShader.h b/libfluxus/src/GLSLShader.h
@@ -86,6 +86,7 @@ class GLSLShader
 	void SetColour(const string &name, dColour s);
 	void SetIntArray(const string &name, const vector<int,FLX_ALLOC(int) > &s);
 	void SetFloatArray(const string &name, const vector<float,FLX_ALLOC(float) > &s);
+	void SetMatrix(const string &name, dMatrix &m);
 	void SetVectorArray(const string &name, const vector<dVector,FLX_ALLOC(dVector) > &s);
 	void SetColourArray(const string &name, const vector<dColour,FLX_ALLOC(dColour) > &s);
 	///@}

diff --git a/libfluxus/src/Renderer.cpp b/libfluxus/src/Renderer.cpp
@@ -94,6 +94,16 @@ Renderer::~Renderer()
 
 void Renderer::Clear()
 {
+	m_ShowAxis = false;
+
+	m_FogDensity = 0;
+	m_FogStart = 0;
+	m_FogEnd = 100;
+
+	m_FPSDisplay = false;
+
+	m_BGColour = dColour(0, 0, 0, 1);
+
 	m_World.Clear();
 	m_StateStack.clear();
 	m_CameraVec.clear();

diff --git a/modules/fluxus-engine/src/LocalStateFunctions.cpp b/modules/fluxus-engine/src/LocalStateFunctions.cpp
@@ -2843,8 +2843,15 @@ Scheme_Object *shader_set(int argc, Scheme_Object **argv)
 						shader->SetVector(param, vec, vecsize);
 					}
 					else
+					if (vecsize == 16)
 					{
-						Trace::Stream << "shader is expecting vector size 2, 3 or 4, but found " << vecsize <<
+						dMatrix m;
+						FloatsFromScheme(listvec, m.arr(), vecsize);
+						shader->SetMatrix(param, m);
+					}
+					else
+					{
+						Trace::Stream << "shader is expecting vector size 2, 3, 4 or 16 but found " << vecsize <<
 							" for variable " << param << endl;
 					}
 				}