diff options
author | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2005-04-08 18:02:30 +0000 |
---|---|---|
committer | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2005-04-08 18:02:30 +0000 |
commit | a1d93a902e47cb799b04735867c80dd3984d2301 (patch) | |
tree | c92e959c38be32660d37d1847a2995fad6f2cf99 /src/GLSLShaderTest/SphereGLSL.java | |
parent | 0370c70b959e638811a2eb37eac60fa979a8c276 (diff) |
Updated the examples to use the new SourceCodeShader class.
Diffstat (limited to 'src/GLSLShaderTest/SphereGLSL.java')
-rw-r--r-- | src/GLSLShaderTest/SphereGLSL.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/GLSLShaderTest/SphereGLSL.java b/src/GLSLShaderTest/SphereGLSL.java index 4ad34b8..ca9717c 100644 --- a/src/GLSLShaderTest/SphereGLSL.java +++ b/src/GLSLShaderTest/SphereGLSL.java @@ -124,11 +124,15 @@ public class SphereGLSL extends Applet { */ System.err.println(e); } - GLSLVertexShader vertexShader = new GLSLVertexShader(vertexProgram); - GLSLFragmentShader fragmentShader = new GLSLFragmentShader(fragmentProgram); - GLSLShaderProgram shaderProgram = new GLSLShaderProgram(); - shaderProgram.setVertexShader(vertexShader); - shaderProgram.setFragmentShader(fragmentShader); + Shader[] shaders = new Shader[2]; + shaders[0] = new SourceCodeShader(Shader.SHADING_LANGUAGE_GLSL, + Shader.SHADER_TYPE_VERTEX, + vertexProgram); + shaders[1] = new SourceCodeShader(Shader.SHADING_LANGUAGE_GLSL, + Shader.SHADER_TYPE_FRAGMENT, + fragmentProgram); + ShaderProgram shaderProgram = new GLSLShaderProgram(); + shaderProgram.setShaders(shaders); a.setShaderProgram(shaderProgram); a.setMaterial(m); |