From 3e4b2c0aae0f5aa6ee1e81b783771d756fcace97 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Sun, 29 Jul 2012 00:10:26 +0000
Subject: [PATCH] Removed PShader.FILTER constant, added loadShader(String) to
 PGraphics in Android

---
 android/core/src/processing/core/PApplet.java   |  5 +++++
 android/core/src/processing/core/PGraphics.java |  6 ++++++
 android/core/src/processing/opengl/PShader.java | 13 ++++++-------
 core/src/processing/opengl/PShader.java         | 13 ++++++-------
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java
index b0e1e3674..e0efc2e1c 100644
--- a/android/core/src/processing/core/PApplet.java
+++ b/android/core/src/processing/core/PApplet.java
@@ -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);
   }
diff --git a/android/core/src/processing/core/PGraphics.java b/android/core/src/processing/core/PGraphics.java
index 1466d702a..98d1ccb89 100644
--- a/android/core/src/processing/core/PGraphics.java
+++ b/android/core/src/processing/core/PGraphics.java
@@ -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");
diff --git a/android/core/src/processing/opengl/PShader.java b/android/core/src/processing/opengl/PShader.java
index 86ee6bec9..f2eb29e8b 100644
--- a/android/core/src/processing/opengl/PShader.java
+++ b/android/core/src/processing/opengl/PShader.java
@@ -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.
diff --git a/core/src/processing/opengl/PShader.java b/core/src/processing/opengl/PShader.java
index 86ee6bec9..f2eb29e8b 100644
--- a/core/src/processing/opengl/PShader.java
+++ b/core/src/processing/opengl/PShader.java
@@ -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.