From 34491737dd23524e97568a3ede4ae96616f3cb2e Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Fri, 3 Oct 2008 00:47:15 +0000
Subject: [PATCH] tweaks for imageMode() and image cache changes

---
 .../processing/opengl/PGraphicsOpenGL.java    | 30 +++++++------------
 video/src/processing/video/Capture.java       |  2 ++
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/opengl/src/processing/opengl/PGraphicsOpenGL.java b/opengl/src/processing/opengl/PGraphicsOpenGL.java
index cef2b1881..79730068a 100644
--- a/opengl/src/processing/opengl/PGraphicsOpenGL.java
+++ b/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -537,7 +537,7 @@ public class PGraphicsOpenGL extends PGraphics3D {
         }
         */
 
-        ImageCache cash = (ImageCache) texture.cache;
+        ImageCache cash = (ImageCache) texture.getCache(this);
         float uscale = (float) texture.width / (float) cash.twidth;
         float vscale = (float) texture.height / (float) cash.theight;
 
@@ -659,22 +659,22 @@ public class PGraphicsOpenGL extends PGraphics3D {
 
   // TODO need to remove this
   public float uscale(PImage texture) {
-    ImageCache cash = (ImageCache) texture.cache;
+    ImageCache cash = (ImageCache) texture.getCache(this);
     return (float) texture.width / (float) cash.twidth;
   }
 
   // TODO need to remove this
   public float vscale(PImage texture) {
-    ImageCache cash = (ImageCache) texture.cache;
+    ImageCache cash = (ImageCache) texture.getCache(this);
     return (float) texture.height / (float) cash.theight;
   }
 
   // TODO need to remove this
   public void bindTexture(PImage texture) {
-    ImageCache cash = (ImageCache) texture.cache;  // as in johnny
+    ImageCache cash = (ImageCache) texture.getCache(this);  // as in johnny
     if (cash == null) {
       cash = new ImageCache();
-      texture.cache = cash;
+      texture.setCache(this, cash);
       texture.setModified(true);
     }
 
@@ -1039,7 +1039,7 @@ public class PGraphicsOpenGL extends PGraphics3D {
 
     if (textMode == SHAPE) {
       if (textFont.findFont() == null) {
-        showError("Cannot use " + which.name + " as with textMode(SHAPE) " +
+        showWarning("Cannot use " + which.name + " as with textMode(SHAPE) " +
                   "because its native equivalent cannot be found.");
       }
     }
@@ -1121,7 +1121,7 @@ public class PGraphicsOpenGL extends PGraphics3D {
   protected void textCharImpl(char ch, float x, float y) {
     if (textMode == SHAPE) {
       if (textFont.getFont() == null) {
-        PGraphics.showError("textMode(SHAPE) is disabled because the font " +
+        PGraphics.showWarning("textMode(SHAPE) is disabled because the font " +
                             "\"" + textFont.name + "\" is not available.");
       } else {
         textCharImplShape(ch, x, y);
@@ -1852,13 +1852,6 @@ public class PGraphicsOpenGL extends PGraphics3D {
   }
 
 
-//  public void specular(float x, float y, float z, float a) {
-//    super.specular(x, y, z, a);
-//    calcColorBuffer();
-//    gl.glMaterialfv(GL.GL_FRONT_AND_BACK, GL.GL_SPECULAR, colorBuffer);
-//  }
-
-
   //////////////////////////////////////////////////////////////
 
 
@@ -1895,17 +1888,16 @@ public class PGraphicsOpenGL extends PGraphics3D {
   //////////////////////////////////////////////////////////////
 
 
-  public void background(PImage bgimage) {
-    backgroundImpl();
-    set(0, 0, bgimage);
+  public void backgroundImpl(PImage image) {
+    gl.glClearColor(backgroundR, backgroundG, backgroundB, 1);
+    gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+    set(0, 0, image);
   }
 
 
   public void backgroundImpl() {
     gl.glClearColor(backgroundR, backgroundG, backgroundB, 1);
     gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
-
-    clearRaw();
   }
 
 
diff --git a/video/src/processing/video/Capture.java b/video/src/processing/video/Capture.java
index d25b700e3..c9cd671af 100755
--- a/video/src/processing/video/Capture.java
+++ b/video/src/processing/video/Capture.java
@@ -280,10 +280,12 @@ public class Capture extends PImage implements Runnable {
    * more often than not.
    */
   public void crop(int x, int y, int w, int h) {
+    /*
     if (imageMode == CORNERS) {
       w -= x;  // w was actually x2
       h -= y;  // h was actually y2
     }
+    */
 
     crop = true;
     cropX = Math.max(0, x);