summaryrefslogtreecommitdiffstats
path: root/src/demos/dualDepthPeeling/DualDepthPeeling.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-18 18:53:45 +0100
committerSven Gothel <[email protected]>2012-02-18 18:53:45 +0100
commit063477d2a3136a3294a6f8917c87fa31f50a5467 (patch)
treeb2ccd15ab47b792f3a36776f75e2e7e8810e88f8 /src/demos/dualDepthPeeling/DualDepthPeeling.java
parent697d631bc0333b92689972ff3e621e3549fb6c80 (diff)
Seperate dualDepthPeeling obj data; Add data anchor class
Diffstat (limited to 'src/demos/dualDepthPeeling/DualDepthPeeling.java')
-rw-r--r--src/demos/dualDepthPeeling/DualDepthPeeling.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/demos/dualDepthPeeling/DualDepthPeeling.java b/src/demos/dualDepthPeeling/DualDepthPeeling.java
index 9cc4b05..eccf8ba 100644
--- a/src/demos/dualDepthPeeling/DualDepthPeeling.java
+++ b/src/demos/dualDepthPeeling/DualDepthPeeling.java
@@ -23,6 +23,8 @@ import com.jogamp.opengl.util.glsl.ShaderCode;
import com.jogamp.opengl.util.glsl.ShaderProgram;
import com.jogamp.opengl.util.glsl.ShaderState;
+import demos.data.DemosDataAnchor;
+
// Translated from C++ Version see below:
//--------------------------------------------------------------------------------------
// Order Independent Transparency with Dual Depth Peeling
@@ -65,7 +67,7 @@ public class DualDepthPeeling implements GLEventListener, KeyListener, MouseList
public boolean g_useOQ = true;
public int[] g_queryId = new int[1];
- public String MODEL_FILENAME = new String( "media/models/dragon.obj" );
+ public String MODEL_FILENAME = "models/dragon.obj";
public static final String s_FrontBlenderTex = "FrontBlenderTex";
public static final String s_BackBlenderTex = "BackBlenderTex";
@@ -366,7 +368,7 @@ public class DualDepthPeeling implements GLEventListener, KeyListener, MouseList
g_model = new Model();
System.err.println("loading OBJ...\n");
- g_model.loadModelFromFile( model_filename );
+ g_model.loadModelFromFile(DemosDataAnchor.class, model_filename );
System.err.println("compiling mesh...\n");
g_model.compileModel();