Merge pull request #15 from ruby-processing/resources

Resources

Author: monkstone

pom.rb

@@ -83,11 +83,10 @@
 build do
   resource do
     directory '${source.directory}/main/java'
-    includes '**/**/*.glsl', '**/*.jnilib'
     excludes '**/**/*.java'
   end
   resource do
     directory '${source.directory}/main/resources'
-    includes '**/*.png', '*.txt'
+    includes '**/*.png', '**/*.txt', '**/*.glsl'
   end
 end

pom.xml

@@ -111,10 +111,6 @@ DO NOT MODIFY - GENERATED CODE
     <resources>
       <resource>
         <directory>${source.directory}/main/java</directory>
-        <includes>
-          <include>**/**/*.glsl</include>
-          <include>**/*.jnilib</include>
-        </includes>
         <excludes>
           <exclude>**/**/*.java</exclude>
         </excludes>
@@ -123,7 +119,8 @@ DO NOT MODIFY - GENERATED CODE
         <directory>${source.directory}/main/resources</directory>
         <includes>
           <include>**/*.png</include>
-          <include>*.txt</include>
+          <include>**/*.txt</include>
+          <include>**/*.glsl</include>
         </includes>
       </resource>
     </resources>

src/main/java/processing/opengl/PGraphicsOpenGL.java

@@ -181,32 +181,32 @@ public void dispose() {
   // Shaders
 
   static protected URL defColorShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorVert.glsl");
   static protected URL defTextureShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexVert.glsl");
   static protected URL defLightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightVert.glsl");
   static protected URL defTexlightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightVert.glsl");
   static protected URL defColorShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/ColorFrag.glsl");
   static protected URL defTextureShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexFrag.glsl");
   static protected URL defLightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LightFrag.glsl");
   static protected URL defTexlightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexLightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/TexLightFrag.glsl");
 
   static protected URL defLineShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineVert.glsl");
   static protected URL defLineShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/LineFrag.glsl");
   static protected URL defPointShaderVertURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointVert.glsl");
   static protected URL defPointShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/PointFrag.glsl");
   static protected URL maskShaderFragURL =
-    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/shaders/MaskFrag.glsl");
 
   protected PShader defColorShader;
   protected PShader defTextureShader;

src/main/java/processing/opengl/PSurfaceJOGL.java

@@ -944,10 +944,10 @@ public void selectFolder(String prompt, String callbackMethod,
       boolean hide = (sketch != null) &&
         (PApplet.platform == PConstants.WINDOWS);
       if (hide) setVisible(false);
-      
+
       ShimAWT.selectFolderImpl(prompt, callbackMethod, file,
         callbackObject, null);
-      
+
       if (hide) setVisible(true);
     });
   }
@@ -963,7 +963,7 @@ public void setCursor(int kind) {
       String name = cursorNames.get(kind);
       if (name != null) {
         ImageIcon icon =
-          new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+          new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
         PImage img = new PImageAWT(icon.getImage());
         // Most cursors just use the center as the hotspot...
         int x = img.width / 2;
@@ -1538,7 +1538,7 @@ void set() {
 //            String name = cursorNames.get(kind);
 //            if (name != null) {
 //                ImageIcon icon
-//                        = new ImageIcon(getClass().getResource("cursors/" + name + ".png"));
+//                        = new ImageIcon(getClass().getResource("/cursors/" + name + ".png"));
 //                PImage img = new PImage(icon.getImage());
 //                // Most cursors just use the center as the hotspot...
 //                int x = img.width / 2;