Skip to content

Commit fbfb6a6

Browse files
codeanticodecodeanticode
committed
moved shaders to separate package
1 parent b0c5c75 commit fbfb6a6

15 files changed

Lines changed: 14 additions & 14 deletions

‎core/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<!-- Copy shaders to bin. (Eclipse does this automatically.) -->
5656
<copy todir="bin">
5757
<fileset dir="src">
58-
<include name="processing/opengl/*.glsl" />
58+
<include name="processing/opengl/shaders/*.glsl" />
5959
<include name="icon/*.png" />
6060
</fileset>
6161
</copy>

‎core/src/processing/opengl/PGraphicsOpenGL.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -156,32 +156,32 @@ public class PGraphicsOpenGL extends PGraphics {
156156
// Shaders
157157

158158
static protected URL defColorShaderVertURL =
159-
PGraphicsOpenGL.class.getResource("ColorVert.glsl");
159+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorVert.glsl");
160160
static protected URL defTextureShaderVertURL =
161-
PGraphicsOpenGL.class.getResource("TexVert.glsl");
161+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexVert.glsl");
162162
static protected URL defLightShaderVertURL =
163-
PGraphicsOpenGL.class.getResource("LightVert.glsl");
163+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightVert.glsl");
164164
static protected URL defTexlightShaderVertURL =
165-
PGraphicsOpenGL.class.getResource("TexlightVert.glsl");
165+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexlightVert.glsl");
166166
static protected URL defColorShaderFragURL =
167-
PGraphicsOpenGL.class.getResource("ColorFrag.glsl");
167+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/ColorFrag.glsl");
168168
static protected URL defTextureShaderFragURL =
169-
PGraphicsOpenGL.class.getResource("TexFrag.glsl");
169+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexFrag.glsl");
170170
static protected URL defLightShaderFragURL =
171-
PGraphicsOpenGL.class.getResource("LightFrag.glsl");
171+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LightFrag.glsl");
172172
static protected URL defTexlightShaderFragURL =
173-
PGraphicsOpenGL.class.getResource("TexlightFrag.glsl");
173+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/TexlightFrag.glsl");
174174

175175
static protected URL defLineShaderVertURL =
176-
PGraphicsOpenGL.class.getResource("LineVert.glsl");
176+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineVert.glsl");
177177
static protected URL defLineShaderFragURL =
178-
PGraphicsOpenGL.class.getResource("LineFrag.glsl");
178+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/LineFrag.glsl");
179179
static protected URL defPointShaderVertURL =
180-
PGraphicsOpenGL.class.getResource("PointVert.glsl");
180+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointVert.glsl");
181181
static protected URL defPointShaderFragURL =
182-
PGraphicsOpenGL.class.getResource("PointFrag.glsl");
182+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/PointFrag.glsl");
183183
static protected URL maskShaderFragURL =
184-
PGraphicsOpenGL.class.getResource("MaskFrag.glsl");
184+
PGraphicsOpenGL.class.getResource("/processing/opengl/shaders/MaskFrag.glsl");
185185

186186
protected PShader defColorShader;
187187
protected PShader defTextureShader;

core/src/processing/opengl/ColorFrag.glsl renamed to core/src/processing/opengl/shaders/ColorFrag.glsl

File renamed without changes.

core/src/processing/opengl/ColorVert.glsl renamed to core/src/processing/opengl/shaders/ColorVert.glsl

File renamed without changes.

core/src/processing/opengl/LightFrag.glsl renamed to core/src/processing/opengl/shaders/LightFrag.glsl

File renamed without changes.

core/src/processing/opengl/LightVert.glsl renamed to core/src/processing/opengl/shaders/LightVert.glsl

File renamed without changes.

core/src/processing/opengl/LineFrag.glsl renamed to core/src/processing/opengl/shaders/LineFrag.glsl

File renamed without changes.

core/src/processing/opengl/LineVert.glsl renamed to core/src/processing/opengl/shaders/LineVert.glsl

File renamed without changes.

core/src/processing/opengl/MaskFrag.glsl renamed to core/src/processing/opengl/shaders/MaskFrag.glsl

File renamed without changes.

core/src/processing/opengl/PointFrag.glsl renamed to core/src/processing/opengl/shaders/PointFrag.glsl

File renamed without changes.

0 commit comments

Comments
 (0)