From 34ece93ce875a002146c9935626238b92860ed2e Mon Sep 17 00:00:00 2001 From: phil Date: Sun, 6 Nov 2016 21:46:01 +1300 Subject: resource loading fall back updated to new resource package location src/main/java/resources --- src/main/java/org/jdesktop/j3d/examples/Resources.java | 2 +- .../examples/gl2es2pipeline/EnvironmentMappingGLSL.java | 4 ++-- .../j3d/examples/gl2es2pipeline/ObjLoadGLSL.java | 4 ++-- .../j3d/examples/gl2es2pipeline/PhongShadingGLSL.java | 8 ++++---- .../j3d/examples/gl2es2pipeline/SamplerTestGLSL.java | 4 ++-- .../j3d/examples/gl2es2pipeline/ShaderTestGLSL.java | 16 ++++++++-------- .../examples/gl2es2pipeline/SimpleShaderAppearance.java | 1 - .../jdesktop/j3d/examples/gl2es2pipeline/SphereGLSL.java | 4 ++-- .../j3d/examples/gl2es2pipeline/VertexAttrTestGLSL.java | 4 ++-- .../j3d/examples/sphere_motion/SphereMotionGL2ES2.java | 4 ++-- .../sphere_motion/SphereMotionGL2ES3_Texture.java | 4 ++-- .../j3d/examples/sphere_motion/SphereMotionGLSL_FFP.java | 4 ++-- .../jdesktop/j3d/examples/stencil/StencilOutline.java | 4 ++-- 13 files changed, 31 insertions(+), 32 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/jdesktop/j3d/examples/Resources.java b/src/main/java/org/jdesktop/j3d/examples/Resources.java index a50a188..3dfb9cf 100644 --- a/src/main/java/org/jdesktop/j3d/examples/Resources.java +++ b/src/main/java/org/jdesktop/j3d/examples/Resources.java @@ -75,7 +75,7 @@ public class Resources { File f = new File(System.getProperty("user.dir") + "/src/" + filename); if (!f.exists()) - f = new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/" + filename); + f = new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/" + filename); url = f.toURL(); } diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/EnvironmentMappingGLSL.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/EnvironmentMappingGLSL.java index 700df00..6080c2e 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/EnvironmentMappingGLSL.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/EnvironmentMappingGLSL.java @@ -89,9 +89,9 @@ public class EnvironmentMappingGLSL extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/envmap.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/envmap.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/envmap.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/envmap.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ObjLoadGLSL.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ObjLoadGLSL.java index 2708e58..69f6734 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ObjLoadGLSL.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ObjLoadGLSL.java @@ -138,9 +138,9 @@ public class ObjLoadGLSL extends javax.swing.JFrame try { vertexProgram = StringIO.readFully(new File( - System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".vert")); + System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".vert")); fragmentProgram = StringIO.readFully(new File( - System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".frag")); + System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/PhongShadingGLSL.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/PhongShadingGLSL.java index fa5ba7a..364febe 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/PhongShadingGLSL.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/PhongShadingGLSL.java @@ -137,9 +137,9 @@ public class PhongShadingGLSL extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/gouraud.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/gouraud.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/gouraud.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/gouraud.frag")); } catch (IOException e) { @@ -153,9 +153,9 @@ public class PhongShadingGLSL extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/phong.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/phong.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/phong.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/phong.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SamplerTestGLSL.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SamplerTestGLSL.java index 1cb2904..741441c 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SamplerTestGLSL.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SamplerTestGLSL.java @@ -94,9 +94,9 @@ public class SamplerTestGLSL extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/multitex.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/multitex.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/multitex.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/multitex.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ShaderTestGLSL.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ShaderTestGLSL.java index ac0282e..9c39a31 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ShaderTestGLSL.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/ShaderTestGLSL.java @@ -122,27 +122,27 @@ public class ShaderTestGLSL extends javax.swing.JFrame { case DIMPLE_SHADER: vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/dimple.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/dimple.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/dimple.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/dimple.frag")); break; case BRICK_SHADER: vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/aabrick.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/aabrick.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/aabrick.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/aabrick.frag")); break; case WOOD_SHADER: vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/wood.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/wood.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/wood.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/wood.frag")); break; case POLKADOT3D_SHADER: vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/polkadot3d.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/polkadot3d.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/polkadot3d.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/polkadot3d.frag")); break; default: } diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SimpleShaderAppearance.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SimpleShaderAppearance.java index 5b7be75..8e97c77 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SimpleShaderAppearance.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SimpleShaderAppearance.java @@ -129,7 +129,6 @@ public class SimpleShaderAppearance extends ShaderAppearance vertexProgram += " float shininess;\n"; vertexProgram += "};\n"; vertexProgram += "uniform material glFrontMaterial;\n"; - vertexProgram += "struct lightSource\n"; vertexProgram += " {\n"; vertexProgram += " int enabled;\n"; vertexProgram += " vec4 position;\n"; diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SphereGLSL.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SphereGLSL.java index 8a59c5f..936f8d5 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SphereGLSL.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/SphereGLSL.java @@ -125,9 +125,9 @@ public class SphereGLSL extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/simple.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/simple.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/simple.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/simple.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/VertexAttrTestGLSL.java b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/VertexAttrTestGLSL.java index f80ac11..907cabb 100644 --- a/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/VertexAttrTestGLSL.java +++ b/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/VertexAttrTestGLSL.java @@ -188,9 +188,9 @@ public class VertexAttrTestGLSL extends javax.swing.JFrame try { vertexProgram = StringIO.readFully(new File( - System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/vertexshader.vert")); + System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/vertexshader.vert")); fragmentProgram = StringIO.readFully(new File( - System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/vertexshader.frag")); + System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/vertexshader.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES2.java b/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES2.java index 547c998..f01e255 100644 --- a/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES2.java +++ b/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES2.java @@ -114,9 +114,9 @@ public class SphereMotionGL2ES2 extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES3_Texture.java b/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES3_Texture.java index a1cee22..f2d1a63 100644 --- a/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES3_Texture.java +++ b/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGL2ES3_Texture.java @@ -118,9 +118,9 @@ public class SphereMotionGL2ES3_Texture extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2_texture.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2_texture.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2_texture.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/sphere_motion/phong_gl2es2_texture.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGLSL_FFP.java b/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGLSL_FFP.java index ce1fdc0..3fd2fe1 100644 --- a/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGLSL_FFP.java +++ b/src/main/java/org/jdesktop/j3d/examples/sphere_motion/SphereMotionGLSL_FFP.java @@ -113,9 +113,9 @@ public class SphereMotionGLSL_FFP extends javax.swing.JFrame try { vertexProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/sphere_motion/phong_ffp.vert")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/sphere_motion/phong_ffp.vert")); fragmentProgram = StringIO.readFully( - new File(System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/sphere_motion/phong_ffp.frag")); + new File(System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/sphere_motion/phong_ffp.frag")); } catch (IOException e) { diff --git a/src/main/java/org/jdesktop/j3d/examples/stencil/StencilOutline.java b/src/main/java/org/jdesktop/j3d/examples/stencil/StencilOutline.java index 3c7b405..f93de4f 100644 --- a/src/main/java/org/jdesktop/j3d/examples/stencil/StencilOutline.java +++ b/src/main/java/org/jdesktop/j3d/examples/stencil/StencilOutline.java @@ -141,9 +141,9 @@ public class StencilOutline extends javax.swing.JFrame try { vertexProgram = StringIO.readFully(new File( - System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".vert")); + System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".vert")); fragmentProgram = StringIO.readFully(new File( - System.getProperty("user.dir") + "/src/classes/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".frag")); + System.getProperty("user.dir") + "/src/main/java/org/jdesktop/j3d/examples/gl2es2pipeline/" + shaderName + ".frag")); } catch (IOException e) { -- cgit v1.2.3