renamed some functions

codeanticode · codeanticode · commit 1e8de92bddf7 · 2013-04-24T15:36:50.000-04:00
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -957,7 +957,7 @@ protected Texture wrapBackTexture() {
                backTexAttach.minFilter, backTexAttach.magFilter,
                backTexAttach.wrapS, backTexAttach.wrapT);
       tex.invertedY(true);
-      tex.setAsColorBuffer();
+      tex.colorBuffer(true);
       pg.setCache(pg, tex);
       return tex;
     } else {
@@ -967,7 +967,7 @@ protected Texture wrapBackTexture() {
                fboWidth, fboHeight, NEAREST, NEAREST,
                CLAMP_TO_EDGE, CLAMP_TO_EDGE);
       tex.invertedY(true);
-      tex.setAsColorBuffer();
+      tex.colorBuffer(true);
       pg.setCache(pg, tex);
       return tex;
     }
@@ -983,7 +983,7 @@ protected Texture wrapFrontTexture() {
                frontTexAttach.minFilter, frontTexAttach.magFilter,
                frontTexAttach.wrapS, frontTexAttach.wrapT);
       tex.invertedY(true);
-      tex.setAsColorBuffer();
+      tex.colorBuffer(true);
       return tex;
     } else {
       Texture tex = new Texture();
@@ -992,7 +992,7 @@ protected Texture wrapFrontTexture() {
                fboWidth, fboHeight, NEAREST, NEAREST,
                CLAMP_TO_EDGE, CLAMP_TO_EDGE);
       tex.invertedY(true);
-      tex.setAsColorBuffer();
+      tex.colorBuffer(true);
       return tex;
     }
   }
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -5302,13 +5302,13 @@ protected void loadTextureImpl(int sampling, boolean mipmap) {
                                                          sampling, mipmap);
       texture = new Texture(width, height, params);
       texture.invertedY(true);
-      texture.setAsColorBuffer();
+      texture.colorBuffer(true);
       pgPrimary.setCache(this, texture);
 
       if (!primarySurface) {
         ptexture = new Texture(width, height, params);
         ptexture.invertedY(true);
-        ptexture.setAsColorBuffer();
+        ptexture.colorBuffer(true);
       }
     }
   }
@@ -5744,7 +5744,7 @@ protected Texture addTexture(PImage img, Texture.Parameters params) {
 
 
   protected void checkTexture(Texture tex) {
-    if (!tex.isColorBuffer() &&
+    if (!tex.colorBuffer() &&
         tex.usingMipmaps == hints[DISABLE_TEXTURE_MIPMAPS]) {
       if (hints[DISABLE_TEXTURE_MIPMAPS]) {
         tex.usingMipmaps(false, textureSampling);
diff --git a/core/src/processing/opengl/Texture.java b/core/src/processing/opengl/Texture.java
@@ -80,7 +80,7 @@ public class Texture implements PConstants {
 
   protected PGL pgl;                // The interface between Processing and OpenGL.
   protected int context;            // The context that created this texture.
-  protected boolean isColorBuffer;  // true if it is the color attachment of
+  protected boolean colorBuffer;  // true if it is the color attachment of
                                     // FrameBuffer object.
 
   protected boolean usingMipmaps;
@@ -114,7 +114,7 @@ public Texture() {
     pgl = PGraphicsOpenGL.pgl;
     context = pgl.createEmptyContext();
 
-    isColorBuffer = false;
+    colorBuffer = false;
 
     glName = 0;
   }
@@ -142,7 +142,7 @@ public Texture(int width, int height, Object params) {
     pgl = PGraphicsOpenGL.pgl;
     context = pgl.createEmptyContext();
 
-    isColorBuffer = false;
+    colorBuffer = false;
 
     glName = 0;
 
@@ -1242,13 +1242,13 @@ protected boolean contextIsOutdated() {
   }
 
 
-  protected void setAsColorBuffer() {
-    isColorBuffer = true;
+  public void colorBuffer(boolean value) {
+    colorBuffer = value;
   }
 
 
-  protected boolean isColorBuffer() {
-    return isColorBuffer;
+  public boolean colorBuffer() {
+    return colorBuffer;
   }
 
 
diff --git a/java/libraries/lwjgl/src/processing/lwjgl/PGL.java b/java/libraries/lwjgl/src/processing/lwjgl/PGL.java
@@ -792,7 +792,7 @@ protected Texture wrapBackTexture() {
              fboWidth, fboHeight, NEAREST, NEAREST,
              CLAMP_TO_EDGE, CLAMP_TO_EDGE);
     tex.invertedY(true);
-    tex.colorBufferOf(pg);
+    tex.colorBuffer(true);
     pg.setCache(pg, tex);
     return tex;
   }
@@ -805,7 +805,7 @@ protected Texture wrapFrontTexture() {
              fboWidth, fboHeight, NEAREST, NEAREST,
              CLAMP_TO_EDGE, CLAMP_TO_EDGE);
     tex.invertedY(true);
-    tex.colorBufferOf(pg);
+    tex.colorBuffer(true);
     return tex;
   }
 
