From ce0efb24f6d0ef197abc32c3402be9e0a83aff0c Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Fri, 25 May 2012 16:45:23 +0000
Subject: [PATCH] renamed resetShader to defaultShader, updated examples

---
 core/src/processing/core/PApplet.java                |  6 ++++++
 .../examples/Shaders/EdgeDetect/EdgeDetect.pde       | 12 ++++++------
 .../examples/Shaders/ToonShading/ToonShading.pde     | 12 ++++++------
 .../src/processing/opengl/PGraphicsOpenGL.java       |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 55c81423d..1c501e6f1 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -9939,6 +9939,12 @@ public class PApplet extends Applet
   }
 
 
+  public void textureWrap(int wrap) {
+    if (recorder != null) recorder.textureWrap(wrap);
+    g.textureWrap(wrap);
+  }
+
+
   /**
    * ( begin auto-generated from texture.xml )
    *
diff --git a/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde b/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde
index 32ac75749..ed2cdf3c0 100644
--- a/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde
+++ b/java/libraries/opengl/examples/Shaders/EdgeDetect/EdgeDetect.pde
@@ -7,7 +7,7 @@
 PImage img;
 PShader shader;
 PGraphicsOpenGL pg;  
-boolean usingShader;
+boolean customShader;
   
 void setup() {
   size(400, 400, P3D);
@@ -16,7 +16,7 @@ void setup() {
   pg = (PGraphicsOpenGL)g;
   shader = pg.loadShader("edges.glsl", POLY_SHADER_TEX);
   pg.setShader(shader, POLY_SHADER_TEX);
-  usingShader = true;
+  customShader = true;
 }
 
 public void draw() {
@@ -24,11 +24,11 @@ public void draw() {
 }
   
 public void keyPressed() {
-  if (usingShader) {
-    pg.resetShader(POLY_SHADER_TEX);
-    usingShader = false;
+  if (customShader) {
+    pg.defaultShader(POLY_SHADER_TEX);
+    customShader = false;
   } else {
     pg.setShader(shader, POLY_SHADER_TEX);
-    usingShader = true;
+    customShader = true;
   }
 }
diff --git a/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde b/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde
index 130dd02da..9c14274ce 100644
--- a/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde
+++ b/java/libraries/opengl/examples/Shaders/ToonShading/ToonShading.pde
@@ -5,7 +5,7 @@
 
 PShader shader;
 PGraphicsOpenGL pg;  
-boolean usingShader;  
+boolean customShader;  
 
 public void setup() {
   size(400, 400, P3D);
@@ -15,7 +15,7 @@ public void setup() {
   pg = (PGraphicsOpenGL)g;
   shader = pg.loadShader("ToonVert.glsl", "ToonFrag.glsl", POLY_SHADER_LIT);
   pg.setShader(shader, POLY_SHADER_LIT);
-  usingShader = true;
+  customShader = true;
 }
 
 public void draw() {
@@ -29,13 +29,13 @@ public void draw() {
 }  
 
 public void keyPressed() {
-  if (usingShader) {
-    pg.resetShader(POLY_SHADER_LIT);
-    usingShader = false;
+  if (customShader) {
+    pg.defaultShader(POLY_SHADER_LIT);
+    customShader = false;
   } 
   else {
     pg.setShader(shader, POLY_SHADER_LIT);
-    usingShader = true;
+    customShader = true;
   }
 }
 
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
index 022776ef9..d6fbb4566 100644
--- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -5351,7 +5351,7 @@ public class PGraphicsOpenGL extends PGraphics {
   }
 
 
-  public void resetShader(int kind) {
+  public void defaultShader(int kind) {
     if (kind == POLY_SHADER_SIMPLE) {
       if (defPolyShaderSimple == null || defPolyShaderSimple.contextIsOutdated()) {
         defPolyShaderSimple = new PolyShaderSimple(parent, defPolyShaderVertSimpleURL, defPolyShaderFragNoTexURL);