android opengl renderer sync

Author: codeanticode

core/src/processing/core/PGraphics.java

@@ -526,7 +526,7 @@ public class PGraphics extends PImage implements PConstants {
   // ........................................................
 
   protected boolean curveInited = false;
-  protected int curveDetail = 20;
+  public int curveDetail = 20;
   public float curveTightness = 0;
   // catmull-rom basis matrix, perhaps with optional s parameter
   protected PMatrix3D curveBasisMatrix;

core/src/processing/opengl/ColorVert.glsl

@@ -20,15 +20,15 @@
 
 #define PROCESSING_COLOR_SHADER
 
-uniform mat4 transform;
+uniform mat4 transformMatrix;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 
 varying vec4 vertColor;
 
 void main() {
-  gl_Position = transform * vertex;
+  gl_Position = transformMatrix * position;
 
   vertColor = color;
 }

core/src/processing/opengl/LightVert.glsl

@@ -20,8 +20,8 @@
 
 #define PROCESSING_LIGHT_SHADER
 
-uniform mat4 modelview;
-uniform mat4 transform;
+uniform mat4 modelviewMatrix;
+uniform mat4 transformMatrix;
 uniform mat3 normalMatrix;
 
 uniform int lightCount;
@@ -33,7 +33,7 @@ uniform vec3 lightSpecular[8];
 uniform vec3 lightFalloff[8];
 uniform vec2 lightSpot[8];
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 
@@ -75,10 +75,10 @@ float blinnPhongFactor(vec3 lightDir, vec3 vertPos, vec3 vecNormal, float shine)
 
 void main() {
   // Vertex in clip coordinates
-  gl_Position = transform * vertex;
+  gl_Position = transformMatrix * position;
 
   // Vertex in eye coordinates
-  vec3 ecVertex = vec3(modelview * vertex);
+  vec3 ecVertex = vec3(modelviewMatrix * position);
 
   // Normal vector in eye coordinates
   vec3 ecNormal = normalize(normalMatrix * normal);

core/src/processing/opengl/LineVert.glsl

@@ -20,14 +20,14 @@
 
 #define PROCESSING_LINE_SHADER
 
-uniform mat4 modelview;
-uniform mat4 projection;
+uniform mat4 modelviewMatrix;
+uniform mat4 projectionMatrix;
 
 uniform vec4 viewport;
 uniform int perspective;
 uniform vec3 scale;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec4 direction;
 
@@ -45,20 +45,20 @@ vec4 windowToClipVector(vec2 window, vec4 viewport, float clip_w) {
 }  
 
 void main() {
-  vec4 posp = modelview * vertex;
+  vec4 posp = modelviewMatrix * position;
 
   // Moving vertices slightly toward the camera
   // to avoid depth-fighting with the fill triangles.
   // Discussed here:
   // http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=252848  
   posp.xyz = posp.xyz * scale;
-  vec4 clipp = projection * posp;
+  vec4 clipp = projectionMatrix * posp;
   float thickness = direction.w;
 
   if (thickness != 0.0) {  
-    vec4 posq = posp + modelview * vec4(direction.xyz, 0);
+    vec4 posq = posp + modelviewMatrix * vec4(direction.xyz, 0);
     posq.xyz = posq.xyz * scale;  
-    vec4 clipq = projection * posq; 
+    vec4 clipq = projectionMatrix * posq; 
 
     vec3 window_p = clipToWindow(clipp, viewport); 
     vec3 window_q = clipToWindow(clipq, viewport); 

core/src/processing/opengl/PGL.java

@@ -1900,6 +1900,11 @@ protected int getTextWidth(Object font, char buffer[], int start, int stop) {
   }
 
 
+  protected Object getDerivedFont(Object font, float size) {
+    return null;
+  }
+
+
   ///////////////////////////////////////////////////////////
 
   // Tessellator interface

core/src/processing/opengl/PGraphics2D.java

@@ -119,7 +119,7 @@ public void frustum(float left, float right, float bottom, float top,
 
   @Override
   protected void defaultPerspective() {
-    super.ortho(0, width, 0, height, -1, +1);
+    super.ortho(width/2f, (3f/2f) * width, -height/2f, height/2f, -1, +1);
   }
 
 
@@ -156,7 +156,7 @@ public void camera(float eyeX, float eyeY, float eyeZ,
 
   @Override
   protected void defaultCamera() {
-    super.camera(width/2f, height/2f);
+    resetMatrix();
   }
 
 
@@ -180,6 +180,12 @@ protected void end2D() {
     popProjection();
   }
 
+//  @Override
+//  public void resetMatrix() {
+//    super.resetMatrix();
+//    defaultCamera();
+//  }
+
 
   //////////////////////////////////////////////////////////////