Removed PShader.FILTER constant, added loadShader(String) to PGraphics in Android

This commit is contained in:
codeanticode
2012-07-29 00:10:26 +00:00
parent 205b67a529
commit 3e4b2c0aae
4 changed files with 23 additions and 14 deletions
@@ -7454,6 +7454,11 @@ public class PApplet extends Activity implements PConstants, Runnable {
}
public PShader loadShader(String fragFilename) {
return g.loadShader(fragFilename);
}
public void shader(PShader shader) {
g.shader(shader);
}
@@ -1319,6 +1319,12 @@ public class PGraphics extends PImage implements PConstants {
return null;
}
public PShader loadShader(String fragFilename) {
showMissingWarning("loadShader");
return null;
}
public void shader(PShader shader) {
showMissingWarning("shader");
@@ -36,13 +36,12 @@ import java.util.HashMap;
*/
public class PShader {
// shaders constants
static public final int FILTER = 0;
static public final int FLAT = 1;
static public final int LIT = 2;
static public final int TEXTURED = 3;
static public final int FULL = 4;
static public final int LINE = 5;
static public final int POINT = 6;
static public final int FLAT = 0;
static public final int LIT = 1;
static public final int TEXTURED = 2;
static public final int FULL = 3;
static public final int LINE = 4;
static public final int POINT = 5;
protected PApplet parent;
// The main renderer associated to the parent PApplet.