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

Fixed path tessellation in PShape3D

Browse Source
This commit is contained in:
codeanticode
2012-05-11 19:43:44 +00:00
parent 48fd066e7c
commit e152979b40
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+2 -5
View File
@@ -377,7 +377,7 @@ public class PGraphicsOpenGL extends PGraphics {
protected boolean perspectiveCorrectedLines = false;
/** Used in point tessellation. */
final static protected int MIN_POINT_ACCURACY = 6;
final static protected int MIN_POINT_ACCURACY = 20;
final protected float[][] QUAD_POINT_SIGNS = { {-1, +1}, {-1, -1}, {+1, -1}, {+1, +1} };
@@ -7997,10 +7997,7 @@ public class PGraphicsOpenGL extends PGraphics {
float sx2 = screenX(x + w, y + h);
float sy2 = screenY(x + w, y + h);
int accuracy = (int) (TWO_PI * PApplet.dist(sx1, sy1, sx2, sy2) / 20);
if (accuracy < 6) {
accuracy = 6;
}
int accuracy = PApplet.max(MIN_POINT_ACCURACY, (int) (TWO_PI * PApplet.dist(sx1, sy1, sx2, sy2) / 20));
float inc = (float) PGraphicsOpenGL.SINCOS_LENGTH / accuracy;
if (fill) {
java/libraries/opengl/src/processing/opengl/PShape3D.java
+12 -6
View File
@@ -2868,6 +2868,7 @@ public class PShape3D extends PShape {
case VERTEX:
inGeo.addVertex(vertices[index][X], vertices[index][Y], code);
code = VERTEX;
index++;
break;
@@ -2875,6 +2876,7 @@ public class PShape3D extends PShape {
inGeo.addQuadraticVertex(vertices[index+0][X], vertices[index+0][Y], 0,
vertices[index+1][X], vertices[index+1][Y], 0,
fill, stroke, bezierDetail, code);
code = VERTEX;
index += 2;
break;
@@ -2883,19 +2885,20 @@ public class PShape3D extends PShape {
vertices[index+1][X], vertices[index+1][Y], 0,
vertices[index+2][X], vertices[index+2][Y], 0,
fill, stroke, bezierDetail, code);
code = VERTEX;
index += 3;
break;
case CURVE_VERTEX:
inGeo.addCurveVertex(vertices[index][X], vertices[index][Y], 0,
fill, stroke, curveDetail, code);
code = VERTEX;
index++;
case BREAK:
if (insideContour) {
code = VERTEX;
}
code = BREAK;
code = BREAK;
}
insideContour = true;
}
}
@@ -2905,6 +2908,7 @@ public class PShape3D extends PShape {
case VERTEX:
inGeo.addVertex(vertices[index][X], vertices[index][Y], vertices[index][Z], code);
code = VERTEX;
index++;
break;
@@ -2912,6 +2916,7 @@ public class PShape3D extends PShape {
inGeo.addQuadraticVertex(vertices[index+0][X], vertices[index+0][Y], vertices[index+0][Z],
vertices[index+1][X], vertices[index+1][Y], vertices[index+0][Z],
fill, stroke, bezierDetail, code);
code = VERTEX;
index += 2;
break;
@@ -2921,19 +2926,20 @@ public class PShape3D extends PShape {
vertices[index+1][X], vertices[index+1][Y], vertices[index+1][Z],
vertices[index+2][X], vertices[index+2][Y], vertices[index+2][Z],
fill, stroke, bezierDetail, code);
code = VERTEX;
index += 3;
break;
case CURVE_VERTEX:
inGeo.addCurveVertex(vertices[index][X], vertices[index][Y], vertices[index][Z],
fill, stroke, curveDetail, code);
code = VERTEX;
index++;
case BREAK:
if (insideContour) {
code = VERTEX;
}
code = BREAK;
code = BREAK;
}
insideContour = true;
}
}