eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

endpoint instead of endPoint

Browse Source
This commit is contained in:
codeanticode
2013-02-05 17:48:28 -05:00
parent 81aa8fdddb
commit 43a4a5ee84
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/LineShaderVert.glsl
+3 -3
View File
@@ -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;
core/src/processing/opengl/PGraphicsOpenGL.java
+5 -5
View File
@@ -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();
}