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

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Florian Jenett
2013-03-25 18:01:37 +01:00
parent 6ef35628ae 1eedcab149
commit d96ce71fce
1 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,10 +357,10 @@ public class PShapeOpenGL extends PShape {
@Override
public void addChild(PShape child) {
if (child instanceof PShapeOpenGL) {
public void addChild(PShape who) {
if (who instanceof PShapeOpenGL) {
if (family == GROUP) {
PShapeOpenGL c3d = (PShapeOpenGL)child;
PShapeOpenGL c3d = (PShapeOpenGL)who;
super.addChild(c3d);
c3d.updateRoot(root);
@@ -388,11 +388,55 @@ public class PShapeOpenGL extends PShape {
PGraphics.showWarning("Cannot add child shape to non-group shape.");
}
} else {
PGraphics.showWarning("Shape must be 3D to be added to the group.");
PGraphics.showWarning("Shape must be OpenGL to be added to the group.");
}
}
@Override
public void addChild(PShape who, int idx) {
if (who instanceof PShapeOpenGL) {
if (family == GROUP) {
PShapeOpenGL c3d = (PShapeOpenGL)who;
super.addChild(c3d, idx);
c3d.updateRoot(root);
markForTessellation();
if (c3d.family == GROUP) {
if (c3d.textures != null) {
for (PImage tex: c3d.textures) {
addTexture(tex);
}
}
if (c3d.strokedTexture) {
strokedTexture(true);
}
} else {
if (c3d.image != null) {
addTexture(c3d.image);
if (c3d.stroke) {
strokedTexture(true);
}
}
}
} else {
PGraphics.showWarning("Cannot add child shape to non-group shape.");
}
} else {
PGraphics.showWarning("Shape must be OpenGL to be added to the group.");
}
}
@Override
public void removeChild(int idx) {
super.removeChild(idx);
markForTessellation();
}
protected void updateRoot(PShape root) {
this.root = (PShapeOpenGL) root;
if (family == GROUP) {
@@ -3901,31 +3945,42 @@ public class PShapeOpenGL extends PShape {
// Style handling
@Override
public void disableStyle() {
if (openShape) {
PGraphics.showWarning(INSIDE_BEGIN_END_ERROR, "disableStyle()");
return;
}
super.disableStyle();
}
// Applies the styles of g.
@Override
protected void styles(PGraphics g) {
if (g instanceof PGraphicsOpenGL) {
if (stroke) {
stroke(g.strokeColor);
strokeWeight(g.strokeWeight);
setStroke(g.strokeColor);
setStrokeWeight(g.strokeWeight);
// These two don't to nothing probably:
strokeCap(g.strokeCap);
strokeJoin(g.strokeJoin);
setStrokeCap(g.strokeCap);
setStrokeJoin(g.strokeJoin);
} else {
noStroke();
setStroke(false);
}
if (fill) {
fill(g.fillColor);
setFill(g.fillColor);
} else {
noFill();
setFill(false);
}
ambient(g.ambientColor);
specular(g.specularColor);
emissive(g.emissiveColor);
shininess(g.shininess);
setAmbient(g.ambientColor);
setSpecular(g.specularColor);
setEmissive(g.emissiveColor);
setShininess(g.shininess);
// What about other style parameters, such as rectMode, etc?
// These should force a tessellation update, same as stroke