eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-02 21:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

create PMatrix2D or 3D in PShapeOpenGL depending on value of is3D

Browse Source
This commit is contained in:
codeanticode
2013-10-05 13:39:29 -04:00
parent c41c53f931
commit 2a7d4ffba2
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/processing/opengl/PShapeOpenGL.java
View File

@@ -1261,19 +1261,7 @@ public class PShapeOpenGL extends PShape {
protected void transform(int type, float... args) {
int dimensions;
if (type == ROTATE) {
dimensions = args.length == 1 ? 2 : 3;
} else if (type == MATRIX) {
dimensions = args.length == 6 ? 2 : 3;
} else {
dimensions = args.length;
}
transformImpl(type, dimensions, args);
}
protected void transformImpl(int type, int ncoords, float... args) {
int ncoords = is3D ? 3 : 2;
checkMatrix(ncoords);
calcTransform(type, ncoords, args);
if (tessellated) {
@@ -1397,9 +1385,9 @@ public class PShapeOpenGL extends PShape {
ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addBezierVertex(x2, y2, z2,
x3, y3, z3,
x4, y4, z4,
fill, stroke, bezierDetail, vertexCode(), kind);
x3, y3, z3,
x4, y4, z4,
fill, stroke, bezierDetail, vertexCode(), kind);
}
@@ -1425,8 +1413,8 @@ public class PShapeOpenGL extends PShape {
ambientColor, specularColor, emissiveColor, shininess);
inGeo.setNormal(normalX, normalY, normalZ);
inGeo.addQuadraticVertex(cx, cy, cz,
x3, y3, z3,
fill, stroke, bezierDetail, vertexCode(), kind);
x3, y3, z3,
fill, stroke, bezierDetail, vertexCode(), kind);
}