update to HoloPlay-Unity-Plugin-1.5.0

borongyuan · Apr 27, 2022 · 7a792b5 · 7a792b5
1 parent 43e81c1
commit 7a792b5
Show file tree

Hide file tree

Showing 189 changed files with 8,687 additions and 17,894 deletions.
diff --git a/...obot/Assets/Holoplay Post-Processing 2.1.7/PostProcessing/Runtime/Effects/DepthOfField.cs b/...obot/Assets/Holoplay Post-Processing 2.1.7/PostProcessing/Runtime/Effects/DepthOfField.cs
@@ -183,9 +183,9 @@ public override void Render(PostProcessRenderContext context)
             if (settings.holoplayDrivenFocus.value) {
                 var hp = context.camera.GetComponent<LookingGlass.Holoplay>();
                 if (hp != null) {
-                    focusDistance = Mathf.Abs(hp.camDist); 
-                    focalLength = Mathf.Abs(hp.camDist * settings.holoplayIntensity.value);
-                    aperture = Mathf.Abs(hp.camDist / settings.holoplayIntensity.value);
+                    focusDistance = Mathf.Abs(hp.CameraDistance); 
+                    focalLength = Mathf.Abs(hp.CameraDistance * settings.holoplayIntensity.value);
+                    aperture = Mathf.Abs(hp.CameraDistance / settings.holoplayIntensity.value);
                 }
             }
 

diff --git a/.../Assets/Holoplay Post-Processing 2.1.7/PostProcessing/Runtime/HoloplayPostProcessSetup.cs b/.../Assets/Holoplay Post-Processing 2.1.7/PostProcessing/Runtime/HoloplayPostProcessSetup.cs
@@ -36,15 +36,13 @@ private static HoloplayPostProcessSetupData OnPostProcessSetup(Holoplay behaviou
             PostProcessLayer postLayer = behaviour.GetComponent<PostProcessLayer>();
             if (postLayer != null && postLayer.enabled) {
                 output.postProcessCamera = behaviour.GetComponent<Camera>();
-                output.postProcessCamera.hideFlags = HideFlags.HideInInspector;
-
-                GameObject rawCamera = new GameObject(Holoplay.SingleViewCameraName);
-                rawCamera.hideFlags = HideFlags.HideAndDontSave;
-                rawCamera.transform.SetParent(behaviour.transform);
-                rawCamera.transform.localPosition = Vector3.zero;
-                rawCamera.transform.localRotation = Quaternion.identity;
-                output.camera = rawCamera.AddComponent<Camera>();
-                output.camera.CopyFrom(output.postProcessCamera);
+
+                GameObject singleViewCamera = new GameObject(Holoplay.SingleViewCameraName);
+                singleViewCamera.transform.SetParent(behaviour.transform);
+                singleViewCamera.transform.localPosition = Vector3.zero;
+                singleViewCamera.transform.localRotation = Quaternion.identity;
+                output.singleViewCamera = singleViewCamera.AddComponent<Camera>();
+                output.singleViewCamera.CopyFrom(output.postProcessCamera);
             }
 
             return output;

diff --git a/ArmRobot/Assets/Holoplay/Examples/1 - Framing Content with Holoplay.unity b/ArmRobot/Assets/Holoplay/Examples/1 - Framing Content with Holoplay.unity
@@ -500,6 +500,11 @@ PrefabInstance:
       propertyPath: field of view
       value: 14
       objectReference: {fileID: 0}
+    - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: m_TargetEye
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: quiltRT

diff --git a/ArmRobot/Assets/Holoplay/Examples/2 - Placing Text.unity b/ArmRobot/Assets/Holoplay/Examples/2 - Placing Text.unity
@@ -504,7 +504,7 @@ PrefabInstance:
     - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: near clip plane
-      value: 149.6763
+      value: 152.88693
       objectReference: {fileID: 0}
     - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
@@ -524,7 +524,12 @@ PrefabInstance:
     - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: far clip plane
-      value: 237.78629
+      value: 242.88693
+      objectReference: {fileID: 0}
+    - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: m_TargetEye
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
@@ -586,6 +591,26 @@ PrefabInstance:
       propertyPath: customQuiltSettings.aspect
       value: 0.75
       objectReference: {fileID: 0}
+    - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: targetLKGName
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: quiltTexture
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: cameraData.size
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: m_Size
+      value: 20
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3019d4eebe2593e428d7b9ccb096ceda, type: 3}
 --- !u!1 &1625520487

diff --git a/ArmRobot/Assets/Holoplay/Examples/3 - Post Processing.unity b/ArmRobot/Assets/Holoplay/Examples/3 - Post Processing.unity
@@ -1355,7 +1355,7 @@ PrefabInstance:
     - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: field of view
-      value: 135
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
@@ -1367,6 +1367,11 @@ PrefabInstance:
       propertyPath: m_projectionMatrixMode
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: m_TargetEye
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: quiltRT

diff --git a/ArmRobot/Assets/Holoplay/Examples/4 - 3D Cursor.unity b/ArmRobot/Assets/Holoplay/Examples/4 - 3D Cursor.unity
@@ -1757,6 +1757,11 @@ PrefabInstance:
       propertyPath: m_projectionMatrixMode
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: m_TargetEye
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: quiltRT

diff --git a/ArmRobot/Assets/Holoplay/Examples/5 - Hardware Buttons (Non-Portrait).unity b/ArmRobot/Assets/Holoplay/Examples/5 - Hardware Buttons (Non-Portrait).unity
@@ -408,13 +408,18 @@ PrefabInstance:
     - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: near clip plane
-      value: 33.221733
+      value: 38.221733
       objectReference: {fileID: 0}
     - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: field of view
       value: 14
       objectReference: {fileID: 0}
+    - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: m_TargetEye
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: quiltRT

diff --git a/...amples/7 - Dual Monitor Application.unity → ...amples/6 - Dual Monitor Application.unity b/...amples/7 - Dual Monitor Application.unity → ...amples/6 - Dual Monitor Application.unity
@@ -531,6 +531,11 @@ PrefabInstance:
       propertyPath: field of view
       value: 14
       objectReference: {fileID: 0}
+    - target: {fileID: 20959260662082832, guid: 3019d4eebe2593e428d7b9ccb096ceda,
+        type: 3}
+      propertyPath: m_TargetEye
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 114865344359803568, guid: 3019d4eebe2593e428d7b9ccb096ceda,
         type: 3}
       propertyPath: quiltRT

diff --git a/...s/7 - Dual Monitor Application.unity.meta → ...s/6 - Dual Monitor Application.unity.meta b/...s/7 - Dual Monitor Application.unity.meta → ...s/6 - Dual Monitor Application.unity.meta
diff --git a/...Dual Monitor Application_extendedUI.unity → ...Dual Monitor Application_extendedUI.unity b/...Dual Monitor Application_extendedUI.unity → ...Dual Monitor Application_extendedUI.unity
diff --git a/...Monitor Application_extendedUI.unity.meta → ...Monitor Application_extendedUI.unity.meta b/...Monitor Application_extendedUI.unity.meta → ...Monitor Application_extendedUI.unity.meta