Changeset 1259Tweet

Timestamp:

Apr 21, 2012, 6:58:33 PM (8 years ago)

Author:

sam

Message:

gpu: add methods to send mat2 and mat3 matrices to the shader.

Location:

trunk/src

Files:

• gpu/shader.cpp (modified) (1 diff)
• gpu/shader.h (modified) (1 diff)
• lol/math/vector.h (modified) (2 diffs)

trunk/src/gpu/shader.cpp

@@ -393 +393 @@
     if (uni.vert)
         cgGLSetParameter4f((CGparameter)uni.vert, v.x, v.y, v.z, v.w);
+#endif
+}
+
+void Shader::SetUniform(ShaderUniform const &uni, mat2 const &m)
+{
+#if defined USE_D3D9 || defined _XBOX
+    if (uni.flags & 1)
+        g_d3ddevice->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 1);
+    if (uni.flags & 2)
+        g_d3ddevice->SetVertexShaderConstantF((UINT)uni.vert, &m[0][0], 1);
+#elif !defined __CELLOS_LV2__
+    glUniformMatrix2fv(uni.frag, 1, GL_FALSE, &m[0][0]);
+#else
+    /* Not implemented */
+    Abort();
+#endif
+}
+
+void Shader::SetUniform(ShaderUniform const &uni, mat3 const &m)
+{
+#if defined USE_D3D9 || defined _XBOX
+    /* FIXME: does this work at all? */
+    if (uni.flags & 1)
+        g_d3ddevice->SetPixelShaderConstantF((UINT)uni.frag, &m[0][0], 3);
+    if (uni.flags & 2)
+        g_d3ddevice->SetVertexShaderConstantF((UINT)uni.vert, &m[0][0], 3);
+#elif !defined __CELLOS_LV2__
+    glUniformMatrix3fv(uni.frag, 1, GL_FALSE, &m[0][0]);
+#else
+    /* FIXME: not implemented */
+    Abort();
 #endif
 }

trunk/src/gpu/shader.h

@@ -67 +67 @@
     void SetUniform(ShaderUniform const &uni, vec3 const &v);
     void SetUniform(ShaderUniform const &uni, vec4 const &v);
+    void SetUniform(ShaderUniform const &uni, mat2 const &m);
+    void SetUniform(ShaderUniform const &uni, mat3 const &m);
     void SetUniform(ShaderUniform const &uni, mat4 const &m);
 

trunk/src/lol/math/vector.h

@@ -1453 +1453 @@
     }
 
-    static Mat3<T> normal(Mat3<T> const &mat)
-    {
-        return transpose(inverse(mat));
-    }
-
     void printf() const;
 
@@ -1545 +1540 @@
     {
         return rotate(angle, v) * mat;
-    }
-
-    static Mat3<T> normal(Mat4<T> const &mat)
-    {
-        return transpose(inverse(Mat3<T>(mat)));
     }