summaryrefslogtreecommitdiffstats
path: root/src/CgShaderTest/ObjLoadCg.java
diff options
context:
space:
mode:
authorkcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300>2005-04-08 18:02:30 +0000
committerkcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300>2005-04-08 18:02:30 +0000
commita1d93a902e47cb799b04735867c80dd3984d2301 (patch)
treec92e959c38be32660d37d1847a2995fad6f2cf99 /src/CgShaderTest/ObjLoadCg.java
parent0370c70b959e638811a2eb37eac60fa979a8c276 (diff)
Updated the examples to use the new SourceCodeShader class.
Diffstat (limited to 'src/CgShaderTest/ObjLoadCg.java')
-rw-r--r--src/CgShaderTest/ObjLoadCg.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/CgShaderTest/ObjLoadCg.java b/src/CgShaderTest/ObjLoadCg.java
index 8d48bce..0cef002 100644
--- a/src/CgShaderTest/ObjLoadCg.java
+++ b/src/CgShaderTest/ObjLoadCg.java
@@ -124,11 +124,15 @@ public class ObjLoadCg extends Applet {
e.printStackTrace();
System.exit(1);
}
- CgVertexShader vertexShader = new CgVertexShader(vertexProgram);
- CgFragmentShader fragmentShader = new CgFragmentShader(fragmentProgram);
- CgShaderProgram shaderProgram = new CgShaderProgram();
- shaderProgram.setVertexShader(vertexShader);
- shaderProgram.setFragmentShader(fragmentShader);
+ Shader[] shaders = new Shader[2];
+ shaders[0] = new SourceCodeShader(Shader.SHADING_LANGUAGE_CG,
+ Shader.SHADER_TYPE_VERTEX,
+ vertexProgram);
+ shaders[1] = new SourceCodeShader(Shader.SHADING_LANGUAGE_CG,
+ Shader.SHADER_TYPE_FRAGMENT,
+ fragmentProgram);
+ ShaderProgram shaderProgram = new CgShaderProgram();
+ shaderProgram.setShaders(shaders);
setShaderProgram(s.getSceneGroup(), shaderProgram);
objTrans.addChild(s.getSceneGroup());