diff --git a/Assets/Furniture Prefabs/Decoration 3.prefab b/Assets/Furniture Prefabs/Decoration 3.prefab index 0ce1d99..65aa5d4 100755 Binary files a/Assets/Furniture Prefabs/Decoration 3.prefab and b/Assets/Furniture Prefabs/Decoration 3.prefab differ diff --git a/Assets/Furniture Prefabs/Decoration 4.prefab b/Assets/Furniture Prefabs/Decoration 4.prefab new file mode 100755 index 0000000..e48a813 Binary files /dev/null and b/Assets/Furniture Prefabs/Decoration 4.prefab differ diff --git a/Assets/Furniture Prefabs/Decoration 4.prefab.meta b/Assets/Furniture Prefabs/Decoration 4.prefab.meta new file mode 100755 index 0000000..dd4aacc --- /dev/null +++ b/Assets/Furniture Prefabs/Decoration 4.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1be310d4dc3f0741a75768cc27f107e +timeCreated: 1464323208 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Furniture Prefabs/Decoration 5.prefab b/Assets/Furniture Prefabs/Decoration 5.prefab new file mode 100755 index 0000000..608d41f Binary files /dev/null and b/Assets/Furniture Prefabs/Decoration 5.prefab differ diff --git a/Assets/Furniture Prefabs/Decoration 5.prefab.meta b/Assets/Furniture Prefabs/Decoration 5.prefab.meta new file mode 100755 index 0000000..1146d7c --- /dev/null +++ b/Assets/Furniture Prefabs/Decoration 5.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afd179201f2b58d4aafb3069a8889929 +timeCreated: 1464323284 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LeftController.cs b/Assets/LeftController.cs index 0d454e9..a7c3ed3 100755 --- a/Assets/LeftController.cs +++ b/Assets/LeftController.cs @@ -5,6 +5,8 @@ public class LeftController : MonoBehaviour { public GameObject MainCamera; public GameObject WarehouseCamera; + public GameObject NormalRoom; + public GameObject TransparentRoom; Transform controllerRig; SteamVR_ControllerEvents controllerEvents; @@ -33,6 +35,8 @@ public class LeftController : MonoBehaviour { WarehouseCamera.SetActive(true); controllerRig.SetParent(WarehouseCamera.transform, false); inWarehouse = true; + NormalRoom.SetActive(false); + TransparentRoom.SetActive(true); } } else { cameraFade.SetFade(0.0f); @@ -40,6 +44,8 @@ public class LeftController : MonoBehaviour { controllerRig.SetParent(MainCamera.transform, false); WarehouseCamera.SetActive(false); inWarehouse = false; + NormalRoom.SetActive(true); + TransparentRoom.SetActive(false); } } diff --git a/Assets/LeftEyeRenderTexture.renderTexture b/Assets/Resources/LeftEyeRenderTexture.renderTexture similarity index 100% rename from Assets/LeftEyeRenderTexture.renderTexture rename to Assets/Resources/LeftEyeRenderTexture.renderTexture diff --git a/Assets/LeftEyeRenderTexture.renderTexture.meta b/Assets/Resources/LeftEyeRenderTexture.renderTexture.meta similarity index 100% rename from Assets/LeftEyeRenderTexture.renderTexture.meta rename to Assets/Resources/LeftEyeRenderTexture.renderTexture.meta diff --git a/Assets/Resources/OutLineMaterialMini.mat b/Assets/Resources/OutLineMaterialMini.mat index 2ad6df7..25b82a6 100755 Binary files a/Assets/Resources/OutLineMaterialMini.mat and b/Assets/Resources/OutLineMaterialMini.mat differ diff --git a/Assets/RightEyeRenderTexture.renderTexture b/Assets/Resources/RightEyeRenderTexture.renderTexture similarity index 100% rename from Assets/RightEyeRenderTexture.renderTexture rename to Assets/Resources/RightEyeRenderTexture.renderTexture diff --git a/Assets/RightEyeRenderTexture.renderTexture.meta b/Assets/Resources/RightEyeRenderTexture.renderTexture.meta similarity index 100% rename from Assets/RightEyeRenderTexture.renderTexture.meta rename to Assets/Resources/RightEyeRenderTexture.renderTexture.meta diff --git a/Assets/TransparencyBitch.shader b/Assets/Resources/TransparencyBitch.shader similarity index 100% rename from Assets/TransparencyBitch.shader rename to Assets/Resources/TransparencyBitch.shader diff --git a/Assets/TransparencyBitch.shader.meta b/Assets/Resources/TransparencyBitch.shader.meta similarity index 100% rename from Assets/TransparencyBitch.shader.meta rename to Assets/Resources/TransparencyBitch.shader.meta diff --git a/Assets/Resources/UnlitColorMaterial.mat b/Assets/Resources/UnlitColorMaterial.mat new file mode 100755 index 0000000..fd064b6 Binary files /dev/null and b/Assets/Resources/UnlitColorMaterial.mat differ diff --git a/Assets/Resources/UnlitColorMaterial.mat.meta b/Assets/Resources/UnlitColorMaterial.mat.meta new file mode 100755 index 0000000..7e58f50 --- /dev/null +++ b/Assets/Resources/UnlitColorMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b301ab6d21d8ae3489afc246a19b7a12 +timeCreated: 1464327233 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/RightController.cs b/Assets/RightController.cs index ff42a53..f74da71 100755 --- a/Assets/RightController.cs +++ b/Assets/RightController.cs @@ -9,6 +9,7 @@ public class RightController : MonoBehaviour { public GameObject MainCamera; public GameObject WarehouseCamera; + SteamVR_TrackedObject controller; SteamVR_LaserPointer laserPointer; SteamVR_ControllerEvents controllerEvents; BoxCollider boxCollider; @@ -27,7 +28,11 @@ public class RightController : MonoBehaviour { Measurement currentMeasurement = null; + Vector3 lastPos; + void Awake() { + controller = GetComponent(); + laserPointer = GetComponent(); controllerEvents = GetComponent(); @@ -45,6 +50,8 @@ public class RightController : MonoBehaviour { void Start () { laserPointer.pointer.layer = 9; + + lastPos = transform.position; } void Update () { @@ -63,6 +70,8 @@ public class RightController : MonoBehaviour { if (currentMeasurement != null) { currentMeasurement.EndPosition = transform.localPosition; } + + lastPos = transform.position; } void OnTriggerEnter(Collider other) { @@ -106,6 +115,10 @@ public class RightController : MonoBehaviour { var furnitureMini = heldItem.GetComponent(); if (furnitureMini) { furnitureMini.Release(); + /*var device = SteamVR_Controller.Input((int)controller.index); + var rb = furnitureMini.GetComponent(); + rb.velocity = device.velocity; + rb.angularVelocity = device.angularVelocity;*/ } heldItem = null; } diff --git a/Assets/SteamVR/Scripts/SteamVR_Render.cs b/Assets/SteamVR/Scripts/SteamVR_Render.cs index d1c49ba..e166993 100755 --- a/Assets/SteamVR/Scripts/SteamVR_Render.cs +++ b/Assets/SteamVR/Scripts/SteamVR_Render.cs @@ -220,7 +220,7 @@ public class SteamVR_Render : MonoBehaviour c.transform.localRotation = vr.eyes[i].rot; // Update position to keep from getting culled - cameraMask.transform.position = c.transform.position; + //cameraMask.transform.position = c.transform.position; var camera = c.GetComponent(); camera.targetTexture = SteamVR_Camera.GetSceneTexture(camera.hdr); @@ -321,9 +321,9 @@ public class SteamVR_Render : MonoBehaviour void Awake() { #if (UNITY_5_3 || UNITY_5_2 || UNITY_5_1 || UNITY_5_0) - var go = new GameObject("cameraMask"); - go.transform.parent = transform; - cameraMask = go.AddComponent(); + //var go = new GameObject("cameraMask"); + //go.transform.parent = transform; + //cameraMask = go.AddComponent(); #endif if (externalCamera == null && System.IO.File.Exists(externalCameraConfigPath)) { diff --git a/Assets/Test.unity b/Assets/Test.unity index 0f3379d..6e3c64e 100755 Binary files a/Assets/Test.unity and b/Assets/Test.unity differ diff --git a/Assets/WarehouseRow.cs b/Assets/WarehouseRow.cs index 56c2cc7..e977612 100755 --- a/Assets/WarehouseRow.cs +++ b/Assets/WarehouseRow.cs @@ -1,7 +1,6 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -using UnityEditor; [ExecuteInEditMode] public class WarehouseRow : MonoBehaviour { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 20a158c..9a8466f 100755 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