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

blend() renamed to screenBlend() and noBlend() removed

Browse Source
This commit is contained in:
codeanticode
2011-02-07 07:31:44 +00:00
parent c3d106e425
commit 2ec3cec997
2 changed files with 27 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/processing/core/PApplet.java
View File

@@ -7809,15 +7809,6 @@ public class PApplet extends Applet
}
/**
* Sets the automatic normal calculation mode.
*/
public void autoNormal(boolean auto) {
if (recorder != null) recorder.autoNormal(auto);
g.autoNormal(auto);
}
/**
* Sets the current normal vector. Only applies with 3D rendering
* and inside a beginShape/endShape block.
@@ -10212,15 +10203,9 @@ public class PApplet extends Applet
}
public void blend(int mode) {
if (recorder != null) recorder.blend(mode);
g.blend(mode);
}
public void noBlend() {
if (recorder != null) recorder.noBlend();
g.noBlend();
public void screenBlend(int mode) {
if (recorder != null) recorder.screenBlend(mode);
g.screenBlend(mode);
}
@@ -10230,12 +10215,6 @@ public class PApplet extends Applet
}
public void noTextureBlend() {
if (recorder != null) recorder.noTextureBlend();
g.noTextureBlend();
}
public void mergeShapes(boolean val) {
if (recorder != null) recorder.mergeShapes(val);
g.mergeShapes(val);
@@ -10248,6 +10227,12 @@ public class PApplet extends Applet
}
public void autoNormal(boolean auto) {
if (recorder != null) recorder.autoNormal(auto);
g.autoNormal(auto);
}
public void texture(PImage image0, PImage image1) {
if (recorder != null) recorder.texture(image0, image1);
g.texture(image0, image1);

43
core/src/processing/core/PGraphics.java
View File

@@ -896,14 +896,6 @@ public class PGraphics extends PImage implements PConstants {
this.edge = edge;
}
/**
* Sets the automatic normal calculation mode.
*/
public void autoNormal(boolean auto) {
this.autoNormal = auto;
}
/**
* Sets the current normal vector. Only applies with 3D rendering
@@ -5942,7 +5934,7 @@ public class PGraphics extends PImage implements PConstants {
/**
* Return true if this renderer supports 2D drawing. Defaults to true.
* Return true if this renderer supports 3D drawing. Defaults to false.
*/
public boolean is3D() {
return false;
@@ -5956,60 +5948,61 @@ public class PGraphics extends PImage implements PConstants {
return null;
}
protected PShape loadShape(String filename, Object params) {
showMissingWarning("loading OBJ files requires OPENGL2");
return null;
}
protected PShape createShape(int size, Object params) {
showMissingWarning("creating PShape3D objects requires OPENGL2");
return null;
}
public void blend(int mode) {
showMissingWarning("blend");
}
public void noBlend() {
showMissingWarning("noBlend");
public void screenBlend(int mode) {
showMissingWarning("screen blending requires OPENGL2");
}
public void textureBlend(int mode) {
showMissingWarning("blend");
}
public void noTextureBlend() {
showMissingWarning("noBlend");
showMissingWarning("texture blending requires OPENGL2");
}
public PShape beginRecord() { // ignore
showMissingWarning("beginRecord");
showMissingWarning("shape recording requires OPENGL2");
return null;
}
public void endRecord() { // ignore
showMissingWarning("endShapeRecord");
showMissingWarning("shape recording requires OPENGL2");
}
public boolean isRecording() { // ignore
showMissingWarning("shape recording requires OPENGL2");
return false;
}
public void mergeShapes(boolean val) {
showMissingWarning("mergeShapes");
showMissingWarning("shape recording requires OPENGL2");
}
public void shapeName(String name) {
showMissingWarning("shapeName");
showMissingWarning("shape recording requires OPENGL2");
}
public void autoNormal(boolean auto) {
this.autoNormal = auto;
}
public void texture(PImage image0, PImage image1) {
showMissingWarning("multitexturing requires OPENGL2");
}