summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjada <jada@28c7f869-5b4e-e670-f602-82bfaf57f300>2005-05-19 01:22:07 +0000
committerjada <jada@28c7f869-5b4e-e670-f602-82bfaf57f300>2005-05-19 01:22:07 +0000
commit263495275ef2c93b650ca5380a69a3b1b71f7abc (patch)
tree16aa7bbb33fd4e60a9e96d3bb9e5713ee0222a0b
parent0086e34e72627922a56093732027bd6b601bcd63 (diff)
Removed the hack that enable programmable shader via texture object.
-rw-r--r--src/GLSLShaderTest/ObjLoadGLSL.java3
-rw-r--r--src/GLSLShaderTest/SphereGLSL.java4
2 files changed, 0 insertions, 7 deletions
diff --git a/src/GLSLShaderTest/ObjLoadGLSL.java b/src/GLSLShaderTest/ObjLoadGLSL.java
index 3abfbae..92b1cb2 100644
--- a/src/GLSLShaderTest/ObjLoadGLSL.java
+++ b/src/GLSLShaderTest/ObjLoadGLSL.java
@@ -256,11 +256,8 @@ public class ObjLoadGLSL extends Applet {
private void setShaderProgram(BranchGroup g, ShaderProgram shaderProgram) {
ShaderAppearance myApp = new ShaderAppearance();
Material mat = new Material();
- Texture2D tex2d = new Texture2D();
- myApp.setCapability(Appearance.ALLOW_TEXTURE_WRITE);
myApp.setShaderProgram(shaderProgram);
myApp.setMaterial(mat);
- myApp.setTexture(tex2d);
setShaderProgram(g, myApp);
}
diff --git a/src/GLSLShaderTest/SphereGLSL.java b/src/GLSLShaderTest/SphereGLSL.java
index ca9717c..87d589e 100644
--- a/src/GLSLShaderTest/SphereGLSL.java
+++ b/src/GLSLShaderTest/SphereGLSL.java
@@ -107,10 +107,6 @@ public class SphereGLSL extends Applet {
ShaderAppearance a = new ShaderAppearance();
Material m = new Material(objColor, eColor, objColor, sColor, 100.0f);
m.setLightingEnable(true);
- Texture t2d = new Texture2D();
- a.setTexture(t2d);
- a.setCapability(Appearance.ALLOW_TEXTURE_WRITE);
-
String vertexProgram = null;
String fragmentProgram = null;
try {