Skip to content

Commit 0d72da6

Browse files
author
Julien Castelain
committed
Fix paths in ShadersGui Sketch
1 parent e18375e commit 0d72da6

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

ShadersGui/Shaders.pde

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,74 +9,74 @@ void setupShaders()
99
//================================
1010

1111
// blobby
12-
newShader = new GShader("blobby.glsl", TYPE_COLOR);
12+
newShader = new GShader("../ColorShaders/data/blobby.glsl", TYPE_COLOR);
1313
newShader.addParameter("depth", 0, 2);
1414
newShader.addParameter("rate", 0, 2);
1515
shaders.add(newShader);
1616

1717
// drip
18-
newShader = new GShader("drip.glsl", TYPE_COLOR);
18+
newShader = new GShader("../ColorShaders/data/drip.glsl", TYPE_COLOR);
1919
newShader.addParameter("intense", 0, 1);
2020
newShader.addParameter("speed", 0, 1);
2121
newShader.addParameter("graininess", 0, 1, 0, 1);
2222
shaders.add(newShader);
2323

2424
// electro
25-
newShader = new GShader("electro.glsl", TYPE_COLOR);
25+
newShader = new GShader("../ColorShaders/data/electro.glsl", TYPE_COLOR);
2626
newShader.addParameter("rings", 5, 40);
2727
newShader.addParameter("complexity", 1, 60);
2828
shaders.add(newShader);
2929

3030
// eye
31-
newShader = new GShader("eye.glsl", TYPE_COLOR);
31+
newShader = new GShader("../ColorShaders/data/eye.glsl", TYPE_COLOR);
3232
newShader.addParameter("mouse", 0, width, 0, height);
3333
shaders.add(newShader);
3434

3535
// bands
36-
newShader = new GShader("bands.glsl", TYPE_COLOR);
36+
newShader = new GShader("../ColorShaders/data/bands.glsl", TYPE_COLOR);
3737
newShader.addParameter("noiseFactor", 5, 100);
3838
newShader.addParameter("stripes", 0, 100);
3939
shaders.add(newShader);
4040

4141
// sinewave
42-
newShader = new GShader("sinewave.glsl", TYPE_COLOR);
42+
newShader = new GShader("../ColorShaders/data/sinewave.glsl", TYPE_COLOR);
4343
newShader.addParameter("colorMult", 0.5, 5.0, 0.5, 2.0);
4444
newShader.addParameter("coeffx", 10, 50);
4545
newShader.addParameter("coeffy", 0, 90);
4646
newShader.addParameter("coeffz", 1, 200);
4747
shaders.add(newShader);
4848

4949
// water noise
50-
newShader = new GShader("noisy.glsl", TYPE_COLOR);
50+
newShader = new GShader("../ColorShaders/data/noisy.glsl", TYPE_COLOR);
5151
newShader.addParameter("noiseFactor", 0, 10, 0, 10);
5252
newShader.addParameter("noiseFactorTime", 0, 2);
5353
shaders.add(newShader);
5454

5555
// nebula
56-
newShader = new GShader("nebula.glsl", TYPE_COLOR);
56+
newShader = new GShader("../ColorShaders/data/nebula.glsl", TYPE_COLOR);
5757
newShader.addParameter("starspeed", 0, 100);
5858
shaders.add(newShader);
5959

6060
// landscape
61-
newShader = new GShader("landscape.glsl", TYPE_COLOR);
61+
newShader = new GShader("../ColorShaders/data/landscape.glsl", TYPE_COLOR);
6262
newShader.addParameter("dir", 1.5, 5);
6363
shaders.add(newShader);
6464

6565
// monjori
66-
newShader = new GShader("monjori.glsl", TYPE_COLOR);
66+
newShader = new GShader("../ColorShaders/data/monjori.glsl", TYPE_COLOR);
6767
newShader.addParameter("graininess", 10, 100);
6868
newShader.addParameter("pace", 20, 80);
6969
newShader.addParameter("twist", 0, 100);
7070
shaders.add(newShader);
7171

