From 43a4a5ee8417eabbc2e3f5744d01bf25afc5cd03 Mon Sep 17 00:00:00 2001 From: codeanticode Date: Tue, 5 Feb 2013 17:48:28 -0500 Subject: [PATCH] endpoint instead of endPoint --- core/src/processing/opengl/LineShaderVert.glsl | 6 +++--- core/src/processing/opengl/PGraphicsOpenGL.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/processing/opengl/LineShaderVert.glsl b/core/src/processing/opengl/LineShaderVert.glsl index 0c11e8e84..5112317f5 100644 --- a/core/src/processing/opengl/LineShaderVert.glsl +++ b/core/src/processing/opengl/LineShaderVert.glsl @@ -27,7 +27,7 @@ uniform vec3 scale; attribute vec4 vertex; attribute vec4 color; -attribute vec4 endPoint; +attribute vec4 endpoint; varying vec4 vertColor; @@ -51,10 +51,10 @@ void main() { // http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=252848 v_p.xyz = v_p.xyz * scale; vec4 clip_p = projection * v_p; - float thickness = endPoint.w; + float thickness = endpoint.w; if (thickness != 0.0) { - vec4 pos_q = vec4(endPoint.xyz, 1); + vec4 pos_q = vec4(endpoint.xyz, 1); vec4 v_q = modelview * pos_q; v_q.xyz = v_q.xyz * scale; vec4 clip_q = projection * v_q; diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java index 6a35115e2..39882705a 100644 --- a/core/src/processing/opengl/PGraphicsOpenGL.java +++ b/core/src/processing/opengl/PGraphicsOpenGL.java @@ -6991,7 +6991,7 @@ public class PGraphicsOpenGL extends PGraphics { protected int vertexLoc; protected int colorLoc; - protected int endPointLoc; + protected int endpointLoc; public LineShader(PApplet parent) { super(parent); @@ -7010,7 +7010,7 @@ public class PGraphicsOpenGL extends PGraphics { public void loadAttributes() { vertexLoc = getAttributeLoc("vertex"); colorLoc = getAttributeLoc("color"); - endPointLoc = getAttributeLoc("endPoint"); + endpointLoc = getAttributeLoc("endpoint"); } @Override @@ -7036,7 +7036,7 @@ public class PGraphicsOpenGL extends PGraphics { public void setLineAttribute(int vboId, int size, int type, int stride, int offset) { - setAttributeVBO(endPointLoc, vboId, size, type, false, stride, offset); + setAttributeVBO(endpointLoc, vboId, size, type, false, stride, offset); } @Override @@ -7050,7 +7050,7 @@ public class PGraphicsOpenGL extends PGraphics { if (-1 < vertexLoc) pgl.enableVertexAttribArray(vertexLoc); if (-1 < colorLoc) pgl.enableVertexAttribArray(colorLoc); - if (-1 < endPointLoc) pgl.enableVertexAttribArray(endPointLoc); + if (-1 < endpointLoc) pgl.enableVertexAttribArray(endpointLoc); if (pgCurrent.getHint(ENABLE_STROKE_PERSPECTIVE) && pgCurrent.nonOrthoProjection()) { @@ -7076,7 +7076,7 @@ public class PGraphicsOpenGL extends PGraphics { public void unbind() { if (-1 < vertexLoc) pgl.disableVertexAttribArray(vertexLoc); if (-1 < colorLoc) pgl.disableVertexAttribArray(colorLoc); - if (-1 < endPointLoc) pgl.disableVertexAttribArray(endPointLoc); + if (-1 < endpointLoc) pgl.disableVertexAttribArray(endpointLoc); super.unbind(); }