Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes incorrect values in "Passing Shader Uniforms" example #1022

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/data/examples/assets/uniforms.frag
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ precision mediump float;
// these are known as preprocessor directive
// essentially we are just declaring some variables that wont change
// you can think of them just like const variables

#define PI 3.14159265359
#define TWO_PI 6.28318530718

Expand All @@ -18,14 +17,18 @@ uniform vec2 resolution;
uniform float time;
uniform float mouse;

// this is the same variable we declared in the vertex shader
// we need to declare it here too!
varying vec2 vTexCoord;

// this is a function that turns an rgb value that goes from 0 - 255 into 0.0 - 1.0
vec3 rgb(float r, float g, float b){
return vec3(r / 255.0, g / 255.0, b / 255.0);
}

vec4 poly(float x, float y, float size, float sides, float rotation, vec3 col){
// get our coordinates
vec2 coord = gl_FragCoord.xy;
vec2 coord = vTexCoord;

// move the coordinates to where we want to draw the shape
vec2 pos = vec2(x,y) - coord;
Expand All @@ -45,7 +48,7 @@ vec4 poly(float x, float y, float size, float sides, float rotation, vec3 col){

// restrict our shape to black and white and set it's size
// we use the smoothstep function to get a nice soft edge
d = 1.0 - smoothstep(size*0.5, size*0.5+1.0, d);
d = 1.0 - smoothstep(size*0.5, size*0.5+0.002, d);

// return the color with the shape as the alpha channel
return vec4(col, d);
Expand All @@ -54,8 +57,8 @@ vec4 poly(float x, float y, float size, float sides, float rotation, vec3 col){

void main() {

vec2 center = resolution * 1.0; // draw the shape at the center of the screen
float size = resolution.y * 0.5; // make the shape a quarter of the screen height
vec2 center = vec2(0.5); // draw the shape at the center of the screen
float size = 0.25; // make the shape a quarter of the screen height
float sides = mod(floor(mouse), 7.0) + 3.0; // slowly increase the sides, when it reaches 10 sides, go back down to 3
float rotation = time; // rotation is in radians, but for time it doesnt really matter

Expand Down
27 changes: 19 additions & 8 deletions src/data/examples/assets/uniforms.vert
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
// vert file and comments from adam ferriss
// https://github.com/aferriss/p5jsShaderExamples

// our vertex data
attribute vec3 aPosition;

// our texcoordinates
attribute vec2 aTexCoord;

// this is a variable that will be shared with the fragment shader
// we will assign the attribute texcoords to the varying texcoords to move them from the vert shader to the frag shader
// it can be called whatever you want but often people prefix it with 'v' to indicate that it is a varying
varying vec2 vTexCoord;

void main() {

// copy the position data into a vec4, using 1.0 as the w component
vec4 positionVec4 = vec4(aPosition, 1.0);
// copy the texture coordinates
vTexCoord = aTexCoord;

// copy the position data into a vec4, using 1.0 as the w component
vec4 positionVec4 = vec4(aPosition, 1.0);

// scale the rect by two, and move it to the center of the screen
// if we don't do this, it will appear with its bottom left corner in the center of the sketch
// try commenting this line out to see what happens
positionVec4.xy = positionVec4.xy * 2.0 - 1.0;
// scale the rect by two, and move it to the center of the screen
// if we don't do this, it will appear with its bottom left corner in the center of the sketch
// try commenting this line out to see what happens
positionVec4.xy = positionVec4.xy * 2.0 - 1.0;

// send the vertex information on to the fragment shader
gl_Position = positionVec4;
// send the vertex information on to the fragment shader
gl_Position = positionVec4;
}
2 changes: 1 addition & 1 deletion src/data/examples/en/20_3D/10_passing_shader_uniforms.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

function setup() {
// shaders require WEBGL mode to work
createCanvas(710, 400, WEBGL);
createCanvas(400, 400, WEBGL);
noStroke();
}

Expand Down
2 changes: 1 addition & 1 deletion src/data/examples/es/20_3D/10_passing_shader_uniforms.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

function setup() {
// shaders require WEBGL mode to work
createCanvas(710, 400, WEBGL);
createCanvas(400, 400, WEBGL);
noStroke();
}

Expand Down
2 changes: 1 addition & 1 deletion src/data/examples/ko/20_3D/10_passing_shader_uniforms.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

function setup() {
// 셰이더를 작동하기 위해 WEBGL 모드가 필요합니다.
createCanvas(710, 400, WEBGL);
createCanvas(400, 400, WEBGL);
noStroke();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

function setup() {
// shaders require WEBGL mode to work
createCanvas(710, 400, WEBGL);
createCanvas(400, 400, WEBGL);
noStroke();
}

Expand Down