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

solved some quirks in 2d path generation

Browse Source
This commit is contained in:
codeanticode
2011-12-06 03:56:10 +00:00
parent 341c74a9d6
commit b0bcc9970a
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+16 -13
View File
@@ -8005,31 +8005,34 @@ public class PGraphicsOpenGL extends PGraphics {
}
int contour0 = first;
path.moveTo(inGeo.vertices[3 * first + 0], inGeo.vertices[3 * first + 1]);
for (int ln = 0; ln < lnCount; ln++) {
int i0 = first + ln;
int i1 = first + ln + 1;
if (inGeo.codes[i0] == PShape.BREAK) {
contour0 = i0;
path.moveTo(inGeo.vertices[3 * i0 + 0], inGeo.vertices[3 * i0 + 1]);
}
boolean close = false;
if ((i1 == lnCount || inGeo.codes[i1] == PShape.BREAK) && closed) {
i0 = contour0;
path.moveTo(inGeo.vertices[3 * i0 + 0], inGeo.vertices[3 * i0 + 1]);
i1 = first + ln;
close = true;
}
if ((i1 == lnCount || inGeo.codes[i1] == PShape.BREAK) && closed) {
i1 = contour0;
path.closePath();
}
if (inGeo.codes[i1] != PShape.BREAK &&
(0 < inGeo.strokes[5 * i0 + 4] ||
0 < inGeo.strokes[5 * i1 + 4])) {
if (inGeo.codes[i1] != PShape.BREAK) {
path.lineTo(inGeo.vertices[3 * i1 + 0], inGeo.vertices[3 * i1 + 1]);
}
if (inGeo.codes[i1] == PShape.BREAK) {
} else {
path.moveTo(inGeo.vertices[3 * i1 + 0], inGeo.vertices[3 * i1 + 1]);
}
if (close) {
path.closePath();
}
}
// saving the region in the fill geometry that corresponds to the tessellated
// stroked lines, this is used during rendering when the fill geometry is textured
// (lines are never textured).
java/libraries/opengl/src/processing/opengl/PShape3D.java
+5 -6
View File
@@ -269,11 +269,6 @@ public class PShape3D extends PShape {
}
public void closed(boolean closed) {
isClosed = closed;
}
public void breakShape() {
breakShape = true;
}
@@ -371,7 +366,11 @@ public class PShape3D extends PShape {
public void end() {
// ?
end(OPEN);
}
public void end(int mode) {
isClosed = mode == CLOSE;
}
//////////////////////////////////////////////////////////////