Added setUniformMatrices*() methods to Shader. Fleshed out setUniform*() methods in ShaderNode. The setUniform*() methods can be called from any thread; they store the parameters so that the next time getShader() is called from the GL thread, the parameters will be passed down to OpenGL. These two classes should be pretty close to "feature complete" now.

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/joglutils/trunk@64 83d24430-9974-4f80-8418-2cc3294053b9

1 files changed, 0 insertions, 11 deletions

diff --git a/src/net/java/joglutils/msg/elements/GLShaderElement.java b/src/net/java/joglutils/msg/elements/GLShaderElement.java
index cf28c97..178a8f2 100644
--- a/src/net/java/joglutils/msg/elements/GLShaderElement.java
+++ b/src/net/java/joglutils/msg/elements/GLShaderElement.java
@@ -90,17 +90,6 @@ public class GLShaderElement extends ShaderElement {
     }
     if (curShader != null) {
       curShader.enable();
-
-      // FIXME: the following is a big hack...
-      Map<String, Vec4f> fMap = shader.getUniformfMap();
-      if (!fMap.isEmpty()) {
-        for (String name : fMap.keySet()) {
-          Vec4f val = fMap.get(name);
-          //curShader.setUniform(name, val.x(), val.y(), val.z(), val.w());
-	  curShader.setUniform(name, val.x());
-          fMap.clear();
-        }
-      }
     }
   }
 }