clean up rendering code

Author: codeanticode

core/src/processing/a2d/PSurfaceAndroid2D.java

@@ -110,13 +110,7 @@ public void surfaceChanged(SurfaceHolder holder, int format, int iwidth, int ihe
         System.out.println("SketchSurfaceView.surfaceChanged() " + iwidth + " " + iheight);
       }
 
-      if (sketch.fullScreen) {
-        sketch.displayWidth = iwidth;
-        sketch.displayHeight = iheight;
-      }
-      sketch.width = iwidth;
-      sketch.height = iheight;
-
+      sketch.setSize(iwidth, iheight);
       graphics.setSize(sketch.sketchWidth(), sketch.sketchHeight());
       sketch.surfaceChanged();
     }

core/src/processing/core/PApplet.java

@@ -143,6 +143,11 @@ public class PApplet extends Object implements PConstants {
    */
   public float displayDensity = 1;
 
+  // For future use
+  public int pixelDensity = 1;
+  public int pixelWidth;
+  public int pixelHeight;
+
   /** absolute x position of input on screen */
   public int mouseX;
 
@@ -391,7 +396,9 @@ public class PApplet extends Object implements PConstants {
 
   int smooth = 1;  // default smoothing (whatever that means for the renderer)
 
-  public boolean fullScreen = false;
+  boolean fullScreen = false;
+
+  int display = -1;  // use default
 
   // Background default needs to be different from the default value in
   // PGraphics.backgroundColor, otherwise size(100, 100) bg spills over.
@@ -463,6 +470,9 @@ public void initSurface(LayoutInflater inflater, ViewGroup container,
       }
     }
 
+    pixelWidth = width * pixelDensity;
+    pixelHeight = height * pixelDensity;
+
     String rendererName = sketchRenderer();
     if (DEBUG) println("Renderer " + rendererName);
     g = makeGraphics(width, height, rendererName, true);
@@ -684,6 +694,57 @@ public void settings() {
   }
 
 
+  final public int sketchWidth() {
+    return width;
+  }
+
+
+  final public  int sketchHeight() {
+    return height;
+  }
+
+
+  final public String sketchRenderer() {
+    return renderer;
+  }
+
+
+  public int sketchSmooth() {
+    return smooth;
+  }
+
+
+  final public boolean sketchFullScreen() {
+    //return false;
+    return fullScreen;
+  }
+
+
+  final public int sketchDisplay() {
+    return display;
+  }
+
+
+  final public String sketchOutputPath() {
+    return null;
+  }
+
+
+  final public OutputStream sketchOutputStream() {
+    return null;
+  }
+
+
+  final public int sketchWindowColor() {
+    return windowColor;
+  }
+
+
+  final public int sketchPixelDensity() {
+    return pixelDensity;
+  }
+
+
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
@@ -742,59 +803,6 @@ public void surfaceKeyUp(int code, android.view.KeyEvent event) {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  public int sketchQuality() {
-    return 1;
-  }
-
-  public int sketchKind() {
-    return AppComponent.FRAGMENT;
-  }
-
-  final public int sketchWidth() {
-    if (fullScreen) {
-      return displayWidth;
-    }
-    return width;
-  }
-
-
-  final public  int sketchHeight() {
-    if (fullScreen) {
-      return displayHeight;
-    }
-    return height;
-  }
-
-
-  final public String sketchRenderer() {
-    return renderer;
-  }
-
-
-  final public int sketchWindowColor() {
-    return windowColor;
-  }
-
-
-  public void orientation(int which) {
-    surface.setOrientation(which);
-  }
-
-
-  public boolean checkPermission(String permission) {
-    Context context = surface.getContext();
-    if (context != null) {
-      int check = ContextCompat.checkSelfPermission(context, permission);
-      return check == PackageManager.PERMISSION_GRANTED;
-    } else {
-      return false;
-    }
-  }
-
-
-  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-
-
   /**
    * Called by the browser or applet viewer to inform this applet that it
    * should start its execution. It is called after the init method and
@@ -1279,6 +1287,18 @@ public void size(int iwidth, int iheight, String irenderer) {
   }
 
 
+  public void setSize(int width, int height) {
+    if (fullScreen) {
+      this.displayWidth = width;
+      this.displayHeight = height;
+    }
+    this.width = width;
+    this.height = height;
+    pixelWidth = width * pixelDensity;
+    pixelHeight = height * pixelDensity;
+  }
+
+
 //. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
@@ -1314,6 +1334,14 @@ private void smoothWarning(String method) {
  }
 
 
+ // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+
+
+ public void orientation(int which) {
+   surface.setOrientation(which);
+ }
+
+
  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 

core/src/processing/opengl/PSurfaceGLES.java

@@ -115,16 +115,15 @@ public SketchSurfaceViewGL(Context context, SurfaceHolder holder) {
 
       SurfaceHolder h = getHolder();
       h.addCallback(this);
-      h.setType(SurfaceHolder.SURFACE_TYPE_GPU);
 
       // Tells the default EGLContextFactory and EGLConfigChooser to create an GLES2 context.
       setEGLContextClientVersion(2);
       setPreserveEGLContextOnPause(true);
 
-      int quality = sketch.sketchQuality();
-      if (1 < quality) {
-        setEGLConfigChooser(getConfigChooser(quality));
-      }
+      int samples = sketch.sketchSmooth();
+      System.out.println("Using smooth level " + samples);
+      setEGLConfigChooser(getConfigChooser(samples));
+
       // The renderer can be set only once.
       setRenderer(getRenderer());
       setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
@@ -238,9 +237,15 @@ public AndroidContextFactory getContextFactory() {
     return new AndroidContextFactory();
   }
 
+  public AndroidConfigChooser getConfigChooser() {
+    return new AndroidConfigChooser(8, 8, 8, 8, 16, 8, 1);
+//    return new AndroidConfigChooser(5, 6, 5, 4, 16, 1, samples);
+  }
+
 
   public AndroidConfigChooser getConfigChooser(int samples) {
-    return new AndroidConfigChooser(5, 6, 5, 4, 16, 1, samples);
+    return new AndroidConfigChooser(8, 8, 8, 8, 16, 8, samples);
+//    return new AndroidConfigChooser(5, 6, 5, 4, 16, 1, samples);
   }
 
 
@@ -272,13 +277,7 @@ public void onSurfaceChanged(GL10 igl, int iwidth, int iheight) {
       // Here is where we should initialize native libs...
       // lib.init(iwidth, iheight);
 
-      if (sketch.fullScreen) {
-        sketch.displayWidth = iwidth;
-        sketch.displayHeight = iheight;
-      }
-      sketch.width = iwidth;
-      sketch.height = iheight;
-
+      sketch.setSize(iwidth, iheight);
       graphics.setSize(sketch.sketchWidth(), sketch.sketchHeight());
       sketch.surfaceChanged();
     }

libraries/vr/src/processing/vr/PSurfaceVR.java

@@ -68,17 +68,21 @@ public PSurfaceVR(PGraphics graphics, AppComponent component, SurfaceHolder hold
     pvr = (PGraphicsVR)graphics;
 
     glview = new GLVRSurfaceView(vrActivity);
+
+    // Enables/disables the transition view used to prompt the user to place
+    // their phone into a GVR viewer.
+    glview.setTransitionViewEnabled(true);
+
+    // Enables Cardboard-trigger feedback with Daydream headsets. This is a simple way of supporting
+    // Daydream controller input for basic interactions using the existing Cardboard trigger API.
+    glview.enableCardboardTriggerEmulation();
+
     glview.setStereoModeEnabled(vr);
     if (vr) {
       glview.setDistortionCorrectionEnabled(true);
       glview.setNeckModelEnabled(true);
-//      glview.setElectronicDisplayStabilizationEnabled(true);
     }
 
-    // Enable Cardboard-trigger feedback with Daydream headsets. This is a simple way of supporting
-    // Daydream controller input for basic interactions using the existing Cardboard trigger API.
-    glview.enableCardboardTriggerEmulation();
-
     if (glview.setAsyncReprojectionEnabled(true)) {
       // Async reprojection decouples the app framerate from the display framerate,
       // allowing immersive interaction even at the throttled clockrates set by
@@ -217,32 +221,17 @@ public GLVRSurfaceView(Context context) {
       setFocusableInTouchMode(true);
       requestFocus();
 
-      int quality = sketch.sketchQuality();
-      if (1 < quality) {
-        setEGLConfigChooser(8, 8, 8, 8, 16, 1);
+      setEGLConfigChooser(8, 8, 8, 8, 16, 8);
+      int samples = sketch.sketchSmooth();
+      if (1 < samples) {
+        System.out.println("setting multisampling to " + samples);
+        setMultisampling(samples);
       }
+
       // The renderer can be set only once.
       setRenderer(getVRStereoRenderer());
     }
 
-    /*
-    @Override
-    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
-      super.surfaceChanged(holder, format, w, h);
-
-      if (PApplet.DEBUG) {
-        System.out.println("SketchSurfaceView3D.surfaceChanged() " + w + " " + h);
-      }
-      sketch.surfaceChanged();
-//      width = w;
-//      height = h;
-//      g.setSize(w, h);
-
-      // No need to call g.setSize(width, height) b/c super.surfaceChanged()
-      // will trigger onSurfaceChanged in the renderer, which calls setSize().
-      // -- apparently not true? (100110)
-    }
-*/
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
@@ -280,9 +269,9 @@ public AndroidVRStereoRenderer() {
 
     }
 
-
     @Override
     public void onNewFrame(HeadTransform transform) {
+      hadnleGVREnumError();
       pgl.getGL(null);
       pvr.headTransform(transform);
     }
@@ -302,11 +291,28 @@ public void onRendererShutdown() {
     }
 
     @Override
-    public void onSurfaceChanged(int arg0, int arg1) {
+    public void onSurfaceChanged(int iwidth, int iheight) {
+      sketch.setSize(iwidth, iheight);
+      graphics.setSize(sketch.sketchWidth(), sketch.sketchHeight());
+      sketch.surfaceChanged();
     }
 
     @Override
     public void onSurfaceCreated(EGLConfig arg0) {
     }
+
+    // Don't print the invalid enum error:
+    // https://github.com/processing/processing-android/issues/281
+    // seems harmless as it happens in the first frame only
+    // TODO: need to find the reason for the error (gl config?)
+    private void hadnleGVREnumError() {
+      int err = pgl.getError();
+      if (err != 0 && err != 1280) {
+        String where = "top onNewFrame";
+        String errString = pgl.errorString(err);
+        String msg = "OpenGL error " + err + " at " + where + ": " + errString;
+        PGraphics.showWarning(msg);
+      }
+    }
   }
 }

templates/VRManifest.xml.tmpl

@@ -8,13 +8,16 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true" />
     <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true" />
+    <uses-feature android:name="android.software.vr.mode" android:required="false"/>
+    <uses-feature android:name="android.hardware.vr.high_performance" android:required="false"/>
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />      
     <application android:label=""
                  android:icon="@drawable/icon"
                  android:theme="@style/VrActivityTheme">        
         <activity android:name=".MainActivity" 
                   android:screenOrientation="landscape" 
-                  android:configChanges="orientation|keyboardHidden|screenSize" > 
+                  android:configChanges="orientation|keyboardHidden|screenSize"
+                  android:resizeableActivity="false"> 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" /> 
                 <category android:name="android.intent.category.LAUNCHER" />