mirror of
https://github.com/processing/processing4.git
synced 2026-06-16 04:26:26 +02:00
moved shaders to separate package
This commit is contained in:
+1
-1
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user