Merge branch 'master' of https://github.com/benfry/processing

benfry · benfry · commit f0367e497f32 · 2014-11-16T18:02:29.000-07:00
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -237,8 +237,6 @@ public class PGraphicsOpenGL extends PGraphics {
   // Useful to have around.
   static protected PMatrix3D identity = new PMatrix3D();
 
-  protected boolean matricesAllocated = false;
-
   /**
    * Marks when changes to the size have occurred, so that the camera
    * will be reset in beginDraw().
@@ -312,8 +310,6 @@ public class PGraphicsOpenGL extends PGraphics {
   public float currentLightFalloffLinear;
   public float currentLightFalloffQuadratic;
 
-  protected boolean lightsAllocated = false;
-
   // ........................................................
 
   // Texturing:
@@ -538,6 +534,23 @@ public PGraphicsOpenGL() {
     tessGeo = newTessGeometry(this, IMMEDIATE);
     texCache = newTexCache(this);
 
+    projection = new PMatrix3D();
+    camera = new PMatrix3D();
+    cameraInv = new PMatrix3D();
+    modelview = new PMatrix3D();
+    modelviewInv = new PMatrix3D();
+    projmodelview = new PMatrix3D();
+
+    lightType = new int[PGL.MAX_LIGHTS];
+    lightPosition = new float[4 * PGL.MAX_LIGHTS];
+    lightNormal = new float[3 * PGL.MAX_LIGHTS];
+    lightAmbient = new float[3 * PGL.MAX_LIGHTS];
+    lightDiffuse = new float[3 * PGL.MAX_LIGHTS];
+    lightSpecular = new float[3 * PGL.MAX_LIGHTS];
+    lightFalloffCoefficients = new float[3 * PGL.MAX_LIGHTS];
+    lightSpotParameters = new float[2 * PGL.MAX_LIGHTS];
+    currentLightSpecular = new float[3];
+
     initialized = false;
   }
 
@@ -571,8 +584,6 @@ public void setSize(int iwidth, int iheight) {
     width = iwidth;
     height = iheight;
 
-    allocate();
-
     // init perspective projection based on new dimensions
     cameraFOV = 60 * DEG_TO_RAD; // at least for now
     cameraX = width / 2.0f;
@@ -586,41 +597,6 @@ public void setSize(int iwidth, int iheight) {
   }
 
 
-  /**
-   * Called by resize(), this handles creating the actual GLCanvas the
-   * first time around, or simply resizing it on subsequent calls.
-   * There is no pixel array to allocate for an OpenGL canvas
-   * because OpenGL's pixel buffer is all handled internally.
-   */
-  @Override
-  protected void allocate() {
-    super.allocate();
-
-    if (!matricesAllocated) {
-      projection = new PMatrix3D();
-      camera = new PMatrix3D();
-      cameraInv = new PMatrix3D();
-      modelview = new PMatrix3D();
-      modelviewInv = new PMatrix3D();
-      projmodelview = new PMatrix3D();
-      matricesAllocated = true;
-    }
-
-    if (!lightsAllocated) {
-      lightType = new int[PGL.MAX_LIGHTS];
-      lightPosition = new float[4 * PGL.MAX_LIGHTS];
-      lightNormal = new float[3 * PGL.MAX_LIGHTS];
-      lightAmbient = new float[3 * PGL.MAX_LIGHTS];
-      lightDiffuse = new float[3 * PGL.MAX_LIGHTS];
-      lightSpecular = new float[3 * PGL.MAX_LIGHTS];
-      lightFalloffCoefficients = new float[3 * PGL.MAX_LIGHTS];
-      lightSpotParameters = new float[2 * PGL.MAX_LIGHTS];
-      currentLightSpecular = new float[3];
-      lightsAllocated = true;
-    }
-  }
-
-
   @Override
   public void dispose() { // PGraphics
     super.dispose();
