renaming to vr

codeanticode · codeanticode · commit a04854c40250 · 2017-04-06T01:16:23.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ allprojects {
         jcenter()
         flatDir dirs: "$rootDir/core/library"
         flatDir dirs: "$rootDir/core/build/libs"
-        flatDir dirs: "$rootDir/libraries/cardboard/lib"
+        flatDir dirs: "$rootDir/libraries/vr/lib"
         flatDir dirs: android_platform
     }
 
@@ -31,7 +31,7 @@ allprojects {
 dependencies {
     compile name: 'android'
     compile project(":core")
-    compile project(":libraries:cardboard")
+    compile project(":libraries:vr")
     compile group: 'org.processing', name: 'core', version: '3.2.3'
     compile group: 'org.processing', name: 'pde', version: '3.2.3'
     compile group: 'org.processing', name: 'java-mode', version: '3.2.3'
@@ -72,18 +72,18 @@ task dist {
         Files.copy(file("mode.properties").toPath(),
                    file("$root/mode.properties").toPath(), REPLACE_EXISTING);
         
-        FileUtils.copyDirectory(file("libraries/cardboard/examples"), 
-                                file("$root/libraries/cardboard/examples"))
-        FileUtils.copyDirectory(file("libraries/cardboard/gvrsdk"), 
-                                file("$root/libraries/cardboard/gvrsdk"))
-        FileUtils.copyDirectory(file("libraries/cardboard/lib"), 
-                                file("$root/libraries/cardboard/lib"))    
-        FileUtils.copyDirectory(file("libraries/cardboard/library"), 
-                                file("$root/libraries/cardboard/library"))
-        FileUtils.copyDirectory(file("libraries/cardboard/src"), 
-                                file("$root/libraries/cardboard/src"))
-        Files.copy(file("libraries/cardboard/library.properties").toPath(),
-                   file("$root/libraries/cardboard/library.properties").toPath(), REPLACE_EXISTING);                             
+        FileUtils.copyDirectory(file("libraries/vr/examples"), 
+                                file("$root/libraries/vr/examples"))
+        FileUtils.copyDirectory(file("libraries/vr/gvrsdk"), 
+                                file("$root/libraries/vr/gvrsdk"))
+        FileUtils.copyDirectory(file("libraries/vr/lib"), 
+                                file("$root/libraries/vr/lib"))    
+        FileUtils.copyDirectory(file("libraries/vr/library"), 
+                                file("$root/libraries/vr/library"))
+        FileUtils.copyDirectory(file("libraries/vr/src"), 
+                                file("$root/libraries/vr/src"))
+        Files.copy(file("libraries/vr/library.properties").toPath(),
+                   file("$root/libraries/vr/library.properties").toPath(), REPLACE_EXISTING);                             
 
         ZipUtil.pack(file("$buildDir/zip"), new File("release/AndroidMode.zip"))        
         Files.copy(file("mode.properties").toPath(),
diff --git a/build.xml b/build.xml
@@ -92,12 +92,12 @@
         <include name="examples/**" />
         <include name="icons/**" />
         <include name="theme/**" />
-        <include name="libraries/cardboard/library.properties" />        
-        <include name="libraries/cardboard/examples/**" />
-        <include name="libraries/cardboard/gvrsdk/**" />
-        <include name="libraries/cardboard/lib/**" />
-        <include name="libraries/cardboard/library/**" />
-        <include name="libraries/cardboard/src/**" />        
+        <include name="libraries/vr/library.properties" />        
+        <include name="libraries/vr/examples/**" />
+        <include name="libraries/vr/gvrsdk/**" />
+        <include name="libraries/vr/lib/**" />
+        <include name="libraries/vr/library/**" />
+        <include name="libraries/vr/src/**" />        
         <exclude name="**/._*" />
       </zipfileset>
     </zip>
@@ -112,12 +112,12 @@
   
   <target name="subprojects-clean">
     <subant buildpath="core" target="clean"/>
-    <subant buildpath="libraries/cardboard" target="clean"/>    
+    <subant buildpath="libraries/vr" target="clean"/>    
   </target>
     
   <target name="subprojects-build">
     <subant buildpath="core" target="build"/>
-    <subant buildpath="libraries/cardboard" target="build"/>    
+    <subant buildpath="libraries/vr" target="build"/>    
   </target>
   
 
diff --git a/libraries/cardboard/.project b/libraries/cardboard/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>processing-cardboard</name>
+	<name>processing-vr</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/libraries/cardboard/README.md b/libraries/cardboard/README.md
@@ -1,13 +1,4 @@
-# Cardboard library for Processing-Android
-
-This library includes a stereo renderer to create Cardboard apps.
-
-## Installation
-
-It is still not available through the Contributions Manager, so you need to install it manually"
-
-1. Download the [carboard.zip](https://github.com/codeanticode/processing-cardboard/releases/download/latest/cardboard.zip) file from the latest relesase.
-2. Unpack the zip file, and move the cardboard folder to the libraries' folder inside your sketchbook path.
-3. Follow [this tutorial](http://android.processing.org/tutorials/cardboard_intro/index.html) for a detailed guide on how to write cardboard apps with Processing.
+# VR library for Processing-Android
 
+This library includes a stereo renderer to create VR apps.
 
diff --git a/libraries/cardboard/build.gradle b/libraries/cardboard/build.gradle
@@ -37,7 +37,7 @@ jar {
 }
 
 clean.doFirst {
-    delete "library/cardboard.jar"
+    delete "library/vr.jar"
 }
 
 import groovy.util.AntBuilder
@@ -46,12 +46,12 @@ import static java.nio.file.StandardCopyOption.*;
 
 task dist {
     doLast {
-        File cardBoardJar = file("library/cardboard.jar");
+        File vrJar = file("library/vr.jar");
         //create intermediate folder if they don't exist
-        cardBoardJar.mkdirs();
+        vrJar.mkdirs();
         // make copy of jar file to library folder
-        Files.copy(file("$buildDir/libs/cardboard.jar").toPath(),
-                   cardBoardJar.toPath(), REPLACE_EXISTING);             
+        Files.copy(file("$buildDir/libs/vr.jar").toPath(),
+                   vrJar.toPath(), REPLACE_EXISTING);             
     }
 }
 
diff --git a/libraries/cardboard/build.xml b/libraries/cardboard/build.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
-<project name="Processing Cardboard Library" default="build">
+<project name="Processing VR Library" default="build">
 
   <property name="processing.dir" value="../../../processing" />
   <property environment="env"/>
 
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
-    <delete file="library/cardboard.jar" />
+    <delete file="library/vr.jar" />
   </target>
 
-  <target name="build" depends="sdk_chatter,compile" description="Build cardboard library for Processing Android" >
+  <target name="build" depends="sdk_chatter,compile" description="Build VR library for Processing Android" >
     <mkdir dir="library" />
-    <jar basedir="bin" destfile="library/cardboard.jar" />
+    <jar basedir="bin" destfile="library/vr.jar" />
   </target>
 
   <target name="sdk_chatter" unless="env.ANDROID_SDK">
diff --git a/libraries/cardboard/examples/Cube/Cube.pde b/libraries/cardboard/examples/Cube/Cube.pde
@@ -1,16 +1,16 @@
-import processing.cardboard.*;
+import processing.vr.*;
 
 void setup() {
-  fullScreen(PCardboard.STEREO);
+  fullScreen(PVR.STEREO);
 }
 
 void draw() {
-//  PGraphicsCardboard pgc = (PGraphicsCardboard)g;
-//  if (pgc.eyeType == PCardboard.LEFT) {
+//  PGraphicsVR pgc = (PGraphicsVR)g;
+//  if (pgc.eyeType == PVR.LEFT) {
 //    background(200, 50, 50);
-//  } else if (pgc.eyeType == PCardboard.RIGHT) {
+//  } else if (pgc.eyeType == PVR.RIGHT) {
 //    background(50, 50, 200);
-//  } else if (pgc.eyeType == PCardboard.MONOCULAR) {
+//  } else if (pgc.eyeType == PVR.MONOCULAR) {
 //    background(50, 200, 50);
 //  }
       
diff --git a/libraries/cardboard/examples/Cube/code/sketch.properties b/libraries/cardboard/examples/Cube/code/sketch.properties
@@ -1 +1 @@
-component=cardboard
+component=vr
diff --git a/libraries/cardboard/examples/Mono/Mono.pde b/libraries/cardboard/examples/Mono/Mono.pde
@@ -1,7 +1,7 @@
-import processing.cardboard.*;
+import processing.vr.*;
 
 void setup() {
-  fullScreen(PCardboard.MONO);
+  fullScreen(PVR.MONO);
 }
 
 void draw() {
diff --git a/libraries/cardboard/examples/Mono/code/sketch.properties b/libraries/cardboard/examples/Mono/code/sketch.properties
@@ -1 +1 @@
-component=cardboard
+component=vr
diff --git a/libraries/cardboard/library.properties b/libraries/cardboard/library.properties
@@ -1,10 +1,10 @@
-name = Cardboard
+name = VR
 authorList = Processing Foundation
 url = http://android.processing.org
 category = 3D
-sentence = Renderer to develop Cardboard apps
+sentence = Renderer to develop VR apps
 paragraph = 
-version = 6
-prettyVersion = 0.8
+version = 7
+prettyVersion = 0.9
 minRevision = 248
 maxRevision = 0
diff --git a/libraries/cardboard/src/processing/vr/PGraphicsVR.java b/libraries/cardboard/src/processing/vr/PGraphicsVR.java
@@ -20,7 +20,7 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.cardboard;
+package processing.vr;
 
 import com.google.vr.sdk.base.Eye;
 import com.google.vr.sdk.base.HeadTransform;
@@ -32,7 +32,7 @@
 import processing.opengl.PGraphics3D;
 import processing.opengl.PGraphicsOpenGL;
 
-public class PGraphicsCardboard extends PGraphics3D {
+public class PGraphicsVR extends PGraphics3D {
   private boolean initialized = false;
 
   public int eyeType;
@@ -69,7 +69,7 @@ public void preApplyMatrix(PMatrix3D source) {
 
 
   protected void headTransform(HeadTransform headTransform) {
-    initCardboard();
+    initVR();
 
     // Get the head view and rotation so the user can use them for object selecton and
     // other operations.
@@ -82,7 +82,7 @@ protected void eyeTransform(Eye eye) {
     eyeType = eye.getType();
     viewPort = eye.getViewport();
 
-    // Matrices in Processing are row-major, and Cardboard API is column-major
+    // Matrices in Processing are row-major, and GVR API is column-major
     float[] p = eye.getPerspective(cameraNear, cameraFar);
     perspectiveMatrix.set(p[0], p[4],  p[8], p[12],
                           p[1], p[5],  p[9], p[13],
@@ -97,7 +97,7 @@ protected void eyeTransform(Eye eye) {
   }
 
 
-  private void initCardboard() {
+  private void initVR() {
     if (!initialized) {
       headRotation = new float[4];
       headView = new float[16];
diff --git a/libraries/cardboard/src/processing/vr/PGraphicsVRMono.java b/libraries/cardboard/src/processing/vr/PGraphicsVRMono.java
@@ -20,16 +20,16 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.cardboard;
+package processing.vr;
 
 import android.view.SurfaceHolder;
 import processing.android.AppComponent;
 import processing.core.PSurface;
 
-public class PGraphicsCardboardMono extends PGraphicsCardboard {
+public class PGraphicsVRMono extends PGraphicsVR {
   @Override
   public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
     if (reset) pgl.resetFBOLayer();
-    return new PSurfaceCardboard(this, component, holder, false);
+    return new PSurfaceVR(this, component, holder, false);
   }
 }
diff --git a/libraries/cardboard/src/processing/vr/PGraphicsVRStereo.java b/libraries/cardboard/src/processing/vr/PGraphicsVRStereo.java
@@ -20,16 +20,16 @@
   Boston, MA  02111-1307  USA
 */
 
-package processing.cardboard;
+package processing.vr;
 
 import android.view.SurfaceHolder;
 import processing.android.AppComponent;
 import processing.core.PSurface;
 
-public class PGraphicsCardboardStereo extends PGraphicsCardboard {
+public class PGraphicsVRStereo extends PGraphicsVR {
   @Override
   public PSurface createSurface(AppComponent component, SurfaceHolder holder, boolean reset) {  // ignore
     if (reset) pgl.resetFBOLayer();
-    return new PSurfaceCardboard(this, component, holder, true);
+    return new PSurfaceVR(this, component, holder, true);
   }
 }
diff --git a/libraries/cardboard/src/processing/vr/PSurfaceVR.java b/libraries/cardboard/src/processing/vr/PSurfaceVR.java
diff --git a/libraries/cardboard/src/processing/vr/PVR.java b/libraries/cardboard/src/processing/vr/PVR.java

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ jar {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`clean.doFirst {`
`40`		`- delete "library/cardboard.jar"`
	`40`	`+ delete "library/vr.jar"`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`import groovy.util.AntBuilder`
`@@ -46,12 +46,12 @@ import static java.nio.file.StandardCopyOption.*;`
`46`	`46`
`47`	`47`	`task dist {`
`48`	`48`	`doLast {`
`49`		`- File cardBoardJar = file("library/cardboard.jar");`
	`49`	`+ File vrJar = file("library/vr.jar");`
`50`	`50`	`//create intermediate folder if they don't exist`
`51`		`- cardBoardJar.mkdirs();`
	`51`	`+ vrJar.mkdirs();`
`52`	`52`	`// make copy of jar file to library folder`
`53`		`- Files.copy(file("$buildDir/libs/cardboard.jar").toPath(),`
`54`		`- cardBoardJar.toPath(), REPLACE_EXISTING);`
	`53`	`+ Files.copy(file("$buildDir/libs/vr.jar").toPath(),`
	`54`	`+ vrJar.toPath(), REPLACE_EXISTING);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-import processing.cardboard.*;`
	`1`	`+import processing.vr.*;`
`2`	`2`
`3`	`3`	`void setup() {`
`4`		`- fullScreen(PCardboard.MONO);`
	`4`	`+ fullScreen(PVR.MONO);`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`void draw() {`