7272
// bits
73-
newShader = new GShader("bits.glsl", TYPE_COLOR);
73+
newShader = new GShader("../ColorShaders/data/bits.glsl", TYPE_COLOR);
7474
newShader.addParameter("mx", 0, 1);
7575
newShader.addParameter("my", 0, 1);
7676
shaders.add(newShader);
7777

7878
// rain
79-
newShader = new GShader("rain.glsl", TYPE_COLOR);
79+
newShader = new GShader("../ColorShaders/data/rain.glsl", TYPE_COLOR);
8080
newShader.addParameter("hue", 0, 0.1);
8181
newShader.addParameter("fade", 0, 1);
8282
newShader.addParameter("slow", 0.1, 3);
@@ -89,31 +89,31 @@ void setupShaders()
8989
//================================
9090

9191
// brcosa
92-
newShader = new GShader("brcosa.glsl", TYPE_TEXTURE);
92+
newShader = new GShader("../TextureShaders/data/brcosa.glsl", TYPE_TEXTURE);
9393
newShader.addParameter("brightness", 0, 2);
9494
newShader.addParameter("saturation", -5, 5);
9595
newShader.addParameter("contrast", -5, 5);
9696
shaders.add(newShader);
9797

9898
// hue
99-
newShader = new GShader("hue.glsl", TYPE_TEXTURE);
99+
newShader = new GShader("../TextureShaders/data/hue.glsl", TYPE_TEXTURE);
100100
newShader.addParameter("hue", 0, TWO_PI);
101101
shaders.add(newShader);
102102

103103
// pixelate
104-
newShader = new GShader("pixelate.glsl", TYPE_TEXTURE);
104+
newShader = new GShader("../TextureShaders/data/pixelate.glsl", TYPE_TEXTURE);
105105
newShader.addParameter("pixels", 1, 100, 1, 100);
106106
shaders.add(newShader);
107107

108108
// blur
109-
newShader = new GShader("blur.glsl", TYPE_TEXTURE);
109+
newShader = new GShader("../TextureShaders/data/blur.glsl", TYPE_TEXTURE);
110110
newShader.addParameter("sigma", 0, 10);
111111
newShader.addParameter("blurSize", 0, 30, true);
112112
newShader.addParameter("texOffset", 0.5, 3);
113113
shaders.add(newShader);
114114

115115
// channels
116-
newShader = new GShader("channels.glsl", TYPE_TEXTURE);
116+
newShader = new GShader("../TextureShaders/data/channels.glsl", TYPE_TEXTURE);
117117
newShader.addParameter("rbiasx", -1, 1);
118118
newShader.addParameter("rbiasy", -1, 1);
119119
newShader.addParameter("gbiasx", -1, 1);
@@ -129,74 +129,74 @@ void setupShaders()
129129
shaders.add(newShader);
130130

131131
// threshold
132-
newShader = new GShader("threshold.glsl", TYPE_TEXTURE);
132+
newShader = new GShader("../TextureShaders/data/threshold.glsl", TYPE_TEXTURE);
133133
newShader.addParameter("threshold", 0, 1);
134134
shaders.add(newShader);
135135

136136
// neon
137-
newShader = new GShader("neon.glsl", TYPE_TEXTURE);
137+
newShader = new GShader("../TextureShaders/data/neon.glsl", TYPE_TEXTURE);
138138
newShader.addParameter("brt", 0, 0.5);
139139
newShader.addParameter("rad", 0, 3, true);
140140
shaders.add(newShader);
141141

142142
// edges
143-
newShader = new GShader("edges.glsl", TYPE_TEXTURE);
143+
newShader = new GShader("../TextureShaders/data/edges.glsl", TYPE_TEXTURE);
144144
shaders.add(newShader);
145145

146146
// wrap
147-
newShader = new GShader("wrap.glsl", TYPE_TEXTURE);
147+
newShader = new GShader("../TextureShaders/data/wrap.glsl", TYPE_TEXTURE);
148148
newShader.addParameter("radius", 0, 2);
149149
newShader.addParameter("radTwist", 1, 10);
150150
shaders.add(newShader);
151151

