Skip to content

Commit ec33241

Browse files
committed
updating shader
1 parent 3dd63f1 commit ec33241

File tree

5 files changed

+24
-20
lines changed

5 files changed

+24
-20
lines changed
Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
precision highp float; varying vec2 vPos;
2-
uniform vec2 p;
3-
uniform float r;
4-
const int I = 500;
1+
precision highp float;
2+
53
void main() {
6-
vec2 c = p + vPos * r, z = c;
7-
float n = 0.0;
8-
for (int i = I; i > 0; i --) {
9-
if(z.x*z.x+z.y*z.y > 4.0) {
10-
n = float(i)/float(I);
11-
break;
12-
}
13-
z = vec2(z.x*z.x-z.y*z.y, 2.0*z.x*z.y) + c;
14-
}
15-
gl_FragColor = vec4(0.5-cos(n*17.0)/2.0,0.5-cos(n*13.0)/2.0,0.5-cos(n*23.0)/2.0,1.0);
4+
5+
gl_FragColor = vec4(1.0,1.0,0.0,1.0);
166
}

lib/empty-example/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
background-color: #1b1b1b;
1313
}
1414
</style>
15-
<script src="../p5.rollup.min.js"></script>
15+
<script src="../p5.js"></script>
1616
<!-- <script src="../addons/p5.sound.js"></script> -->
1717
<script src="sketch.js"></script>
1818
</head>

lib/empty-example/shader.frag

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
precision highp float;
2+
3+
void main() {
4+
5+
gl_FragColor = vec4(1.0,1.0,0.0,1.0);
6+
}

lib/empty-example/sketch.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
function setup() {
2-
// put setup code here
1+
let myShader;
2+
3+
async function setup() {
4+
myShader = await loadFilterShader("shader.frag");
5+
createCanvas(100, 100, WEBGL);
6+
noStroke();
37
}
48

59
function draw() {
6-
// put drawing code here
7-
}
10+
// shader() sets the active shader with our shader
11+
shader(myShader);
12+
13+
// rect gives us some geometry on the screen
14+
rect(-50, -50, width, height);
15+
}

src/webgl/material.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ function material(p5, fn){
551551
* A rectangle with a shader applied to it.
552552
*/
553553
fn.loadFilterShader = async function (fragFilename, successCallback, failureCallback) {
554-
p5._validateParameters('loadFilterShader', arguments);
554+
// p5._validateParameters('loadFilterShader', arguments);
555555
try {
556556
// Load the fragment shader
557557
const fragSrc = await this.loadStrings(fragFilename);

0 commit comments

Comments
 (0)