diff --git a/java/examples/Demos/Graphics/Wiggling/Wiggling.pde b/java/examples/Demos/Graphics/Wiggling/Wiggling.pde index d8f33d195..126c7d35f 100644 --- a/java/examples/Demos/Graphics/Wiggling/Wiggling.pde +++ b/java/examples/Demos/Graphics/Wiggling/Wiggling.pde @@ -63,8 +63,8 @@ void createCube() { // Front face face = createShape(); face.beginShape(POLYGON); - face.stroke(color(255, 0, 0)); - face.fill(color(255)); + face.stroke(255, 0, 0); + face.fill(255); face.beginContour(); face.vertex(-cubeSize/2, -cubeSize/2, +cubeSize/2); face.vertex(+cubeSize/2, -cubeSize/2, +cubeSize/2); @@ -86,8 +86,8 @@ void createCube() { // Back face face = createShape(); face.beginShape(POLYGON); - face.stroke(color(255, 0, 0)); - face.fill(color(255)); + face.stroke(255, 0, 0); + face.fill(255); face.beginContour(); face.vertex(+cubeSize/2, -cubeSize/2, -cubeSize/2); face.vertex(-cubeSize/2, -cubeSize/2, -cubeSize/2); @@ -109,8 +109,8 @@ void createCube() { // Right face face = createShape(); face.beginShape(POLYGON); - face.stroke(color(255, 0, 0)); - face.fill(color(255)); + face.stroke(255, 0, 0); + face.fill(255); face.beginContour(); face.vertex(+cubeSize/2, -cubeSize/2, +cubeSize/2); face.vertex(+cubeSize/2, -cubeSize/2, -cubeSize/2); @@ -132,8 +132,8 @@ void createCube() { // Left face face = createShape(); face.beginShape(POLYGON); - face.stroke(color(255, 0, 0)); - face.fill(color(255)); + face.stroke(255, 0, 0); + face.fill(255); face.beginContour(); face.vertex(-cubeSize/2, -cubeSize/2, -cubeSize/2); face.vertex(-cubeSize/2, -cubeSize/2, +cubeSize/2); @@ -155,8 +155,8 @@ void createCube() { // Top face face = createShape(); face.beginShape(POLYGON); - face.stroke(color(255, 0, 0)); - face.fill(color(255)); + face.stroke(255, 0, 0); + face.fill(255); face.beginContour(); face.vertex(-cubeSize/2, +cubeSize/2, +cubeSize/2); face.vertex(+cubeSize/2, +cubeSize/2, +cubeSize/2); @@ -178,8 +178,8 @@ void createCube() { // Bottom face face = createShape(); face.beginShape(POLYGON); - face.stroke(color(255, 0, 0)); - face.fill(color(255)); + face.stroke(255, 0, 0); + face.fill(255); face.beginContour(); face.vertex(+cubeSize/2, -cubeSize/2, +cubeSize/2); face.vertex(-cubeSize/2, -cubeSize/2, +cubeSize/2); diff --git a/java/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde b/java/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde index 6d1e178e1..76f807473 100644 --- a/java/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde +++ b/java/examples/Demos/Performance/StaticParticlesRetained/StaticParticlesRetained.pde @@ -23,7 +23,7 @@ void setup() { PShape part = createShape(); part.beginShape(QUAD); part.noStroke(); - part.tint(color(255)); + part.tint(255); part.texture(sprite); part.normal(0, 0, 1); part.vertex(cx - partSize/2, cy - partSize/2, cz, 0, 0); diff --git a/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde b/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde index 922160ae8..03b847c4d 100644 --- a/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde +++ b/java/examples/Topics/Create Shapes/BeginEndContour/BeginEndContour.pde @@ -12,8 +12,8 @@ void setup() { // Make a shape s = createShape(); s.beginShape(); - s.fill(0xFF000000); - s.stroke(0xFFFFFFFF); + s.fill(0); + s.stroke(255); s.strokeWeight(2); // Exterior part of shape s.vertex(-100,-100); diff --git a/java/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde b/java/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde index ef50142f6..05592f8ff 100644 --- a/java/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde +++ b/java/examples/Topics/Create Shapes/GroupPShape/GroupPShape.pde @@ -18,7 +18,7 @@ void setup() { PShape star = createShape(); star.beginShape(); star.noFill(); - star.stroke(0xFFFFFFFF); + star.stroke(255); star.vertex(0, -50); star.vertex(14, -20); star.vertex(47, -15); @@ -35,7 +35,7 @@ void setup() { PShape path = createShape(); path.beginShape(); path.noFill(); - path.stroke(0xFFFFFFFF); + path.stroke(255); for (float a = -PI; a < 0; a += 0.1) { float r = random(60, 70); path.vertex(r*cos(a), r*sin(a)); @@ -45,7 +45,7 @@ void setup() { // Make a primitive (Rectangle) PShape PShape rectangle = createShape(RECT,-10,-10,20,20); rectangle.setFill(false); - rectangle.setStroke(0xFFFFFFFF); + rectangle.setStroke(255); // Add them all to the group group.addChild(star); diff --git a/java/examples/Topics/Create Shapes/PathPShape/PathPShape.pde b/java/examples/Topics/Create Shapes/PathPShape/PathPShape.pde index 30b07a19a..b40d41b43 100644 --- a/java/examples/Topics/Create Shapes/PathPShape/PathPShape.pde +++ b/java/examples/Topics/Create Shapes/PathPShape/PathPShape.pde @@ -15,7 +15,7 @@ void setup() { path.beginShape(); // Set fill and stroke path.noFill(); - path.stroke(color(255)); + path.stroke(255); path.strokeWeight(2); float x = 0; diff --git a/java/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde b/java/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde index e79e6cf36..0cfaad37c 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShape/PolygonPShape.pde @@ -15,8 +15,8 @@ void setup() { star = createShape(); star.beginShape(); // You can set fill and stroke - star.fill(color(102)); - star.stroke(color(255)); + star.fill(102); + star.stroke(255); star.strokeWeight(2); // Here, we are hardcoding a series of vertices star.vertex(0, -50); diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde index 09a09738f..d75d445eb 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP/Star.pde @@ -16,7 +16,7 @@ class Star { s = createShape(); s.beginShape(); // You can set fill and stroke - s.fill(color(255, 204)); + s.fill(255, 204); s.noStroke(); // Here, we are hardcoding a series of vertices s.vertex(0, -50); diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde index b179e57b9..ad6164c88 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP2/PolygonPShapeOOP2.pde @@ -17,7 +17,7 @@ void setup() { PShape star = createShape(); star.beginShape(); star.noStroke(); - star.fill(color(0,127)); + star.fill(0, 127); star.vertex(0, -50); star.vertex(14, -20); star.vertex(47, -15); diff --git a/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde b/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde index 476dbbb4d..f7d63f7a2 100644 --- a/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde +++ b/java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde @@ -18,14 +18,14 @@ void setup() { smooth(); shapes[0] = createShape(ELLIPSE,0,0,100,100); - shapes[0].setFill(color(255,127)); + shapes[0].setFill(color(255, 127)); shapes[0].setStroke(false); shapes[1] = createShape(RECT,0,0,100,100); - shapes[1].setFill(color(255,127)); + shapes[1].setFill(color(255, 127)); shapes[1].setStroke(false); shapes[2] = createShape(); shapes[2].beginShape(); - shapes[2].fill(color(0,127)); + shapes[2].fill(0, 127); shapes[2].noStroke(); shapes[2].vertex(0, -50); shapes[2].vertex(14, -20); diff --git a/java/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde b/java/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde index 6345d33b9..be4d7981f 100644 --- a/java/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde +++ b/java/examples/Topics/Create Shapes/WigglePShape/Wiggler.pde @@ -29,8 +29,8 @@ class Wiggler { // Now make the PShape with those vertices s = createShape(); s.beginShape(); - s.setFill(color(127)); - s.stroke(color(0)); + s.fill(127); + s.stroke(0); s.strokeWeight(2); for (PVector v : original) { s.vertex(v.x, v.y);