renaming classes in VR library

Author: codeanticode

core/src/processing/core/PConstants.java

@@ -49,8 +49,8 @@ public interface PConstants {
   static final String P2DX = "processing.opengl.PGraphics2DX";
   static final String P3D = "processing.opengl.PGraphics3D";
   static final String OPENGL = P3D;
-  static final String STEREO = "processing.vr.PGraphicsVRStereo";
-  static final String MONO = "processing.vr.PGraphicsVRMono";
+  static final String STEREO = "processing.vr.VRGraphicsStereo";
+  static final String MONO = "processing.vr.VRPGraphicsMono";
   static final String VR = STEREO;
   static final String AR = "processing.ar.ARGraphics";
   static final String ARCORE = AR;

mode/libraries/ar/library.properties

@@ -1,10 +1,10 @@
 name = AR
-authorList = Syam Sundar K
+authorList = The Processing Foundation, Syam Sundar K
 url = http://android.processing.org
 category = 3D
 sentence = Renderer to develop AR apps
 paragraph = 
-version = 8
-prettyVersion = 0.9.5
+version = 9
+prettyVersion = 0.9.9
 minRevision = 248
 maxRevision = 0

mode/libraries/vr/library.properties

@@ -4,7 +4,7 @@ url = http://android.processing.org
 category = 3D
 sentence = Renderer to develop VR apps
 paragraph = 
-version = 9
-prettyVersion = 1.0.0
+version = 10
+prettyVersion = 1.9.0
 minRevision = 248
 maxRevision = 0

mode/libraries/vr/src/processing/vr/PVR.java renamed to mode/libraries/vr/src/processing/vr/VRActivity.java

@@ -23,36 +23,31 @@
 package processing.vr;
 
 import com.google.vr.sdk.base.GvrActivity;
-import com.google.vr.sdk.base.Eye;
 
 import android.content.Intent;
 import android.util.DisplayMetrics;
 import processing.android.AppComponent;
 import processing.android.ServiceEngine;
 import processing.core.PApplet;
 
-public class PVR extends GvrActivity implements AppComponent {
-  public static final int LEFT      = Eye.Type.LEFT;
-  public static final int RIGHT     = Eye.Type.RIGHT;
-  public static final int MONOCULAR = Eye.Type.MONOCULAR;
-
+public class VRActivity extends GvrActivity implements AppComponent {
   static public final int GVR = 3;
 
   private DisplayMetrics metrics;
   private PApplet sketch;
 
 
-  public PVR() {
+  public VRActivity() {
 
   }
 
 
-  static public PGraphicsVR getRenderer(PApplet p) {
-    return (PGraphicsVR) p.g;
+  static public VRGraphics getRenderer(PApplet p) {
+    return (VRGraphics) p.g;
   }
 
 
-  public PVR(PApplet sketch) {
+  public VRActivity(PApplet sketch) {
     this.sketch = sketch;
   }
 
@@ -89,7 +84,7 @@ public void dispose() {
   public void setSketch(PApplet sketch) {
     this.sketch = sketch;
     if (sketch != null) {
-      sketch.initSurface(PVR.this, null);
+      sketch.initSurface(VRActivity.this, null);
       // Required to read the paired viewer's distortion parameters.
       sketch.requestPermission("android.permission.READ_EXTERNAL_STORAGE");
     }

mode/libraries/vr/src/processing/vr/PGraphicsVR.java renamed to mode/libraries/vr/src/processing/vr/VRGraphics.java

@@ -35,7 +35,11 @@
 import processing.opengl.PGraphics3D;
 import processing.opengl.PGraphicsOpenGL;
 
-public class PGraphicsVR extends PGraphics3D {
+public class VRGraphics extends PGraphics3D {
+  static public final int LEFT      = Eye.Type.LEFT;
+  static public final int RIGHT     = Eye.Type.RIGHT;
+  static public final int MONOCULAR = Eye.Type.MONOCULAR;
+
   private boolean initialized = false;
 
   public HeadTransform headTransform;

mode/libraries/vr/src/processing/vr/PGraphicsVRMono.java renamed to mode/libraries/vr/src/processing/vr/VRGraphicsMono.java

@@ -26,10 +26,10 @@
 import processing.android.AppComponent;
 import processing.core.PSurface;
 
-public class PGraphicsVRMono extends PGraphicsVR {
+public class VRGraphicsMono extends VRGraphics {
   @Override
   public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
     if (reset) pgl.resetFBOLayer();
-    return new PSurfaceVR(this, component, holder, false);
+    return new VRSurface(this, component, holder, false);
   }
 }

mode/libraries/vr/src/processing/vr/PGraphicsVRStereo.java renamed to mode/libraries/vr/src/processing/vr/VRGraphicsStereo.java

@@ -26,10 +26,10 @@
 import processing.android.AppComponent;
 import processing.core.PSurface;
 
-public class PGraphicsVRStereo extends PGraphicsVR {
+public class VRGraphicsStereo extends VRGraphics {
   @Override
   public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
     if (reset) pgl.resetFBOLayer();
-    return new PSurfaceVR(this, component, holder, true);
+    return new VRSurface(this, component, holder, true);
   }
 }

mode/libraries/vr/src/processing/vr/PSurfaceVR.java renamed to mode/libraries/vr/src/processing/vr/VRSurface.java

@@ -50,24 +50,24 @@
 import android.view.Window;
 import android.view.WindowManager;
 
-public class PSurfaceVR extends PSurfaceGLES {
+public class VRSurface extends PSurfaceGLES {
   protected SurfaceViewVR vrView;
-  protected PGraphicsVR pvr;
+  protected VRGraphics pvr;
 
   protected GvrActivity vrActivity;
   protected AndroidVRStereoRenderer renderer;
 
   private boolean needCalculate;
 
-  public PSurfaceVR(PGraphics graphics, AppComponent component, SurfaceHolder holder, boolean vr) {
+  public VRSurface(PGraphics graphics, AppComponent component, SurfaceHolder holder, boolean vr) {
     this.sketch = graphics.parent;
     this.graphics = graphics;
     this.component = component;
     this.pgl = (PGLES)((PGraphicsOpenGL)graphics).pgl;
 
     vrActivity = (GvrActivity)component;
     this.activity = vrActivity;
-    pvr = (PGraphicsVR)graphics;
+    pvr = (VRGraphics)graphics;
 
     vrView = new SurfaceViewVR(vrActivity);
 

mode/templates/VRActivity.java.tmpl

@@ -2,10 +2,10 @@ package @@package_name@@;
 
 import android.os.Bundle;
 
-import processing.vr.PVR;
+import processing.vr.VRActivity;
 import processing.core.PApplet;
 
-public class MainActivity extends PVR {
+public class MainActivity extends VRActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);