152152
// deform
153-
newShader = new GShader("deform.glsl", TYPE_TEXTURE);
153+
newShader = new GShader("../TextureShaders/data/deform.glsl", TYPE_TEXTURE);
154154
newShader.addParameter("mouse", 0, 1, 0, 1);
155155
newShader.addParameter("turns", 2, 10);
156156
shaders.add(newShader);
157157

158158
// pixelrolls
159-
newShader = new GShader("pixelrolls.glsl", TYPE_TEXTURE);
159+
newShader = new GShader("../TextureShaders/data/pixelrolls.glsl", TYPE_TEXTURE);
160160
newShader.addParameter("pixels", 0, 200, 0, 200);
161161
newShader.addParameter("rollRate", 0, 10);
162162
newShader.addParameter("rollAmount", 0, 1);
163163
shaders.add(newShader);
164164

165165
// patches
166-
newShader = new GShader("patches.glsl", TYPE_TEXTURE);
166+
newShader = new GShader("../TextureShaders/data/patches.glsl", TYPE_TEXTURE);
167167
newShader.addParameter("row", 0, 1);
168168
newShader.addParameter("col", 0, 1);
169169
shaders.add(newShader);
170170

171171
// modcolor
172-
newShader = new GShader("modcolor.glsl", TYPE_TEXTURE);
172+
newShader = new GShader("../TextureShaders/data/modcolor.glsl", TYPE_TEXTURE);
173173
newShader.addParameter("modr", 0, 0.5);
174174
newShader.addParameter("modg", 0, 0.5);
175175
newShader.addParameter("modb", 0, 0.5);
176176
shaders.add(newShader);
177177

178178
// halftone
179-
newShader = new GShader("halftone.glsl", TYPE_TEXTURE);
179+
newShader = new GShader("../TextureShaders/data/halftone.glsl", TYPE_TEXTURE);
180180
newShader.addParameter("pixelsPerRow", 2, 100, true);
181181
shaders.add(newShader);
182182

183183
// halftone_cmyk
184-
newShader = new GShader("halftone_cmyk.glsl", TYPE_TEXTURE);
184+
newShader = new GShader("../TextureShaders/data/halftone_cmyk.glsl", TYPE_TEXTURE);
185185
newShader.addParameter("density", 0, 1);
186186
newShader.addParameter("frequency", 0, 100);
187187
shaders.add(newShader);
188188

189189
// invert
190-
newShader = new GShader("invert.glsl", TYPE_TEXTURE);
190+
newShader = new GShader("../TextureShaders/data/invert.glsl", TYPE_TEXTURE);
191191
shaders.add(newShader);
192192

193193
// bilateral_filter
194-
newShader = new GShader("bilateral_filter.glsl", TYPE_TEXTURE);
194+
newShader = new GShader("../TextureShaders/data/bilateral_filter.glsl", TYPE_TEXTURE);
195195
newShader.addParameter("sigma", 0, 2);
196196
shaders.add(newShader);
197197

198198
// ripple
199-
newShader = new GShader("ripple.glsl", TYPE_TEXTURE);
199+
newShader = new GShader("../ColorShaders/data/ripple.glsl", TYPE_TEXTURE);
200200
newShader.addParameter("ctr", 0, 1, 0, 1);
201201
shaders.add(newShader);
202202
}
@@ -211,7 +211,7 @@ void setShader(int idxNextShader) {
211211

212212
int rippleTimeClick;
213213
void mouseClicked() {
214-
if (shader.path.equals("ripple.glsl")) {
214+
if (shader.path.equals("../ColorShaders/data/ripple.glsl")) {
215215
rippleTimeClick = millis();
216216
cp5.getController("ctr").setArrayValue(new float[]{(float)(mouseX-480)/pg.width, (float)mouseY/pg.height});
217217
}

ShadersGui/ShadersGui.pde

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void setup()
1313
setupGui();
1414
setShader(0);
1515
pg = createGraphics(960, 720, P2D);
16-
textureImg = loadImage("hummingbird.jpg");
16+
textureImg = loadImage("../TextureShaders/data/hummingbird.jpg");
1717
}
1818

1919
void draw()

0 commit comments

Comments
 (0)