Merge branch 'master' of github.com:arthurnishimoto/omicron-unity

# Conflicts:
#	Assets/Examples/Cube World/Cube World.unity

Author: arthurnishimoto

.gitignore

@@ -67,7 +67,6 @@ getRealPlayerController.prefab
 getRealPlayerController.prefab.meta
 getRealSkybox.prefab
 getRealSkybox.prefab.meta
-Resources.meta
 gr2DUISkin.guiskin
 gr2DUISkin.guiskin.meta
 GUIs.meta

Assets/CAVE2-Screen Config/CAVE2 Screen Config.unity

@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DisplayInfo : MonoBehaviour {
+
+    // getReal3D screen parameters
+    public Vector3 Px_UpperLeft;
+    public Vector3 Px_LowerLeft;
+    public Vector3 Px_LowerRight;
+
+    // CalVR screen parameters
+    public Vector3 origin; // pixel origin
+    public float h; // Screen rotation
+
+    // Use this for initialization
+    void Start () {
+        Px_UpperLeft = gameObject.transform.Find("Borders/PixelSpace/Px-UpperLeft").position;
+        Px_LowerLeft = gameObject.transform.Find("Borders/PixelSpace/Px-LowerLeft").position;
+        Px_LowerRight = gameObject.transform.Find("Borders/PixelSpace/Px-LowerRight").position;
+
+        origin = gameObject.transform.Find("Borders/PixelSpace").position;
+        h = gameObject.transform.Find("Borders/PixelSpace").eulerAngles.y;
+    }
+}