From 8bb398d5bb99c56f00162627d7cae3f4f7dc7d3f Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Tue, 19 May 2015 23:48:05 -0400
Subject: [PATCH] moved shaders to separate package

---
 core/build.xml                                |  2 +-
 .../processing/opengl/PGraphicsOpenGL.java    | 26 +++++++++----------
 .../opengl/{ => shaders}/ColorFrag.glsl       |  0
 .../opengl/{ => shaders}/ColorVert.glsl       |  0
 .../opengl/{ => shaders}/LightFrag.glsl       |  0
 .../opengl/{ => shaders}/LightVert.glsl       |  0
 .../opengl/{ => shaders}/LineFrag.glsl        |  0
 .../opengl/{ => shaders}/LineVert.glsl        |  0
 .../opengl/{ => shaders}/MaskFrag.glsl        |  0
 .../opengl/{ => shaders}/PointFrag.glsl       |  0
 .../opengl/{ => shaders}/PointVert.glsl       |  0
 .../opengl/{ => shaders}/TexFrag.glsl         |  0
 .../opengl/{ => shaders}/TexVert.glsl         |  0
 .../opengl/{ => shaders}/TexlightFrag.glsl    |  0
 .../opengl/{ => shaders}/TexlightVert.glsl    |  0
 15 files changed, 14 insertions(+), 14 deletions(-)
 rename core/src/processing/opengl/{ => shaders}/ColorFrag.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/ColorVert.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/LightFrag.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/LightVert.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/LineFrag.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/LineVert.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/MaskFrag.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/PointFrag.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/PointVert.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/TexFrag.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/TexVert.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/TexlightFrag.glsl (100%)
 rename core/src/processing/opengl/{ => shaders}/TexlightVert.glsl (100%)

diff --git a/core/build.xml b/core/build.xml
index a50684cdb..50bb54790 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -55,7 +55,7 @@
     <!-- Copy shaders to bin. (Eclipse does this automatically.) -->
     <copy todir="bin">
       <fileset dir="src">
-	<include name="processing/opengl/*.glsl" />
+	<include name="processing/opengl/shaders/*.glsl" />
 	<include name="icon/*.png" />
       </fileset>
     </copy>
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
index cfc30a8b7..46a9dd190 100644
--- a/core/src/processing/opengl/PGraphicsOpenGL.java
+++ b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -156,32 +156,32 @@ public class PGraphicsOpenGL extends PGraphics {
   // Shaders
 
   static protected URL defColorShaderVertURL =
-    PGraphicsOpenGL.class.getResource("ColorVert.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
   static protected URL defTextureShaderVertURL =
-    PGraphicsOpenGL.class.getResource("TexVert.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
   static protected URL defLightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("LightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
   static protected URL defTexlightShaderVertURL =
-    PGraphicsOpenGL.class.getResource("TexlightVert.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexlightVert.glsl");
   static protected URL defColorShaderFragURL =
-    PGraphicsOpenGL.class.getResource("ColorFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
   static protected URL defTextureShaderFragURL =
-    PGraphicsOpenGL.class.getResource("TexFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
   static protected URL defLightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("LightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
   static protected URL defTexlightShaderFragURL =
-    PGraphicsOpenGL.class.getResource("TexlightFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexlightFrag.glsl");
 
   static protected URL defLineShaderVertURL =
-    PGraphicsOpenGL.class.getResource("LineVert.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
   static protected URL defLineShaderFragURL =
-    PGraphicsOpenGL.class.getResource("LineFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
   static protected URL defPointShaderVertURL =
-    PGraphicsOpenGL.class.getResource("PointVert.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
   static protected URL defPointShaderFragURL =
-    PGraphicsOpenGL.class.getResource("PointFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
   static protected URL maskShaderFragURL =
-    PGraphicsOpenGL.class.getResource("MaskFrag.glsl");
+    PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
 
   protected PShader defColorShader;
   protected PShader defTextureShader;
diff --git a/core/src/processing/opengl/ColorFrag.glsl b/core/src/processing/opengl/shaders/ColorFrag.glsl
similarity index 100%
rename from core/src/processing/opengl/ColorFrag.glsl
rename to core/src/processing/opengl/shaders/ColorFrag.glsl
diff --git a/core/src/processing/opengl/ColorVert.glsl b/core/src/processing/opengl/shaders/ColorVert.glsl
similarity index 100%
rename from core/src/processing/opengl/ColorVert.glsl
rename to core/src/processing/opengl/shaders/ColorVert.glsl
diff --git a/core/src/processing/opengl/LightFrag.glsl b/core/src/processing/opengl/shaders/LightFrag.glsl
similarity index 100%
rename from core/src/processing/opengl/LightFrag.glsl
rename to core/src/processing/opengl/shaders/LightFrag.glsl
diff --git a/core/src/processing/opengl/LightVert.glsl b/core/src/processing/opengl/shaders/LightVert.glsl
similarity index 100%
rename from core/src/processing/opengl/LightVert.glsl
rename to core/src/processing/opengl/shaders/LightVert.glsl
diff --git a/core/src/processing/opengl/LineFrag.glsl b/core/src/processing/opengl/shaders/LineFrag.glsl
similarity index 100%
rename from core/src/processing/opengl/LineFrag.glsl
rename to core/src/processing/opengl/shaders/LineFrag.glsl
diff --git a/core/src/processing/opengl/LineVert.glsl b/core/src/processing/opengl/shaders/LineVert.glsl
similarity index 100%
rename from core/src/processing/opengl/LineVert.glsl
rename to core/src/processing/opengl/shaders/LineVert.glsl
diff --git a/core/src/processing/opengl/MaskFrag.glsl b/core/src/processing/opengl/shaders/MaskFrag.glsl
similarity index 100%
rename from core/src/processing/opengl/MaskFrag.glsl
rename to core/src/processing/opengl/shaders/MaskFrag.glsl
diff --git a/core/src/processing/opengl/PointFrag.glsl b/core/src/processing/opengl/shaders/PointFrag.glsl
similarity index 100%
rename from core/src/processing/opengl/PointFrag.glsl
rename to core/src/processing/opengl/shaders/PointFrag.glsl
diff --git a/core/src/processing/opengl/PointVert.glsl b/core/src/processing/opengl/shaders/PointVert.glsl
similarity index 100%
rename from core/src/processing/opengl/PointVert.glsl
rename to core/src/processing/opengl/shaders/PointVert.glsl
diff --git a/core/src/processing/opengl/TexFrag.glsl b/core/src/processing/opengl/shaders/TexFrag.glsl
similarity index 100%
rename from core/src/processing/opengl/TexFrag.glsl
rename to core/src/processing/opengl/shaders/TexFrag.glsl
diff --git a/core/src/processing/opengl/TexVert.glsl b/core/src/processing/opengl/shaders/TexVert.glsl
similarity index 100%
rename from core/src/processing/opengl/TexVert.glsl
rename to core/src/processing/opengl/shaders/TexVert.glsl
diff --git a/core/src/processing/opengl/TexlightFrag.glsl b/core/src/processing/opengl/shaders/TexlightFrag.glsl
similarity index 100%
rename from core/src/processing/opengl/TexlightFrag.glsl
rename to core/src/processing/opengl/shaders/TexlightFrag.glsl
diff --git a/core/src/processing/opengl/TexlightVert.glsl b/core/src/processing/opengl/shaders/TexlightVert.glsl
similarity index 100%
rename from core/src/processing/opengl/TexlightVert.glsl
rename to core/src/processing/opengl/shaders/TexlightVert.glsl