Commit fbfb6a6
committed
moved shaders to separate package
1 parent b0c5c75 commit fbfb6a6
15 files changed
Lines changed: 14 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -55,7 +55,7 @@ | |||
| 55 | 55 | <!-- Copy shaders to bin. (Eclipse does this automatically.) --> | |
| 56 | 56 | <copy todir="bin"> | |
| 57 | 57 | <fileset dir="src"> | |
| 58 | - <include name="processing/opengl/*.glsl" /> | ||
| 58 | + <include name="processing/opengl/shaders/*.glsl" /> | ||
| 59 | 59 | <include name="icon/*.png" /> | |
| 60 | 60 | </fileset> | |
| 61 | 61 | </copy> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -156,32 +156,32 @@ public class PGraphicsOpenGL extends PGraphics { | |||
| 156 | 156 | // Shaders | |
| 157 | 157 | ||
| 158 | 158 | static protected URL defColorShaderVertURL = | |
| 159 | - PGraphicsOpenGL.class.getResource("ColorVert.glsl"); | ||
| 159 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl"); | ||
| 160 | 160 | static protected URL defTextureShaderVertURL = | |
| 161 | - PGraphicsOpenGL.class.getResource("TexVert.glsl"); | ||
| 161 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl"); | ||
| 162 | 162 | static protected URL defLightShaderVertURL = | |
| 163 | - PGraphicsOpenGL.class.getResource("LightVert.glsl"); | ||
| 163 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl"); | ||
| 164 | 164 | static protected URL defTexlightShaderVertURL = | |
| 165 | - PGraphicsOpenGL.class.getResource("TexlightVert.glsl"); | ||
| 165 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexlightVert.glsl"); | ||
| 166 | 166 | static protected URL defColorShaderFragURL = | |
| 167 | - PGraphicsOpenGL.class.getResource("ColorFrag.glsl"); | ||
| 167 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl"); | ||
| 168 | 168 | static protected URL defTextureShaderFragURL = | |
| 169 | - PGraphicsOpenGL.class.getResource("TexFrag.glsl"); | ||
| 169 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl"); | ||
| 170 | 170 | static protected URL defLightShaderFragURL = | |
| 171 | - PGraphicsOpenGL.class.getResource("LightFrag.glsl"); | ||
| 171 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl"); | ||
| 172 | 172 | static protected URL defTexlightShaderFragURL = | |
| 173 | - PGraphicsOpenGL.class.getResource("TexlightFrag.glsl"); | ||
| 173 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexlightFrag.glsl"); | ||
| 174 | 174 | ||
| 175 | 175 | static protected URL defLineShaderVertURL = | |
| 176 | - PGraphicsOpenGL.class.getResource("LineVert.glsl"); | ||
| 176 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl"); | ||
| 177 | 177 | static protected URL defLineShaderFragURL = | |
| 178 | - PGraphicsOpenGL.class.getResource("LineFrag.glsl"); | ||
| 178 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl"); | ||
| 179 | 179 | static protected URL defPointShaderVertURL = | |
| 180 | - PGraphicsOpenGL.class.getResource("PointVert.glsl"); | ||
| 180 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl"); | ||
| 181 | 181 | static protected URL defPointShaderFragURL = | |
| 182 | - PGraphicsOpenGL.class.getResource("PointFrag.glsl"); | ||
| 182 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl"); | ||
| 183 | 183 | static protected URL maskShaderFragURL = | |
| 184 | - PGraphicsOpenGL.class.getResource("MaskFrag.glsl"); | ||
| 184 | + PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl"); | ||
| 185 | 185 | ||
| 186 | 186 | protected PShader defColorShader; | |
| 187 | 187 | protected PShader defTextureShader; | |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
0 commit comments