summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexandra Bokinsky <[email protected]>2011-03-15 12:18:57 -0400
committerAlexandra Bokinsky <[email protected]>2011-03-15 12:18:57 -0400
commit9fa9793d462189d946d742f2f95cd1294297119f (patch)
tree101e6de9535311c4aa493708e8529b9b104ab976 /src
parent2db5af1e1a64d7048ce2f0db4b83d8b10c7f734d (diff)
Package and load path changes
Diffstat (limited to 'src')
-rw-r--r--src/demos/dualDepthPeeling/DualDepthPeeling.java4
-rw-r--r--src/demos/dualDepthPeeling/GLSLProgramObject.java12
-rw-r--r--src/demos/dualDepthPeeling/Model.java2
3 files changed, 15 insertions, 3 deletions
diff --git a/src/demos/dualDepthPeeling/DualDepthPeeling.java b/src/demos/dualDepthPeeling/DualDepthPeeling.java
index dd6df89..4d4657e 100644
--- a/src/demos/dualDepthPeeling/DualDepthPeeling.java
+++ b/src/demos/dualDepthPeeling/DualDepthPeeling.java
@@ -1,3 +1,5 @@
+package demos.dualDepthPeeling;
+
import java.awt.Frame;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
@@ -63,7 +65,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 = new String( "demos/dualDepthPeeling/media/models/dragon.obj" );
public String SHADER_PATH = new String( "src/dual_depth_peeling/shaders/" );
public GLSLProgramObject g_shaderDualInit;
diff --git a/src/demos/dualDepthPeeling/GLSLProgramObject.java b/src/demos/dualDepthPeeling/GLSLProgramObject.java
index 85038c1..68d0e9a 100644
--- a/src/demos/dualDepthPeeling/GLSLProgramObject.java
+++ b/src/demos/dualDepthPeeling/GLSLProgramObject.java
@@ -1,3 +1,5 @@
+package demos.dualDepthPeeling;
+
// Translated from C++ Version see below:
//
@@ -116,7 +118,10 @@ public class GLSLProgramObject
public void attachVertexShader(GL2 gl, String filename)
{
- URL fileURL = getClass().getClassLoader().getResource(File.separator + "shaders" + File.separator + filename);
+ URL fileURL = getClass().getClassLoader().getResource(
+ File.separator + "demos" +
+ File.separator + "dualDepthPeeling" +
+ File.separator + "shaders" + File.separator + filename);
if ( fileURL != null )
{
String content = "";
@@ -177,7 +182,10 @@ public class GLSLProgramObject
public void attachFragmentShader(GL2 gl, String filename)
{
- URL fileURL = getClass().getClassLoader().getResource(File.separator + "shaders" + File.separator + filename);
+ URL fileURL = getClass().getClassLoader().getResource(
+ File.separator + "demos" +
+ File.separator + "dualDepthPeeling" +
+ File.separator + "shaders" + File.separator + filename);
if ( fileURL != null )
{
String content = "";
diff --git a/src/demos/dualDepthPeeling/Model.java b/src/demos/dualDepthPeeling/Model.java
index 439b016..02f241c 100644
--- a/src/demos/dualDepthPeeling/Model.java
+++ b/src/demos/dualDepthPeeling/Model.java
@@ -1,3 +1,5 @@
+package demos.dualDepthPeeling;
+
// Translated from C++ Version:
// nvModel.h - Model support class