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

Examples update, some more cleanup in PShapeOpenGL

Browse Source
This commit is contained in:
codeanticode
2012-05-26 21:45:49 +00:00
parent 2b758dbba4
commit 2dbecb9373
8 changed files with 46 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/examples/IO/SavePDF/SavePDF.pde
+2 -3
View File
@@ -3,8 +3,7 @@
import processing.pdf.*;
size(720, 480, P3D);
hint(ENABLE_ACCURATE_2D);
size(720, 480, P2D);
smooth();
strokeWeight(2);
background(204);
@@ -44,4 +43,4 @@ ellipse(263, 148, 5, 5); // Small eye 1
ellipse(296, 130, 4, 4); // Small eye 2
ellipse(305, 162, 3, 3); // Small eye 3
endRaw();
endRaw();
java/libraries/opengl/examples/Immediate/Robot1_Draw/Robot1_Draw.pde
+1 -3
View File
@@ -1,8 +1,7 @@
// Robot 1: Draw from "Getting Started with Processing"
// by Reas & Fry. O'Reilly / Make 2010
size(720, 480, P3D);
hint(ENABLE_ACCURATE_2D);
size(720, 480, P2D);
smooth();
strokeWeight(2);
background(204);
@@ -39,4 +38,3 @@ fill(153); // Set fill to light gray
ellipse(263, 148, 5, 5); // Small eye 1
ellipse(296, 130, 4, 4); // Small eye 2
ellipse(305, 162, 3, 3); // Small eye 3
java/libraries/opengl/examples/Immediate/TriangleStrip/TriangleStrip.pde
+2 -1
View File
@@ -13,7 +13,8 @@ float outerRad;
float innerRad;
void setup() {
size(640, 360, P3D);
size(640, 360, P2D);
smooth(4);
background(204);
x = width/2;
y = height/2;
java/libraries/opengl/examples/Retained/PolyImmediate/PolyImmediate.pde
+1 -1
View File
@@ -1,4 +1,4 @@
size(100, 100, P3D);
size(100, 100, P2D);
beginShape(POLYGON);
fill(0, 255, 0, 255);
java/libraries/opengl/examples/Retained/PolyRetain/PolyRetain.pde
+1 -1
View File
@@ -1,4 +1,4 @@
size(100, 100, P3D);
size(100, 100, P2D);
PShape obj = createShape(POLYGON);
obj.fill(0, 255, 0, 255);
java/libraries/opengl/examples/Retained/Primitive/Primitive.pde
+1 -2
View File
@@ -3,8 +3,7 @@ boolean filled = true;
boolean stroked = true;
public void setup() {
size(400, 400, P3D);
frameRate(90);
size(400, 400, P2D);
fill(255, 0, 0);
stroke(0, 0, 255);
java/libraries/opengl/examples/Retained/Shape2_18/Shape2_18.pde
+1 -1
View File
@@ -1,4 +1,4 @@
size(100, 100, P3D);
size(100, 100, P2D);
smooth();
PShape obj = createShape();
java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java
+37 -53
View File
@@ -361,8 +361,7 @@ public class PShapeOpenGL extends PShape {
super.addChild(c3d);
c3d.updateRoot(root);
root.tessellated = false;
tessellated = false;
markForTessellation();
if (c3d.family == GROUP) {
if (c3d.textures != null) {
@@ -859,8 +858,7 @@ public class PShapeOpenGL extends PShape {
ambientColor, specularColor, emissiveColor, shininess,
vertexCode());
root.tessellated = false;
tessellated = false;
markForTessellation();
}
@@ -912,8 +910,7 @@ public class PShapeOpenGL extends PShape {
inGeo.trim();
isClosed = mode == CLOSE;
root.tessellated = false;
tessellated = false;
markForTessellation();
shapeEnded = true;
}
@@ -925,8 +922,7 @@ public class PShapeOpenGL extends PShape {
}
super.setParams(source);
root.tessellated = false;
tessellated = false;
markForTessellation();
shapeEnded = true;
}
@@ -938,8 +934,7 @@ public class PShapeOpenGL extends PShape {
}
super.setPath(vcount, verts, ccount, codes);
root.tessellated = false;
tessellated = false;
markForTessellation();
shapeEnded = true;
}
@@ -981,8 +976,7 @@ public class PShapeOpenGL extends PShape {
// Changing the stroke weight on a 2D shape needs a
// re-tesellation in order to replace the old line
// geometry.
root.tessellated = false;
tessellated = false;
markForTessellation();
}
}
@@ -997,8 +991,7 @@ public class PShapeOpenGL extends PShape {
// Changing the stroke weight on a 2D shape needs a
// re-tesellation in order to replace the old point
// geometry.
root.tessellated = false;
tessellated = false;
markForTessellation();
}
}
}
@@ -1016,8 +1009,7 @@ public class PShapeOpenGL extends PShape {
// Changing the stroke join on a 2D shape needs a
// re-tesellation in order to replace the old join
// geometry.
root.tessellated = false;
tessellated = false;
markForTessellation();
}
strokeJoin = join;
}
@@ -1035,8 +1027,7 @@ public class PShapeOpenGL extends PShape {
// Changing the stroke cap on a 2D shape needs a
// re-tesellation in order to replace the old cap
// geometry.
root.tessellated = false;
tessellated = false;
markForTessellation();
}
strokeCap = cap;
}
@@ -1181,8 +1172,7 @@ public class PShapeOpenGL extends PShape {
// Disabling stroke on a shape previously with
// stroke needs a re-tesellation in order to remove
// the additional geometry of lines and/or points.
root.tessellated = false;
tessellated = false;
markForTessellation();
stroke = false;
}
updateStrokeColor(0x0);
@@ -1276,8 +1266,7 @@ public class PShapeOpenGL extends PShape {
// Enabling stroke on a shape previously without
// stroke needs a re-tessellation in order to incorporate
// the additional geometry of lines and/or points.
root.tessellated = false;
tessellated = false;
markForTessellation();
stroke = true;
}
updateStrokeColor(calcColor);
@@ -2014,12 +2003,11 @@ public class PShapeOpenGL extends PShape {
}
public void setVertex(int index, float x, float y, float z) {
root.tessellated = false;
tessellated = false;
public void setVertex(int index, float x, float y, float z) {
inGeo.vertices[3 * index + 0] = x;
inGeo.vertices[3 * index + 1] = y;
inGeo.vertices[3 * index + 2] = z;
markForTessellation();
}
@@ -2049,12 +2037,11 @@ public class PShapeOpenGL extends PShape {
}
public void setNormal(int index, float nx, float ny, float nz) {
root.tessellated = false;
tessellated = false;
public void setNormal(int index, float nx, float ny, float nz) {
inGeo.normals[3 * index + 0] = nx;
inGeo.normals[3 * index + 1] = ny;
inGeo.normals[3 * index + 2] = nz;
inGeo.normals[3 * index + 2] = nz;
markForTessellation();
}
@@ -2068,11 +2055,10 @@ public class PShapeOpenGL extends PShape {
}
public void setTextureUV(int index, float u, float v) {
root.tessellated = false;
tessellated = false;
public void setTextureUV(int index, float u, float v) {
inGeo.texcoords[2 * index + 0] = u;
inGeo.texcoords[2 * index + 1] = v;
markForTessellation();
}
@@ -2081,10 +2067,9 @@ public class PShapeOpenGL extends PShape {
}
public void setFill(int index, int fill) {
root.tessellated = false;
tessellated = false;
public void setFill(int index, int fill) {
inGeo.colors[index] = PGL.javaToNativeARGB(fill);
markForTessellation();
}
@@ -2093,10 +2078,9 @@ public class PShapeOpenGL extends PShape {
}
public void setStroke(int index, int stroke) {
root.tessellated = false;
tessellated = false;
public void setStroke(int index, int stroke) {
inGeo.strokeColors[index] = PGL.javaToNativeARGB(stroke);
markForTessellation();
}
@@ -2105,10 +2089,9 @@ public class PShapeOpenGL extends PShape {
}
public void setStrokeWeight(int index, float weight) {
root.tessellated = false;
tessellated = false;
public void setStrokeWeight(int index, float weight) {
inGeo.strokeWeights[index] = weight;
markForTessellation();
}
@@ -2117,10 +2100,9 @@ public class PShapeOpenGL extends PShape {
}
public void setAmbient(int index, int ambient) {
root.tessellated = false;
tessellated = false;
public void setAmbient(int index, int ambient) {
inGeo.ambient[index] = PGL.javaToNativeARGB(ambient);
markForTessellation();
}
public int getSpecular(int index) {
@@ -2128,10 +2110,9 @@ public class PShapeOpenGL extends PShape {
}
public void setSpecular(int index, int specular) {
root.tessellated = false;
tessellated = false;
public void setSpecular(int index, int specular) {
inGeo.specular[index] = PGL.javaToNativeARGB(specular);
markForTessellation();
}
@@ -2140,10 +2121,9 @@ public class PShapeOpenGL extends PShape {
}
public void setEmissive(int index, int emissive) {
root.tessellated = false;
tessellated = false;
public void setEmissive(int index, int emissive) {
inGeo.emissive[index] = PGL.javaToNativeARGB(emissive);
markForTessellation();
}
@@ -2152,10 +2132,9 @@ public class PShapeOpenGL extends PShape {
}
public void setShininess(int index, float shine) {
root.tessellated = false;
tessellated = false;
public void setShininess(int index, float shine) {
inGeo.shininess[index] = shine;
markForTessellation();
}
@@ -2261,6 +2240,11 @@ public class PShapeOpenGL extends PShape {
}
protected void markForTessellation() {
root.tessellated = false;
tessellated = false;
}
protected void tessellate() {
if (root == this && parent == null) {
if (tessGeo == null) {