android sync

Author: codeanticode

core/src/processing/opengl/PGL.java

@@ -334,6 +334,13 @@ public PGL(PGraphicsOpenGL pg) {
   }
 
 
+  /**
+   * Return the native canvas the OpenGL context associated to this PGL object
+   * is rendering to (if any).
+   */
+  public abstract Object getCanvas();
+
+
   protected abstract void setFps(float fps);
 
 
@@ -836,7 +843,7 @@ protected void initTexture(int target, int format, int width, int height,
                           int initColor) {
     int[] glcolor = new int[16 * 16];
     Arrays.fill(glcolor, javaToNativeARGB(initColor));
-    IntBuffer texels = PGL.allocateDirectIntBuffer(16 * 16);
+    IntBuffer texels = allocateDirectIntBuffer(16 * 16);
     texels.put(glcolor);
     texels.rewind();
     for (int y = 0; y < height; y += 16) {
@@ -987,8 +994,8 @@ protected void drawTexture2D(int id, int texW, int texH, int scrW, int scrH,
       uniform1i(tex2DSamplerLoc, 0);
 
       texData.position(0);
-      bindBuffer(PGL.ARRAY_BUFFER, texGeoVBO);
-      bufferData(PGL.ARRAY_BUFFER, 16 * SIZEOF_FLOAT, texData, PGL.STATIC_DRAW);
+      bindBuffer(ARRAY_BUFFER, texGeoVBO);
+      bufferData(ARRAY_BUFFER, 16 * SIZEOF_FLOAT, texData, STATIC_DRAW);
 
       vertexAttribPointer(tex2DVertLoc, 2, FLOAT, false, 4 * SIZEOF_FLOAT, 0);
       vertexAttribPointer(tex2DTCoordLoc, 2, FLOAT, false, 4 * SIZEOF_FLOAT, 2 * SIZEOF_FLOAT);
@@ -1113,8 +1120,8 @@ protected void drawTextureRect(int id, int texW, int texH, int scrW, int scrH,
       uniform1i(texRectSamplerLoc, 0);
 
       texData.position(0);
-      bindBuffer(PGL.ARRAY_BUFFER, texGeoVBO);
-      bufferData(PGL.ARRAY_BUFFER, 16 * SIZEOF_FLOAT, texData, PGL.STATIC_DRAW);
+      bindBuffer(ARRAY_BUFFER, texGeoVBO);
+      bufferData(ARRAY_BUFFER, 16 * SIZEOF_FLOAT, texData, STATIC_DRAW);
 
       vertexAttribPointer(texRectVertLoc, 2, FLOAT, false, 4 * SIZEOF_FLOAT, 0);
       vertexAttribPointer(texRectTCoordLoc, 2, FLOAT, false, 4 * SIZEOF_FLOAT, 2 * SIZEOF_FLOAT);
@@ -1193,7 +1200,7 @@ protected static int nextPowerOfTwo(int val) {
    * endian) to Java ARGB.
    */
   protected static int nativeToJavaARGB(int color) {
-    if (PGL.BIG_ENDIAN) { // RGBA to ARGB
+    if (BIG_ENDIAN) { // RGBA to ARGB
       return (color >>> 8) | ((color << 24) & 0xFF000000);
       // equivalent to
       // ((color >> 8) & 0x00FFFFFF) | ((color << 24) & 0xFF000000)
@@ -1706,7 +1713,7 @@ protected static ByteBuffer allocateByteBuffer(int size) {
 
   protected static ByteBuffer allocateByteBuffer(byte[] arr) {
     if (USE_DIRECT_BUFFERS) {
-      return PGL.allocateDirectByteBuffer(arr.length);
+      return allocateDirectByteBuffer(arr.length);
     } else {
       return ByteBuffer.wrap(arr);
     }
@@ -1717,7 +1724,7 @@ protected static ByteBuffer updateByteBuffer(ByteBuffer buf, byte[] arr,
                                                boolean wrap) {
     if (USE_DIRECT_BUFFERS) {
       if (buf == null || buf.capacity() < arr.length) {
-        buf = PGL.allocateDirectByteBuffer(arr.length);
+        buf = allocateDirectByteBuffer(arr.length);
       }
       buf.position(0);
       buf.put(arr);
@@ -1795,7 +1802,7 @@ protected static ShortBuffer allocateShortBuffer(int size) {
 
   protected static ShortBuffer allocateShortBuffer(short[] arr) {
     if (USE_DIRECT_BUFFERS) {
-      return PGL.allocateDirectShortBuffer(arr.length);
+      return allocateDirectShortBuffer(arr.length);
     } else {
       return ShortBuffer.wrap(arr);
     }
@@ -1806,7 +1813,7 @@ protected static ShortBuffer updateShortBuffer(ShortBuffer buf, short[] arr,
                                                  boolean wrap) {
     if (USE_DIRECT_BUFFERS) {
       if (buf == null || buf.capacity() < arr.length) {
-        buf = PGL.allocateDirectShortBuffer(arr.length);
+        buf = allocateDirectShortBuffer(arr.length);
       }
       buf.position(0);
       buf.put(arr);
@@ -1884,7 +1891,7 @@ protected static IntBuffer allocateIntBuffer(int size) {
 
   protected static IntBuffer allocateIntBuffer(int[] arr) {
     if (USE_DIRECT_BUFFERS) {
-      return PGL.allocateDirectIntBuffer(arr.length);
+      return allocateDirectIntBuffer(arr.length);
     } else {
       return IntBuffer.wrap(arr);
     }
@@ -1895,7 +1902,7 @@ protected static IntBuffer updateIntBuffer(IntBuffer buf, int[] arr,
                                              boolean wrap) {
     if (USE_DIRECT_BUFFERS) {
       if (buf == null || buf.capacity() < arr.length) {
-        buf = PGL.allocateDirectIntBuffer(arr.length);
+        buf = allocateDirectIntBuffer(arr.length);
       }
       buf.position(0);
       buf.put(arr);
@@ -1972,7 +1979,7 @@ protected static FloatBuffer allocateFloatBuffer(int size) {
 
   protected static FloatBuffer allocateFloatBuffer(float[] arr) {
     if (USE_DIRECT_BUFFERS) {
-      return PGL.allocateDirectFloatBuffer(arr.length);
+      return allocateDirectFloatBuffer(arr.length);
     } else {
       return FloatBuffer.wrap(arr);
     }
@@ -1983,7 +1990,7 @@ protected static FloatBuffer updateFloatBuffer(FloatBuffer buf, float[] arr,
                                                  boolean wrap) {
     if (USE_DIRECT_BUFFERS) {
       if (buf == null || buf.capacity() < arr.length) {
-        buf = PGL.allocateDirectFloatBuffer(arr.length);
+        buf = allocateDirectFloatBuffer(arr.length);
       }
       buf.position(0);
       buf.put(arr);

core/src/processing/opengl/PGLES.java

@@ -16,7 +16,6 @@
 import android.opengl.GLSurfaceView.EGLConfigChooser;
 import android.opengl.GLSurfaceView.Renderer;
 import android.opengl.GLU;
-
 import processing.core.PApplet;
 import processing.opengl.tess.PGLU;
 import processing.opengl.tess.PGLUtessellator;
@@ -87,6 +86,12 @@ public PGLES(PGraphicsOpenGL pg) {
   }
 
 
+  @Override
+  public GLSurfaceView getCanvas() {
+    return glview;
+  }
+
+
   @Override
   protected void setFps(float fps) { }
 

core/src/processing/opengl/PGraphics2D.java

@@ -119,6 +119,10 @@ public void frustum(float left, float right, float bottom, float top,
 
   @Override
   protected void defaultPerspective() {
+    // The camera part of the modelview is simply the identity matrix, so in
+    // order to the ortho projection to be consistent with this, it needs to be
+    // set as follows, because ortho() will shift the viewing rectangle at
+    // (width/2, height/2) and will also apply the axis inversion along Y:
     super.ortho(width/2f, (3f/2f) * width, -height/2f, height/2f, -1, +1);
   }
 
@@ -180,12 +184,6 @@ protected void end2D() {
     popProjection();
   }
 
-//  @Override
-//  public void resetMatrix() {
-//    super.resetMatrix();
-//    defaultCamera();
-//  }
-
 
   //////////////////////////////////////////////////////////////
 

core/src/processing/opengl/PGraphics3D.java

@@ -87,7 +87,20 @@ protected void begin2D() {
     pushProjection();
     ortho(0, width, 0, height, -1, +1);
     pushMatrix();
-    camera(width/2, height/2);
+
+    // Set camera for 2D rendering, it simply centers at (width/2, height/2)
+    float centerX = width/2;
+    float centerY = height/2;
+    modelview.reset();
+    modelview.translate(-centerX, -centerY);
+
+    modelviewInv.set(modelview);
+    modelviewInv.invert();
+
+    camera.set(modelview);
+    cameraInv.set(modelviewInv);
+
+    updateProjmodelview();
   }