diff --git a/shader/twoD/basic.vert b/shader/twoD/basic.vert index b2b5d4ca6..f142118a8 100644 --- a/shader/twoD/basic.vert +++ b/shader/twoD/basic.vert @@ -3,10 +3,6 @@ layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; out vec4 vColor; -//uniform vec2 winSize; -//uniform float zoom; -//uniform float rotation; -//uniform vec2 translation; uniform mat4 worldMat; void main() diff --git a/shader/twoD/bezierQuad.frag b/shader/twoD/bezierQuad.frag index 502e57582..6a991e2d9 100644 --- a/shader/twoD/bezierQuad.frag +++ b/shader/twoD/bezierQuad.frag @@ -13,6 +13,4 @@ void main() float e = sqrt(boxIn.x) + sqrt(boxIn.y) - 1.0; if ( d < 0 || e > 0) { discard; } fColor = vColor; -// if ( d < 0 || e > 0) { fColor = vec4(0,0,1,1); } -// if ( d < 0 || e > 0) { fColor = vec4(0,0,1,1); } } diff --git a/shader/twoD/bezierQuad.vert b/shader/twoD/bezierQuad.vert index cb286965b..9265ea4d4 100644 --- a/shader/twoD/bezierQuad.vert +++ b/shader/twoD/bezierQuad.vert @@ -6,10 +6,6 @@ out vec4 vColor; out vec2 boxOut; out vec2 boxIn; -uniform vec2 winSize; -uniform float zoom; -uniform float rotation; -uniform vec2 translation; uniform mat4 worldMat; void main() diff --git a/shader/twoD/character.geom b/shader/twoD/character.geom index 38343deb1..b9216385c 100644 --- a/shader/twoD/character.geom +++ b/shader/twoD/character.geom @@ -31,7 +31,5 @@ void main() //gl_Position = vec4 (0.5, 0 , -5 , 1); EmitVertex(); - EndPrimitive(); - } diff --git a/shader/twoD/character.vert b/shader/twoD/character.vert index ca4366904..e836e0c4f 100644 --- a/shader/twoD/character.vert +++ b/shader/twoD/character.vert @@ -3,10 +3,6 @@ layout (location = 0) in vec3 aPos; layout (location = 1) in vec4 aColor; layout (location = 2) in vec3 aTexCoord; -uniform vec2 winSize; -uniform float zoom; -uniform vec2 translation; -uniform float rotation; uniform mat4 worldMat; out vec4 vColor; @@ -18,4 +14,3 @@ void main() vColor = aColor; vTexCoord = aTexCoord; } - diff --git a/shader/twoD/ellipse.vert b/shader/twoD/ellipse.vert index 7abf7b24a..42aed9d78 100644 --- a/shader/twoD/ellipse.vert +++ b/shader/twoD/ellipse.vert @@ -3,10 +3,6 @@ layout (location = 0) in vec3 position; layout (location = 1) in vec4 col; out vec4 vCol; -uniform vec2 winSize; -uniform float zoom; -uniform vec2 translation; -uniform float rotation; uniform mat4 worldMat; void main()