From 23e3a348376148f145cea2650c0e7aad355d9294 Mon Sep 17 00:00:00 2001 From: SOOBEEN HAN Date: Tue, 4 Nov 2025 11:36:19 +0900 Subject: [PATCH] =?UTF-8?q?=20=EB=A1=9C=EB=B4=87=20=EB=8F=99?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20(=EC=A0=9C=EC=96=B4=EA=B8=B0=20<->=203d)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/HybridInverseKinematicsNode.cs | 78 +- .../HybridIK/Scripts/Main/RobotController.cs | 64 +- .../Prefabs/LeftHandQuestVisual.prefab | 68 +- .../Prefabs/RightHandQuestVisual.prefab | 68 +- .../Controllers/XR Controller Left.prefab | 69 +- .../Controllers/XR Controller Right.prefab | 69 +- Assets/Scenes/HDRobo_Main.unity | 1296 ++++++++++++++++- Assets/Scripts/AppManager.cs | 57 +- Assets/Scripts/Model/ProgramModel.cs | 150 +- Assets/Scripts/Presenter/ProgramPresenter.cs | 106 +- Assets/Scripts/View/InteractionView.cs | 142 +- ...lete XR Origin Set Up Hands Variant.prefab | 82 +- ProjectSettings/TagManager.asset | 1 + 13 files changed, 1957 insertions(+), 293 deletions(-) diff --git a/Assets/HybridIK/Scripts/Main/HybridInverseKinematicsNode.cs b/Assets/HybridIK/Scripts/Main/HybridInverseKinematicsNode.cs index 595554d..ceca452 100644 --- a/Assets/HybridIK/Scripts/Main/HybridInverseKinematicsNode.cs +++ b/Assets/HybridIK/Scripts/Main/HybridInverseKinematicsNode.cs @@ -122,40 +122,6 @@ public class HybridInverseKinematicsNode : MonoBehaviour return currentRotations; } - public List GetCurrentJointAxisRotations(char axis = 'z') - { - List jointAngles = new List(); - if (nodes == null || nodes.Count == 0) return jointAngles; - - foreach (HybridIKJoint node in nodes) - { - if (node.jointTransform != null) - { - // 관절의 부모 기준 로컬 회전값을 Euler 각도(0-360)로 가져옴 - Vector3 localEulerAngles = node.jointTransform.localEulerAngles; - - // 매개변수로 받은 축에 해당하는 값을 리스트에 추가 - switch (axis) - { - case 'x': - case 'X': - jointAngles.Add(localEulerAngles.x); - break; - case 'y': - case 'Y': - jointAngles.Add(localEulerAngles.y); - break; - case 'z': - case 'Z': - default: - jointAngles.Add(localEulerAngles.z); - break; - } - } - } - return jointAngles; - } - public void SetJointTargetPositions(List newPositions) { if (nodes == null || nodes.Count != newPositions.Count) @@ -182,48 +148,12 @@ public class HybridInverseKinematicsNode : MonoBehaviour for (int i = 0; i < nodes.Count; i++) { nodes[i].jointTransform.localRotation = newRotations[i]; - Debug.Log($"관절 {i}의 목표 회전을 {newRotations[i]}로 설정했습니다."); - } - } - - public void SetCurrentJointAxisRotations(List jointAngles, char axis = 'z') - { - // 노드 리스트가 없거나, 받은 각도 리스트의 개수가 일치하지 않으면 오류를 출력하고 중단 - if (nodes == null || nodes.Count == 0 || jointAngles == null || nodes.Count != jointAngles.Count) - { - Debug.LogError($"관절 개수가 맞지 않습니다. (모델: {nodes?.Count ?? 0}개, 받은 데이터: {jointAngles?.Count ?? 0}개)"); - return; + //Debug.Log($"관절 {i}의 목표 회전을 {newRotations[i]}로 설정했습니다."); } - for (int i = 0; i < nodes.Count; i++) - { - if (nodes[i].jointTransform != null) - { - // 현재 로컬 오일러 각도를 Vector3 변수로 가져옴 - Vector3 currentLocalEuler = nodes[i].jointTransform.localEulerAngles; - - // 매개변수로 받은 축에 해당하는 값을 Vector3 변수에서 수정 - switch (axis) - { - case 'x': - case 'X': - currentLocalEuler.x = jointAngles[i]; - break; - case 'y': - case 'Y': - currentLocalEuler.y = jointAngles[i]; - break; - case 'z': - case 'Z': - default: - currentLocalEuler.z = jointAngles[i]; - break; - } - - // 수정된 Vector3 전체를 다시 할당 - nodes[i].jointTransform.localEulerAngles = currentLocalEuler; - } - } + // Handle위치 매 프레임마다 업데이트 + //targetTransform.localPosition = nodes[0].jointTransform.localPosition; + //targetTransform.localRotation = nodes[0].jointTransform.localRotation; } #region DebugDraw diff --git a/Assets/HybridIK/Scripts/Main/RobotController.cs b/Assets/HybridIK/Scripts/Main/RobotController.cs index dd5761f..a6ea082 100644 --- a/Assets/HybridIK/Scripts/Main/RobotController.cs +++ b/Assets/HybridIK/Scripts/Main/RobotController.cs @@ -1,8 +1,11 @@ -using UnityEngine; -using System.Collections; -using System; using NUnit.Framework; +using System; +using System.Collections; using System.Collections.Generic; +using System.Net.Sockets; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.UIElements; public class RobotController : MonoBehaviour { @@ -17,8 +20,13 @@ public class RobotController : MonoBehaviour [SerializeField] private Material indicatorMaterial2; // ʷ public event Action OnPoseUpdateRequest; + public event Action OnPoseUpdateReceive; + + public Vector3 movementPosition; + private Quaternion movementRotation; private bool isMotorOn; + public bool IsMovementRunning = false; void Start() { @@ -34,7 +42,8 @@ public class RobotController : MonoBehaviour private void Update() { - OnPoseUpdateRequest?.Invoke();// TODO. κ ƴ ϱ + //OnPoseUpdateRequest?.Invoke();// TODO. κ ƴ ϱ + OnPoseUpdateRequest?.Invoke(); } public void SetMotorState(bool isOn) @@ -60,21 +69,48 @@ public class RobotController : MonoBehaviour } } + public void EnableIK() + { + if (kinematicsNode != null) kinematicsNode.enabled = true; + } + + public void DisableIK() + { + if (kinematicsNode != null) kinematicsNode.enabled = false; + } + public void SetRobotPosition(RobotData robotData) // κ ġ Ʈ { // x, y, z, rx, ry, rz => endpoint // j1, ..., j6 => 6 ȸ - kinematicsNode.targetTransform.localPosition = new Vector3(robotData.x, robotData.y, robotData.z); - kinematicsNode.targetTransform.localRotation = new Quaternion(robotData.rx, robotData.ry, robotData.rz, 0); + // kinematicsNode.targetTransform.localPosition = new Vector3(robotData.x, robotData.y, robotData.z); + // kinematicsNode.targetTransform.localRotation = new Quaternion(robotData.rx, robotData.ry, robotData.rz, 0); + if (robotData == null) + { + return; // Ͱ ƹ͵ + } - List list_jAngle = new List(); - list_jAngle.Add(robotData.j6); - list_jAngle.Add(robotData.j5); - list_jAngle.Add(robotData.j4); - list_jAngle.Add(robotData.j3); - list_jAngle.Add(robotData.j2); - list_jAngle.Add(robotData.j1); + List list_jAngle = new List(); - kinematicsNode.SetCurrentJointAxisRotations(list_jAngle, 'x'); + list_jAngle.Add(Quaternion.AngleAxis(-1 * robotData.j1, Vector3.forward)); + list_jAngle.Add(Quaternion.AngleAxis((robotData.j2 - 90), Vector3.up)); + list_jAngle.Add(Quaternion.AngleAxis(robotData.j3, Vector3.up)); + list_jAngle.Add(Quaternion.AngleAxis(robotData.j4, Vector3.right)); + list_jAngle.Add(Quaternion.AngleAxis(robotData.j5, Vector3.up)); + list_jAngle.Add(Quaternion.AngleAxis(robotData.j6, Vector3.right)); + + kinematicsNode.SetJointTargetRotations(list_jAngle); + } + + public void Movement() + { + movementPosition.x = Convert.ToSingle(Math.Round(-1 * kinematicsNode.targetTransform.localPosition.x * 1000, 2)); + movementPosition.y = Convert.ToSingle(Math.Round(-1 * kinematicsNode.targetTransform.localPosition.z * 1000, 2)); + movementPosition.z = Convert.ToSingle(Math.Round(kinematicsNode.targetTransform.localPosition.y * 1000, 2)); + } + + void OnDestroy() + { + IsMovementRunning = false; } } diff --git a/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/LeftHandQuestVisual.prefab b/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/LeftHandQuestVisual.prefab index 10e4639..e7c561d 100644 --- a/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/LeftHandQuestVisual.prefab +++ b/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/LeftHandQuestVisual.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154020528541498655} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.019818999, y: -0.009505, z: 0.036447998} m_LocalScale: {x: 1, y: 1, z: 1} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 1388167568378441066} m_Father: {fileID: 5069669653287105868} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &210381533222935657 GameObject: @@ -55,6 +55,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 210381533222935657} + serializedVersion: 2 m_LocalRotation: {x: 0.018333554, y: -0.14033656, z: 0.2070356, w: 0.96804225} m_LocalPosition: {x: -0.022999, y: -0.009419999, z: 0.034073997} m_LocalScale: {x: 1.0000185, y: 1.0000081, z: 0.9999589} @@ -62,7 +63,6 @@ Transform: m_Children: - {fileID: 2543876780977214761} m_Father: {fileID: 5069669653287105868} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2037781684021518805 GameObject: @@ -87,13 +87,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037781684021518805} + serializedVersion: 2 m_LocalRotation: {x: -0.000029424828, y: -2.7755576e-17, z: -8.16703e-22, w: 1} m_LocalPosition: {x: -0.0002563861, y: 0.0016081122, z: 0.024326071} m_LocalScale: {x: 1, y: 1.0000552, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2161792349893887693} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119128821997336139 GameObject: @@ -121,6 +121,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2119128821997336139} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -131,7 +132,6 @@ Transform: - {fileID: 4117179676178661334} - {fileID: 1493371769922722511} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8207877637699278635 MonoBehaviour: @@ -268,6 +268,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2126422850841324885} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.014992, y: -0.0060159997, z: 0.034776} m_LocalScale: {x: 1, y: 1, z: 1} @@ -275,7 +276,6 @@ Transform: m_Children: - {fileID: 8355923779401876056} m_Father: {fileID: 5069669653287105868} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2432486271715584140 GameObject: @@ -300,13 +300,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2432486271715584140} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.000863, y: -0.001272, z: 0.047823} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5069669653287105868} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2449466093596885129 GameObject: @@ -331,6 +331,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2449466093596885129} + serializedVersion: 2 m_LocalRotation: {x: 0.18964538, y: -0.011715397, z: 0.009750124, w: 0.9817344} m_LocalPosition: {x: -0.0018839999, y: 0.005105, z: 0.061360996} m_LocalScale: {x: 0.9999646, y: 1.0000069, z: 1.000008} @@ -338,7 +339,6 @@ Transform: m_Children: - {fileID: 7578199045747409136} m_Father: {fileID: 6452153905393223383} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2578214154532702777 GameObject: @@ -363,6 +363,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2578214154532702777} + serializedVersion: 2 m_LocalRotation: {x: 0.11511069, y: 0.048731122, z: -0.0011094841, w: 0.992156} m_LocalPosition: {x: 0.00000013540283, y: 0.0000006386686, z: 0.020311324} m_LocalScale: {x: 1.0000222, y: 0.99996865, z: 0.9999735} @@ -370,7 +371,6 @@ Transform: m_Children: - {fileID: 4771887910120877510} m_Father: {fileID: 5133723241128578102} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2737566140623793783 GameObject: @@ -395,6 +395,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2737566140623793783} + serializedVersion: 2 m_LocalRotation: {x: 0.20427474, y: -0.0019674818, z: 0.0123084, w: 0.9788343} m_LocalPosition: {x: -0.00000033112343, y: -0.0000008804644, z: 0.042926535} m_LocalScale: {x: 1.0000315, y: 0.99999595, z: 1.000038} @@ -402,7 +403,6 @@ Transform: m_Children: - {fileID: 2217716065536621093} m_Father: {fileID: 2976511369594341911} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2837990381356495747 GameObject: @@ -427,6 +427,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2837990381356495747} + serializedVersion: 2 m_LocalRotation: {x: 0.3017412, y: 0.0072937733, z: 0.039555237, w: 0.95254105} m_LocalPosition: {x: 0.0000005266108, y: 0.0000003652638, z: 0.03899503} m_LocalScale: {x: 1.0000359, y: 0.9999273, z: 0.99994177} @@ -434,7 +435,6 @@ Transform: m_Children: - {fileID: 2161792349893887693} m_Father: {fileID: 8355923779401876056} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2850392847790081042 GameObject: @@ -459,6 +459,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2850392847790081042} + serializedVersion: 2 m_LocalRotation: {x: -0.06267674, y: -0.051014844, z: -0.09903724, w: 0.99179673} m_LocalPosition: {x: 0.0000025303066, y: 0.000001160611, z: 0.045651983} m_LocalScale: {x: 0.9999562, y: 1.0000366, z: 1.0000681} @@ -466,7 +467,6 @@ Transform: m_Children: - {fileID: 5133723241128578102} m_Father: {fileID: 8417380247564435590} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3513589167082941891 GameObject: @@ -491,6 +491,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3513589167082941891} + serializedVersion: 2 m_LocalRotation: {x: 0.22011371, y: -0.05016914, z: 0.08162888, w: 0.9707573} m_LocalPosition: {x: -0.000001152053, y: -0.000004860463, z: 0.032513987} m_LocalScale: {x: 0.9999928, y: 0.999997, z: 0.9999632} @@ -498,7 +499,6 @@ Transform: m_Children: - {fileID: 2918995294173764172} m_Father: {fileID: 5739692146427393493} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4006796056942365453 GameObject: @@ -523,6 +523,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4006796056942365453} + serializedVersion: 2 m_LocalRotation: {x: 0.11291981, y: 0.05065549, z: -0.0791567, w: 0.98914987} m_LocalPosition: {x: -0.000001023574, y: -0.000001828242, z: 0.033794336} m_LocalScale: {x: 0.9999879, y: 0.9999645, z: 1.0000014} @@ -530,7 +531,6 @@ Transform: m_Children: - {fileID: 4372765470732424858} m_Father: {fileID: 6917298367941137565} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4068102805684026429 GameObject: @@ -555,13 +555,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4068102805684026429} + serializedVersion: 2 m_LocalRotation: {x: -9.62965e-35, y: -2.7755576e-17, z: -3.469447e-18, w: 1} m_LocalPosition: {x: -0.00067067984, y: 0.0010256439, z: 0.02459195} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2918995294173764172} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4153076141596758713 GameObject: @@ -586,6 +586,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4153076141596758713} + serializedVersion: 2 m_LocalRotation: {x: -0.0030179783, y: -0.026077718, z: 0.016432201, w: 0.9995203} m_LocalPosition: {x: 0.0000009285007, y: 0.00000015937881, z: 0.024305161} m_LocalScale: {x: 1.0000451, y: 1.0000081, z: 1.0000004} @@ -593,7 +594,6 @@ Transform: m_Children: - {fileID: 9040749149295426473} m_Father: {fileID: 2382852788413484942} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4402673176309330239 GameObject: @@ -618,6 +618,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4402673176309330239} + serializedVersion: 2 m_LocalRotation: {x: 0.09175414, y: 0.02957179, z: 0.008965106, w: 0.99530214} m_LocalPosition: {x: -0.000001039646, y: -0.00000054232555, z: 0.026573557} m_LocalScale: {x: 0.9999347, y: 0.9999719, z: 1.0000098} @@ -625,7 +626,6 @@ Transform: m_Children: - {fileID: 6285846479872178428} m_Father: {fileID: 1345752504633725317} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5257385547637409029 GameObject: @@ -650,13 +650,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5257385547637409029} + serializedVersion: 2 m_LocalRotation: {x: -2.7755576e-17, y: 2.7755576e-17, z: -1.3877788e-17, w: 1} m_LocalPosition: {x: 0.00024632577, y: 0.0012151983, z: 0.021923328} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6179992548733844536} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5973251026017801701 GameObject: @@ -683,13 +683,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5973251026017801701} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1595251472046566641} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &1086252671028184794 SkinnedMeshRenderer: @@ -708,6 +708,9 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 3 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -782,6 +785,7 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 32000 + m_SortAtRoot: 0 --- !u!1 &6878822119114284373 GameObject: m_ObjectHideFlags: 0 @@ -805,6 +809,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6878822119114284373} + serializedVersion: 2 m_LocalRotation: {x: -0.06665304, y: 0.39692008, z: -0.5750258, w: 0.71229005} m_LocalPosition: {x: 0.030218, y: -0.016083999, z: 0.034498} m_LocalScale: {x: 1.0000204, y: 1.0000343, z: 0.9999787} @@ -812,7 +817,6 @@ Transform: m_Children: - {fileID: 6917298367941137565} m_Father: {fileID: 5069669653287105868} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7223349745271539747 GameObject: @@ -837,6 +841,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7223349745271539747} + serializedVersion: 2 m_LocalRotation: {x: 0.08123156, y: -0.08615339, z: 0.055879932, w: 0.9913912} m_LocalPosition: {x: -0.002473, y: -0.000513, z: 0.053917997} m_LocalScale: {x: 0.99998975, y: 1.0000367, z: 1.0000347} @@ -844,7 +849,6 @@ Transform: m_Children: - {fileID: 1345752504633725317} m_Father: {fileID: 2625663089559546187} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7363315784685406748 GameObject: @@ -869,13 +873,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7363315784685406748} + serializedVersion: 2 m_LocalRotation: {x: 2.7755576e-17, y: 3.469447e-18, z: 6.938894e-18, w: 1} m_LocalPosition: {x: -0.00030950914, y: 0.0011371507, z: 0.02496384} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2217716065536621093} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7708168453040589995 GameObject: @@ -900,6 +904,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7708168453040589995} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -912,7 +917,6 @@ Transform: - {fileID: 2625663089559546187} - {fileID: 5739692146427393493} m_Father: {fileID: 1595251472046566641} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7744140965541181186 GameObject: @@ -937,6 +941,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7744140965541181186} + serializedVersion: 2 m_LocalRotation: {x: -0.03223448, y: -0.0019387039, z: 0.040452998, w: 0.9986595} m_LocalPosition: {x: 0.00000017030132, y: 0.0000005871987, z: 0.027548432} m_LocalScale: {x: 0.9999718, y: 1.0000138, z: 0.99996346} @@ -944,7 +949,6 @@ Transform: m_Children: - {fileID: 4704764437844226647} m_Father: {fileID: 7578199045747409136} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7823595886095637023 GameObject: @@ -969,13 +973,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7823595886095637023} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 4.3368087e-19, z: -0, w: 1} m_LocalPosition: {x: -0.00029495324, y: 0.0010254311, z: 0.022364646} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4406525929706309036} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8254950058175367376 GameObject: @@ -1000,6 +1004,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8254950058175367376} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00361, y: -0.007648, z: 0.034286} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1007,7 +1012,6 @@ Transform: m_Children: - {fileID: 2976511369594341911} m_Father: {fileID: 5069669653287105868} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8950356902187628138 GameObject: @@ -1032,6 +1036,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8950356902187628138} + serializedVersion: 2 m_LocalRotation: {x: 0.13075915, y: -0.0037599166, z: 0.02628858, w: 0.99105847} m_LocalPosition: {x: 0.0000014584699, y: -0.0000018205594, z: 0.037927467} m_LocalScale: {x: 0.99995506, y: 0.9999494, z: 0.9999497} @@ -1039,7 +1044,6 @@ Transform: m_Children: - {fileID: 4406525929706309036} m_Father: {fileID: 1388167568378441066} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9083680252202137340 GameObject: @@ -1064,6 +1068,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9083680252202137340} + serializedVersion: 2 m_LocalRotation: {x: 0.36025816, y: -0.025496999, z: 0.06776039, w: 0.930039} m_LocalPosition: {x: 0.0000001720091, y: -0.0000006646861, z: 0.030719941} m_LocalScale: {x: 1.0000147, y: 1.0000129, z: 0.99994457} @@ -1071,7 +1076,6 @@ Transform: m_Children: - {fileID: 6179992548733844536} m_Father: {fileID: 2543876780977214761} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9195509873295428407 GameObject: @@ -1096,6 +1100,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9195509873295428407} + serializedVersion: 2 m_LocalRotation: {x: 0.151882, y: 0.076982684, z: -0.041177798, w: 0.9845354} m_LocalPosition: {x: 0.003732, y: 0.002189, z: 0.059548} m_LocalScale: {x: 1.0000446, y: 1.0000408, z: 0.999991} @@ -1103,13 +1108,13 @@ Transform: m_Children: - {fileID: 2382852788413484942} m_Father: {fileID: 273800246811882027} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &824384837593141428 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1595251472046566641} m_Modifications: - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} @@ -1165,6 +1170,9 @@ PrefabInstance: value: objectReference: {fileID: 1086252671028184794} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eed9e61964b17194d94ce56bffabb610, type: 3} --- !u!4 &4117179676178661334 stripped Transform: @@ -1176,6 +1184,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1595251472046566641} m_Modifications: - target: {fileID: 3535746112591574418, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} @@ -1231,6 +1240,9 @@ PrefabInstance: value: objectReference: {fileID: 1086252671028184794} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} --- !u!4 &1493371769922722511 stripped Transform: diff --git a/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/RightHandQuestVisual.prefab b/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/RightHandQuestVisual.prefab index c93251e..ddd63b0 100644 --- a/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/RightHandQuestVisual.prefab +++ b/Assets/Samples/XR Interaction Toolkit/3.2.1/Hands Interaction Demo/Prefabs/RightHandQuestVisual.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 215863443681122558} + serializedVersion: 2 m_LocalRotation: {x: -0.03223448, y: 0.0019387039, z: -0.040452998, w: 0.9986595} m_LocalPosition: {x: -0.00000017030132, y: 0.0000005871987, z: 0.027548432} m_LocalScale: {x: 0.9999718, y: 1.0000138, z: 0.99996346} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 7743788931914206630} m_Father: {fileID: 3806806953881312133} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &796584598386866654 GameObject: @@ -55,6 +55,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 796584598386866654} + serializedVersion: 2 m_LocalRotation: {x: 0.018333554, y: 0.14033656, z: -0.2070356, w: 0.96804225} m_LocalPosition: {x: 0.022999, y: -0.009419999, z: 0.034073997} m_LocalScale: {x: 1.0000185, y: 1.0000081, z: 0.9999589} @@ -62,7 +63,6 @@ Transform: m_Children: - {fileID: 3340838444492905394} m_Father: {fileID: 3395978642719627775} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &842518933317442901 GameObject: @@ -87,6 +87,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 842518933317442901} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -99,7 +100,6 @@ Transform: - {fileID: 8797949005621640135} - {fileID: 3299327104563389416} m_Father: {fileID: 3266887667944164143} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1735877724861123878 GameObject: @@ -124,6 +124,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1735877724861123878} + serializedVersion: 2 m_LocalRotation: {x: 0.151882, y: -0.076982684, z: 0.041177798, w: 0.9845354} m_LocalPosition: {x: -0.003732, y: 0.002189, z: 0.059548} m_LocalScale: {x: 1.0000446, y: 1.0000408, z: 0.999991} @@ -131,7 +132,6 @@ Transform: m_Children: - {fileID: 6711672412936771907} m_Father: {fileID: 4299443429756092575} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1996518441875446662 GameObject: @@ -156,6 +156,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1996518441875446662} + serializedVersion: 2 m_LocalRotation: {x: 0.3017412, y: -0.0072937733, z: -0.039555237, w: 0.95254105} m_LocalPosition: {x: -0.0000005266108, y: 0.0000003652638, z: 0.03899503} m_LocalScale: {x: 1.0000359, y: 0.9999273, z: 0.99994177} @@ -163,7 +164,6 @@ Transform: m_Children: - {fileID: 7931917171458542673} m_Father: {fileID: 4841746303345962318} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2746493918707896725 GameObject: @@ -191,6 +191,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2746493918707896725} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -201,7 +202,6 @@ Transform: - {fileID: 7565144130350447154} - {fileID: 1139509643922615340} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2605394267117782397 MonoBehaviour: @@ -338,6 +338,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3113466575053157534} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.019818999, y: -0.009505, z: 0.036447998} m_LocalScale: {x: 1, y: 1, z: 1} @@ -345,7 +346,6 @@ Transform: m_Children: - {fileID: 2974469011293564196} m_Father: {fileID: 3395978642719627775} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3179735907718132654 GameObject: @@ -370,13 +370,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3179735907718132654} + serializedVersion: 2 m_LocalRotation: {x: 1.7347235e-18, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.00067007233, y: 0.0010274227, z: 0.024590502} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 913336668376112634} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3360796068538767051 GameObject: @@ -401,6 +401,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3360796068538767051} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.014992, y: -0.0060159997, z: 0.034776} m_LocalScale: {x: 1, y: 1, z: 1} @@ -408,7 +409,6 @@ Transform: m_Children: - {fileID: 4841746303345962318} m_Father: {fileID: 3395978642719627775} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3564296416736554405 GameObject: @@ -433,6 +433,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3564296416736554405} + serializedVersion: 2 m_LocalRotation: {x: 0.36025816, y: 0.025496999, z: -0.06776039, w: 0.930039} m_LocalPosition: {x: -0.0000001720091, y: -0.0000006646861, z: 0.030719941} m_LocalScale: {x: 1.0000147, y: 1.0000129, z: 0.99994457} @@ -440,7 +441,6 @@ Transform: m_Children: - {fileID: 974549773969369685} m_Father: {fileID: 3340838444492905394} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3904829652833859929 GameObject: @@ -465,13 +465,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3904829652833859929} + serializedVersion: 2 m_LocalRotation: {x: -2.7755576e-17, y: -2.7755576e-17, z: 1.3877788e-17, w: 1} m_LocalPosition: {x: -0.00024632577, y: 0.0012151983, z: 0.021923328} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 974549773969369685} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4069531784551159773 GameObject: @@ -496,6 +496,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4069531784551159773} + serializedVersion: 2 m_LocalRotation: {x: 0.08123156, y: 0.08615339, z: -0.055879932, w: 0.9913912} m_LocalPosition: {x: 0.002473, y: -0.000513, z: 0.053917997} m_LocalScale: {x: 0.99998975, y: 1.0000367, z: 1.0000347} @@ -503,7 +504,6 @@ Transform: m_Children: - {fileID: 7241830586628604034} m_Father: {fileID: 8797949005621640135} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4285852024473462367 GameObject: @@ -528,6 +528,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4285852024473462367} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00361, y: -0.007648, z: 0.034286} m_LocalScale: {x: 1, y: 1, z: 1} @@ -535,7 +536,6 @@ Transform: m_Children: - {fileID: 6871354264860559825} m_Father: {fileID: 3395978642719627775} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4630380838405705126 GameObject: @@ -562,13 +562,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4630380838405705126} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3266887667944164143} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &2245225350196837302 SkinnedMeshRenderer: @@ -587,6 +587,9 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 3 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -661,6 +664,7 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 32000 + m_SortAtRoot: 0 --- !u!1 &4722247329182714997 GameObject: m_ObjectHideFlags: 0 @@ -684,6 +688,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4722247329182714997} + serializedVersion: 2 m_LocalRotation: {x: -0.12707803, y: -0.45972326, z: 0.55127513, w: 0.6845447} m_LocalPosition: {x: -0.030218, y: -0.016083999, z: 0.034498} m_LocalScale: {x: 1.0000156, y: 0.9999665, z: 0.99998885} @@ -691,7 +696,6 @@ Transform: m_Children: - {fileID: 630227175696017616} m_Father: {fileID: 3395978642719627775} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5028273176229366805 GameObject: @@ -716,6 +720,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5028273176229366805} + serializedVersion: 2 m_LocalRotation: {x: 0.1129837, y: -0.050618958, z: 0.07914509, w: 0.98914534} m_LocalPosition: {x: 0.0000013840911, y: -0.000006110277, z: 0.033791523} m_LocalScale: {x: 1.0000048, y: 0.99998945, z: 0.9999974} @@ -723,7 +728,6 @@ Transform: m_Children: - {fileID: 3781821463198235580} m_Father: {fileID: 630227175696017616} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5514878997612035977 GameObject: @@ -748,6 +752,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5514878997612035977} + serializedVersion: 2 m_LocalRotation: {x: 0.11511069, y: -0.048731122, z: 0.0011094841, w: 0.992156} m_LocalPosition: {x: -0.00000013540283, y: 0.0000006386686, z: 0.020311324} m_LocalScale: {x: 1.0000222, y: 0.99996865, z: 0.9999735} @@ -755,7 +760,6 @@ Transform: m_Children: - {fileID: 235264734390070265} m_Father: {fileID: 8476836270430466637} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5619084952346767682 GameObject: @@ -780,13 +784,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5619084952346767682} + serializedVersion: 2 m_LocalRotation: {x: 2.7755576e-17, y: -3.469447e-18, z: -6.938894e-18, w: 1} m_LocalPosition: {x: 0.00030950914, y: 0.0011371507, z: 0.02496384} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6559836612714395106} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5833080632680355783 GameObject: @@ -811,13 +815,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5833080632680355783} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.000863, y: -0.001272, z: 0.047823} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3395978642719627775} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5905572182659072477 GameObject: @@ -842,13 +846,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5905572182659072477} + serializedVersion: 2 m_LocalRotation: {x: 2.7755576e-17, y: 1.3877788e-17, z: -3.85186e-34, w: 1} m_LocalPosition: {x: 0.0002563861, y: 0.0016065919, z: 0.024326166} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7931917171458542673} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6485809191798009790 GameObject: @@ -873,6 +877,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6485809191798009790} + serializedVersion: 2 m_LocalRotation: {x: 0.13075915, y: 0.0037599166, z: -0.02628858, w: 0.99105847} m_LocalPosition: {x: -0.0000012943846, y: -0.0000015278448, z: 0.03792841} m_LocalScale: {x: 0.99995506, y: 0.9999494, z: 0.9999497} @@ -880,7 +885,6 @@ Transform: m_Children: - {fileID: 1403347277050157643} m_Father: {fileID: 2974469011293564196} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7257198441124491522 GameObject: @@ -905,6 +909,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7257198441124491522} + serializedVersion: 2 m_LocalRotation: {x: -0.06267674, y: 0.051014844, z: 0.09903724, w: 0.99179673} m_LocalPosition: {x: -0.0000025303066, y: 0.000001160611, z: 0.045651983} m_LocalScale: {x: 0.9999562, y: 1.0000366, z: 1.0000681} @@ -912,7 +917,6 @@ Transform: m_Children: - {fileID: 8476836270430466637} m_Father: {fileID: 6242575662763268645} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7771641699891247273 GameObject: @@ -937,6 +941,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7771641699891247273} + serializedVersion: 2 m_LocalRotation: {x: 0.20427474, y: 0.0019674818, z: -0.0123084, w: 0.9788343} m_LocalPosition: {x: 0.00000033112343, y: -0.0000008804644, z: 0.042926535} m_LocalScale: {x: 1.0000315, y: 0.99999595, z: 1.000038} @@ -944,7 +949,6 @@ Transform: m_Children: - {fileID: 6559836612714395106} m_Father: {fileID: 6871354264860559825} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7788094959647212470 GameObject: @@ -969,6 +973,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7788094959647212470} + serializedVersion: 2 m_LocalRotation: {x: 0.30390567, y: 0.06966191, z: -0.09680318, w: 0.9452078} m_LocalPosition: {x: 0.0009862719, y: -0.0057129283, z: 0.031992175} m_LocalScale: {x: 0.99998945, y: 0.99999183, z: 1.0000514} @@ -976,7 +981,6 @@ Transform: m_Children: - {fileID: 913336668376112634} m_Father: {fileID: 3299327104563389416} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8131558600404583440 GameObject: @@ -1001,6 +1005,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8131558600404583440} + serializedVersion: 2 m_LocalRotation: {x: 0.18964538, y: 0.011715397, z: -0.009750124, w: 0.9817344} m_LocalPosition: {x: 0.0018839999, y: 0.005105, z: 0.061360996} m_LocalScale: {x: 0.9999646, y: 1.0000069, z: 1.000008} @@ -1008,7 +1013,6 @@ Transform: m_Children: - {fileID: 3806806953881312133} m_Father: {fileID: 1268129203657567452} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8169709437077330363 GameObject: @@ -1033,6 +1037,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8169709437077330363} + serializedVersion: 2 m_LocalRotation: {x: 0.09172485, y: -0.029571526, z: -0.008965976, w: 0.9953048} m_LocalPosition: {x: 0.000001039646, y: -0.00000054232555, z: 0.026573557} m_LocalScale: {x: 0.9999347, y: 1.0000271, z: 1.0000098} @@ -1040,7 +1045,6 @@ Transform: m_Children: - {fileID: 1978693374757091088} m_Father: {fileID: 7241830586628604034} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8314026502941821611 GameObject: @@ -1065,13 +1069,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8314026502941821611} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -4.3368087e-19, z: -0, w: 1} m_LocalPosition: {x: 0.00029487914, y: 0.0010248977, z: 0.022363802} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1403347277050157643} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9019363430220893819 GameObject: @@ -1096,6 +1100,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9019363430220893819} + serializedVersion: 2 m_LocalRotation: {x: -0.0030179783, y: 0.026077718, z: -0.016432201, w: 0.9995203} m_LocalPosition: {x: -0.0000009285007, y: 0.00000015937881, z: 0.024305161} m_LocalScale: {x: 1.0000451, y: 1.0000081, z: 1.0000004} @@ -1103,13 +1108,13 @@ Transform: m_Children: - {fileID: 2360726808986903579} m_Father: {fileID: 6711672412936771907} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4521939072911841727 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3266887667944164143} m_Modifications: - target: {fileID: 3535746112591574418, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} @@ -1165,6 +1170,9 @@ PrefabInstance: value: objectReference: {fileID: 2245225350196837302} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} --- !u!4 &1139509643922615340 stripped Transform: @@ -1176,6 +1184,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3266887667944164143} m_Modifications: - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} @@ -1231,6 +1240,9 @@ PrefabInstance: value: objectReference: {fileID: 2245225350196837302} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eed9e61964b17194d94ce56bffabb610, type: 3} --- !u!4 &7565144130350447154 stripped Transform: diff --git a/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab b/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab index 05e658a..8afaa98 100644 --- a/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab +++ b/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 838925125806505752} + serializedVersion: 2 m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,7 +34,6 @@ Transform: - {fileID: 4772667435036090619} - {fileID: 9090878679503450943} m_Father: {fileID: 3831596280851641935} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1448679902374812222 GameObject: @@ -60,13 +60,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1448679902374812222} + serializedVersion: 2 m_LocalRotation: {x: 0.18379451, y: -0.00000008593347, z: 0.000000016067828, w: 0.9829647} m_LocalPosition: {x: 0.0000000071757764, y: -0.0032368493, z: 0.024549427} m_LocalScale: {x: 1.01935, y: 1.01935, z: 1.01935} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3831596280851641935} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2804512364258829926 MeshFilter: @@ -93,10 +93,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -143,13 +146,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1698198350110287309} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.007800013, y: 0.0013757758, z: 0.0055} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5578866909471720403} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3825292597872868106 MeshFilter: @@ -176,10 +179,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -226,13 +232,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3658530253221974222} + serializedVersion: 2 m_LocalRotation: {x: 0.00000013985816, y: -0.1305262, z: 0.000000018412676, w: 0.9914449} m_LocalPosition: {x: -0.012636564, y: -0.028556997, z: 0.027326612} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3831596280851641935} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3226976990141940512 MeshFilter: @@ -259,10 +265,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -309,13 +318,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4007647503543292280} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3831596280851641935} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2791758539991239432 MeshFilter: @@ -342,10 +351,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9f12d299d16099343a3c5c0d7285822a, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -392,13 +404,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4173161556249022688} + serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.008775877, y: 0.00152745, z: -0.0074315914} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5578866909471720403} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7940978787584295671 MeshFilter: @@ -425,10 +437,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -473,6 +488,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4496633296992529653} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -485,7 +501,6 @@ Transform: - {fileID: 3290220732042902362} - {fileID: 5578866909471720403} m_Father: {fileID: 8270855663187062767} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5479181676923438292 GameObject: @@ -512,13 +527,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5479181676923438292} + serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.008775876, y: -0.002558912, z: -0.0074315914} m_LocalScale: {x: 1.342947, y: 1.342947, z: 1.342947} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5578866909471720403} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8252842386947597077 MeshFilter: @@ -545,10 +560,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -595,13 +613,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5908322354616421163} + serializedVersion: 2 m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0, y: -0.0020741627, z: -0.0052528577} m_LocalScale: {x: 0.982392, y: 1.55, z: 0.982392} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3831596280851641935} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8151713988064746545 MeshFilter: @@ -628,10 +646,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -678,13 +699,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6593186904332347165} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.012, y: 0.0013757758, z: -0.009} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5578866909471720403} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3046491538343432697 MeshFilter: @@ -711,10 +732,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -761,13 +785,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7600421817103596258} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6.952414e-10, y: -0.012954317, z: -0.020195028} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3831596280851641935} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8482456410926060172 MeshFilter: @@ -794,10 +818,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: 2f71b0f12193f7b45b473b679def9bce, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -843,6 +870,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8758423527188247893} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} @@ -850,7 +878,6 @@ Transform: m_Children: - {fileID: 3831596280851641935} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3718224901187835141 MonoBehaviour: diff --git a/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab b/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab index f30d68d..ff8d723 100644 --- a/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab +++ b/Assets/Samples/XR Interaction Toolkit/3.2.1/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 383438424965467249} + serializedVersion: 2 m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,7 +34,6 @@ Transform: - {fileID: 5534257073571976082} - {fileID: 8133223008797737046} m_Father: {fileID: 4312999587465610534} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1830568820149819044 GameObject: @@ -60,13 +60,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830568820149819044} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.007800013, y: 0.0013757758, z: 0.0055} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4871301772669071546} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4314555765524351075 MeshFilter: @@ -93,10 +93,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -143,13 +146,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1940194302770129239} + serializedVersion: 2 m_LocalRotation: {x: 0.18379451, y: -0.00000008593347, z: 0.000000016067828, w: 0.9829647} m_LocalPosition: {x: 0.0000000071757764, y: -0.0032368493, z: 0.024549427} m_LocalScale: {x: 1.01935, y: 1.01935, z: 1.01935} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4312999587465610534} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2890725886003467535 MeshFilter: @@ -176,10 +179,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -224,6 +230,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3499590388232691612} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -236,7 +243,6 @@ Transform: - {fileID: 2548892874240362547} - {fileID: 4871301772669071546} m_Father: {fileID: 3475118261464492563} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3971126562083824521 GameObject: @@ -263,13 +269,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3971126562083824521} + serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.008775877, y: 0.00152745, z: -0.0074315914} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4871301772669071546} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6972219698470072734 MeshFilter: @@ -296,10 +302,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -346,13 +355,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4136640823569162769} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4312999587465610534} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2902600039765555297 MeshFilter: @@ -379,10 +388,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9f12d299d16099343a3c5c0d7285822a, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -428,6 +440,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4283425761326543017} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: -1, y: 1, z: 1} @@ -435,7 +448,6 @@ Transform: m_Children: - {fileID: 4312999587465610534} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2983433689305697426 MonoBehaviour: @@ -522,13 +534,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4338091395681428391} + serializedVersion: 2 m_LocalRotation: {x: 0.00000013985816, y: -0.1305262, z: 0.000000018412676, w: 0.9914449} m_LocalPosition: {x: -0.0125, y: -0.028556997, z: 0.027326612} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4312999587465610534} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2467634753240625225 MeshFilter: @@ -555,10 +567,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -605,13 +620,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4827784543866730429} + serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.008775876, y: -0.002558912, z: -0.0074315914} m_LocalScale: {x: 1.342947, y: 1.342947, z: 1.342947} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4871301772669071546} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8967149194210545788 MeshFilter: @@ -638,10 +653,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -688,13 +706,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6163737171295032436} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.012, y: 0.0013757758, z: -0.009} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4871301772669071546} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2643900140894839440 MeshFilter: @@ -721,10 +739,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -771,13 +792,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6847961977512048706} + serializedVersion: 2 m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0, y: -0.0020741627, z: -0.0052528577} m_LocalScale: {x: 0.982392, y: 1.55, z: 0.982392} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4312999587465610534} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9211829831748775768 MeshFilter: @@ -804,10 +825,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -854,13 +878,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7461432819638815115} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.012954317, z: -0.02} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4312999587465610534} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8881652531632955877 MeshFilter: @@ -887,10 +911,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 99685157b02e4d446bbecb015645e5e8, type: 2} + - {fileID: 2100000, guid: a6ad2c0d364b9bb4ebe747d9f4e2458e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Scenes/HDRobo_Main.unity b/Assets/Scenes/HDRobo_Main.unity index 511896d..3e641de 100644 --- a/Assets/Scenes/HDRobo_Main.unity +++ b/Assets/Scenes/HDRobo_Main.unity @@ -2176,6 +2176,91 @@ Transform: m_CorrespondingSourceObject: {fileID: 3144927335796171249, guid: 765fefb198c20684ca851e928acf530b, type: 3} m_PrefabInstance: {fileID: 61439609} m_PrefabAsset: {fileID: 0} +--- !u!1001 &63044408 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 288421755} + m_Modifications: + - target: {fileID: 1881156673079181450, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574418, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_Name + value: Hand Near-Far Interactor Affordances + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalPosition.x + value: -1.0682002 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalPosition.y + value: 1.36144 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalPosition.z + value: -0.45270008 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574420, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574421, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574422, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_Renderer + value: + objectReference: {fileID: 1465533417} + - target: {fileID: 3535746112591574422, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_MaterialIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574423, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 973502920} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} --- !u!1001 &67744487 PrefabInstance: m_ObjectHideFlags: 0 @@ -2308,6 +2393,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1093686136660250980, guid: d25e6ff943432834c877c29af5e8ff40, type: 3} m_PrefabInstance: {fileID: 68841403} m_PrefabAsset: {fileID: 0} +--- !u!4 &77860126 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6193790011562881128, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &79907710 PrefabInstance: m_ObjectHideFlags: 0 @@ -3485,6 +3575,11 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!4 &105562825 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + m_PrefabInstance: {fileID: 1455484966} + m_PrefabAsset: {fileID: 0} --- !u!1001 &105730012 PrefabInstance: m_ObjectHideFlags: 0 @@ -5671,6 +5766,101 @@ Transform: m_CorrespondingSourceObject: {fileID: 1093686136660250980, guid: d25e6ff943432834c877c29af5e8ff40, type: 3} m_PrefabInstance: {fileID: 162149199} m_PrefabAsset: {fileID: 0} +--- !u!4 &168239029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3704889835333334857, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &171857797 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1861494135} + m_Modifications: + - target: {fileID: 1881156673079181450, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574418, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_Name + value: Hand Near-Far Interactor Affordances + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalPosition.x + value: -1.1690003 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalPosition.y + value: 1.36144 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalPosition.z + value: -0.37400007 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574420, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574421, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574422, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_Renderer + value: + objectReference: {fileID: 1861494136} + - target: {fileID: 3535746112591574422, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_MaterialIndex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3535746112591574423, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 1273890514} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} +--- !u!4 &171857798 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + m_PrefabInstance: {fileID: 171857797} + m_PrefabAsset: {fileID: 0} --- !u!1001 &175490992 PrefabInstance: m_ObjectHideFlags: 0 @@ -5737,6 +5927,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 4284670423041837249, guid: 2732753a1c318d042b6ab205476622be, type: 3} m_PrefabInstance: {fileID: 175490992} m_PrefabAsset: {fileID: 0} +--- !u!4 &177969591 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5249268033264528182, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &178323247 PrefabInstance: m_ObjectHideFlags: 0 @@ -5807,6 +6002,97 @@ Transform: m_CorrespondingSourceObject: {fileID: 775197342873461764, guid: db2d086fe2ffee04dbb1f233c83f567a, type: 3} m_PrefabInstance: {fileID: 178323247} m_PrefabAsset: {fileID: 0} +--- !u!1001 &181211725 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1861494135} + m_Modifications: + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalPosition.x + value: -1.1690003 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalPosition.y + value: 1.36144 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalPosition.z + value: -0.37400007 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143715, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_Name + value: Hand Poke Interactor Affordances + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143716, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143717, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143718, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 2043885220} + - target: {fileID: 3626493631032143719, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_Renderer + value: + objectReference: {fileID: 1861494136} + - target: {fileID: 3626493631032143719, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_MaterialIndex + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eed9e61964b17194d94ce56bffabb610, type: 3} +--- !u!4 &181211726 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + m_PrefabInstance: {fileID: 181211725} + m_PrefabAsset: {fileID: 0} +--- !u!4 &182382737 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3535746112591574419, guid: 67c52e745f2766644ba16bfb165e2659, type: 3} + m_PrefabInstance: {fileID: 63044408} + m_PrefabAsset: {fileID: 0} --- !u!1001 &188311908 PrefabInstance: m_ObjectHideFlags: 0 @@ -6223,6 +6509,17 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!114 &200522542 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1311088819041016663, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8693657abb5062a40a80ba3cb86ef181, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &208775780 PrefabInstance: m_ObjectHideFlags: 0 @@ -8242,6 +8539,157 @@ Transform: m_CorrespondingSourceObject: {fileID: 259572300626904456, guid: 00dd62b22991bb34083ab42efdfdb2b0, type: 3} m_PrefabInstance: {fileID: 282955918} m_PrefabAsset: {fileID: 0} +--- !u!1 &288421754 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} +--- !u!4 &288421755 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} +--- !u!114 &288421756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288421754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07aaccfa1bc2417d8fbd0d9e2e102c2c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_XRHandTrackingEvents: {fileID: 288421758} + m_RootTransform: {fileID: 1693698893} + m_JointTransformReferences: + - m_XRHandJointID: 1 + m_JointTransform: {fileID: 1693698893} + - m_XRHandJointID: 7 + m_JointTransform: {fileID: 1075571384} + - m_XRHandJointID: 8 + m_JointTransform: {fileID: 1928185291} + - m_XRHandJointID: 9 + m_JointTransform: {fileID: 632148191} + - m_XRHandJointID: 10 + m_JointTransform: {fileID: 77860126} + - m_XRHandJointID: 11 + m_JointTransform: {fileID: 1152310614} + - m_XRHandJointID: 22 + m_JointTransform: {fileID: 1778443687} + - m_XRHandJointID: 23 + m_JointTransform: {fileID: 1709638491} + - m_XRHandJointID: 24 + m_JointTransform: {fileID: 775059478} + - m_XRHandJointID: 25 + m_JointTransform: {fileID: 737297400} + - m_XRHandJointID: 26 + m_JointTransform: {fileID: 2080281283} + - m_XRHandJointID: 12 + m_JointTransform: {fileID: 713123107} + - m_XRHandJointID: 13 + m_JointTransform: {fileID: 656210656} + - m_XRHandJointID: 14 + m_JointTransform: {fileID: 805751200} + - m_XRHandJointID: 15 + m_JointTransform: {fileID: 1923306769} + - m_XRHandJointID: 16 + m_JointTransform: {fileID: 1812734870} + - m_XRHandJointID: 17 + m_JointTransform: {fileID: 373986751} + - m_XRHandJointID: 18 + m_JointTransform: {fileID: 669461215} + - m_XRHandJointID: 19 + m_JointTransform: {fileID: 710988126} + - m_XRHandJointID: 20 + m_JointTransform: {fileID: 177969591} + - m_XRHandJointID: 21 + m_JointTransform: {fileID: 1046609852} + - m_XRHandJointID: 3 + m_JointTransform: {fileID: 1992999467} + - m_XRHandJointID: 4 + m_JointTransform: {fileID: 439738223} + - m_XRHandJointID: 5 + m_JointTransform: {fileID: 707566977} + - m_XRHandJointID: 6 + m_JointTransform: {fileID: 1593514764} + - m_XRHandJointID: 2 + m_JointTransform: {fileID: 1855702598} +--- !u!114 &288421757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288421754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21096d6d8059a5343a1f2b4d050e4789, type: 3} + m_Name: + m_EditorClassIdentifier: + m_XRHandTrackingEvents: {fileID: 288421758} + m_HandMeshRenderer: {fileID: 1465533417} + m_ShowMeshWhenTrackingIsAcquired: 1 + m_HideMeshWhenTrackingIsLost: 1 +--- !u!114 &288421758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288421754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5b9cf54c47f40ee9c3eb30ea8eb89b9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Handedness: 1 + m_UpdateType: 2 + m_PoseUpdated: + m_PersistentCalls: + m_Calls: [] + m_JointsUpdated: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1740693043} + m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Samples.Hands.PinchPointFollow, + Unity.XR.Interaction.Toolkit.Samples.Hands + m_MethodName: OnJointsUpdated + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TrackingAcquired: + m_PersistentCalls: + m_Calls: [] + m_TrackingLost: + m_PersistentCalls: + m_Calls: [] + m_TrackingChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &288421759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288421754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e1f6ec8e1334364b4bbcae77749ff85, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PokeInteractorObject: {fileID: 1586187739} + m_PokeStrengthSnapThreshold: 0.01 + m_SmoothingAmount: 24 + m_FixedOffset: 0.005 --- !u!1001 &289212370 PrefabInstance: m_ObjectHideFlags: 0 @@ -10976,6 +11424,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1657526026705003864, guid: 6610e5151f08b9f4fb150b442a63819a, type: 3} m_PrefabInstance: {fileID: 370484498} m_PrefabAsset: {fileID: 0} +--- !u!4 &373986751 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8861103139982036058, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &379113877 PrefabInstance: m_ObjectHideFlags: 0 @@ -12409,6 +12862,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 259572300626904456, guid: 00dd62b22991bb34083ab42efdfdb2b0, type: 3} m_PrefabInstance: {fileID: 437439188} m_PrefabAsset: {fileID: 0} +--- !u!4 &439738223 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2783223885164939568, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &440085806 PrefabInstance: m_ObjectHideFlags: 0 @@ -12567,7 +13025,7 @@ GameObject: - component: {fileID: 445094000} m_Layer: 0 m_Name: Handle - m_TagString: Untagged + m_TagString: RobotArm m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -18317,6 +18775,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 775197342873461764, guid: db2d086fe2ffee04dbb1f233c83f567a, type: 3} m_PrefabInstance: {fileID: 631531705} m_PrefabAsset: {fileID: 0} +--- !u!4 &632148191 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5309254352265182527, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &632928476 PrefabInstance: m_ObjectHideFlags: 0 @@ -18822,6 +19285,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 6139885634266263541, guid: 1cfd23389e5449140bd6d500397e103e, type: 3} m_PrefabInstance: {fileID: 655447631} m_PrefabAsset: {fileID: 0} +--- !u!4 &656210656 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 664034101155970708, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &659597509 PrefabInstance: m_ObjectHideFlags: 0 @@ -19234,6 +19702,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2261221238309844099, guid: 495ad3e16c44152428474279a474fe55, type: 3} m_PrefabInstance: {fileID: 669009101} m_PrefabAsset: {fileID: 0} +--- !u!4 &669461215 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4753335270623419760, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &671442933 PrefabInstance: m_ObjectHideFlags: 0 @@ -20204,6 +20677,16 @@ Transform: m_CorrespondingSourceObject: {fileID: 6579771427370201190, guid: bd0d7d75a7176934eb7073891eb5fe28, type: 3} m_PrefabInstance: {fileID: 707197564} m_PrefabAsset: {fileID: 0} +--- !u!4 &707566977 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4915018568169159829, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} +--- !u!4 &710988126 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7772786308132210356, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &711512739 PrefabInstance: m_ObjectHideFlags: 0 @@ -20274,6 +20757,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8919430573019760138, guid: 167d29010360de04997336185ca9ae7a, type: 3} m_PrefabInstance: {fileID: 711512739} m_PrefabAsset: {fileID: 0} +--- !u!4 &713123107 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8003964948542217601, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &713806280 PrefabInstance: m_ObjectHideFlags: 0 @@ -21158,6 +21646,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1657526026705003864, guid: 6610e5151f08b9f4fb150b442a63819a, type: 3} m_PrefabInstance: {fileID: 737112800} m_PrefabAsset: {fileID: 0} +--- !u!4 &737297400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 606599469548895155, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &739003413 PrefabInstance: m_ObjectHideFlags: 0 @@ -21923,6 +22416,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5391248331677087104, guid: b7a5987c9e2f7d747af2d62c4300874d, type: 3} m_PrefabInstance: {fileID: 774357593} m_PrefabAsset: {fileID: 0} +--- !u!4 &775059478 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5903815124812718644, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &777052208 PrefabInstance: m_ObjectHideFlags: 0 @@ -22859,6 +23357,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 6424268603467558571, guid: cf81d94c328b77a4494785a27f7166bf, type: 3} m_PrefabInstance: {fileID: 804184348} m_PrefabAsset: {fileID: 0} +--- !u!4 &805751200 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8279425768049988373, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &809534399 PrefabInstance: m_ObjectHideFlags: 0 @@ -25325,6 +25828,113 @@ Transform: m_CorrespondingSourceObject: {fileID: 5374851320541800242, guid: 531634be2d8a84442b4e63ba4e8f9b27, type: 3} m_PrefabInstance: {fileID: 894145413} m_PrefabAsset: {fileID: 0} +--- !u!1001 &894211030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1160385813} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7009038412992213568, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: c9a2e36b2cbe78b4ba9b65ec4a6e9f5a, type: 2} + - target: {fileID: -3447419692787215646, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3447419692787215646, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3447419692787215646, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_Name + value: LeftHand + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8879528566716807029, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8879528566716807029, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8879528566716807029, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + insertIndex: -1 + addedObject: {fileID: 105562825} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + insertIndex: -1 + addedObject: {fileID: 182382737} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + insertIndex: -1 + addedObject: {fileID: 288421758} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + insertIndex: -1 + addedObject: {fileID: 288421757} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + insertIndex: -1 + addedObject: {fileID: 288421756} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + insertIndex: -1 + addedObject: {fileID: 288421759} + m_SourcePrefab: {fileID: 100100000, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} --- !u!1 &894852498 GameObject: m_ObjectHideFlags: 0 @@ -27543,6 +28153,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 3144927335796171249, guid: 765fefb198c20684ca851e928acf530b, type: 3} m_PrefabInstance: {fileID: 970032720} m_PrefabAsset: {fileID: 0} +--- !u!114 &973502920 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3359539261843778952, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25a07ef133a37d140a87cdf1f1c75fdf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &974987083 GameObject: m_ObjectHideFlags: 0 @@ -29780,6 +30401,22 @@ Transform: m_CorrespondingSourceObject: {fileID: 4106791946970566897, guid: 04e2e84adfe5ce6408a6777431fcb927, type: 3} m_PrefabInstance: {fileID: 1042269393} m_PrefabAsset: {fileID: 0} +--- !u!114 &1045947015 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8629926924687228403, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25a07ef133a37d140a87cdf1f1c75fdf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1046609852 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -1450917681278090710, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1 &1048338099 GameObject: m_ObjectHideFlags: 0 @@ -30565,6 +31202,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5391248331677087104, guid: b7a5987c9e2f7d747af2d62c4300874d, type: 3} m_PrefabInstance: {fileID: 1069446741} m_PrefabAsset: {fileID: 0} +--- !u!4 &1075571384 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1154425115653003359, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1076759074 PrefabInstance: m_ObjectHideFlags: 0 @@ -32348,6 +32990,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 258171189291317147, guid: 3c1c1cf2af570864bb4d9ee692c4989b, type: 3} m_PrefabInstance: {fileID: 1145012318} m_PrefabAsset: {fileID: 0} +--- !u!4 &1152310614 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -1219834426803787585, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1154645845 PrefabInstance: m_ObjectHideFlags: 0 @@ -32660,6 +33307,11 @@ MonoBehaviour: m_Teleporting: m_PersistentCalls: m_Calls: [] +--- !u!4 &1160385813 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3849287962258532554, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1160895030 PrefabInstance: m_ObjectHideFlags: 0 @@ -35866,6 +36518,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 3144927335796171249, guid: 765fefb198c20684ca851e928acf530b, type: 3} m_PrefabInstance: {fileID: 1272364440} m_PrefabAsset: {fileID: 0} +--- !u!114 &1273890514 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5488570530423974502, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25a07ef133a37d140a87cdf1f1c75fdf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1278594749 PrefabInstance: m_ObjectHideFlags: 0 @@ -36822,7 +37485,7 @@ MonoBehaviour: view: {fileID: 1243479632} tcpView: {fileID: 1456747455} robotController: {fileID: 806304512143720359} - interactionView: {fileID: 1568384462} + interactionView: {fileID: 0} pointManagerView: {fileID: 1568384461} pathLineView: {fileID: 1568384459} popupView: {fileID: 1313589743} @@ -38262,6 +38925,136 @@ Transform: m_CorrespondingSourceObject: {fileID: 5775646025416913786, guid: bb895333a2c297046982a7e19d1b2f95, type: 3} m_PrefabInstance: {fileID: 1337853755} m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882553 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5921059720968333628, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882554 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6369520507931037327, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882555 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7247982142543216525, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882556 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7307881451010977780, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882557 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8038926740243801269, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882558 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -6743644677469078040, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882559 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7421680616510102772, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882560 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -268469141517272140, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882561 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4755705249969248903, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882562 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1769301788190138797, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882563 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5618798955681276305, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882564 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8174001811309047470, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882565 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -503423798586103357, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882566 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8821903730841366308, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882567 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -694282657740477288, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882568 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -7025628348742161149, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882569 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3242453348583228095, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882570 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5981357858544412476, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882571 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7106731787776197609, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882572 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1661386968683415328, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882573 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4201616494076084424, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882574 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -49996117646208378, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882575 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -1923627171604197467, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882576 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8044792139287109698, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882577 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4599563310825387641, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1339882578 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7228375182728029046, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1340139888 PrefabInstance: m_ObjectHideFlags: 0 @@ -41809,6 +42602,87 @@ Transform: m_CorrespondingSourceObject: {fileID: 5775646025416913786, guid: bb895333a2c297046982a7e19d1b2f95, type: 3} m_PrefabInstance: {fileID: 1454483029} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1455484966 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 288421755} + m_Modifications: + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalPosition.x + value: -1.0682002 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalPosition.y + value: 1.36144 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalPosition.z + value: -0.45270008 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143714, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143715, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_Name + value: Hand Poke Interactor Affordances + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143716, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143717, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_ColorPropertyName + value: _BaseColor + objectReference: {fileID: 0} + - target: {fileID: 3626493631032143718, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 1586187739} + - target: {fileID: 3626493631032143719, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_Renderer + value: + objectReference: {fileID: 1465533417} + - target: {fileID: 3626493631032143719, guid: eed9e61964b17194d94ce56bffabb610, type: 3} + propertyPath: m_MaterialIndex + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eed9e61964b17194d94ce56bffabb610, type: 3} --- !u!1001 &1456489898 PrefabInstance: m_ObjectHideFlags: 0 @@ -42352,6 +43226,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1465393238} m_CullTransparentMesh: 1 +--- !u!137 &1465533417 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -7009038412992213568, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1 &1466944354 GameObject: m_ObjectHideFlags: 0 @@ -46189,8 +47068,8 @@ GameObject: - component: {fileID: 1568384455} - component: {fileID: 1568384460} - component: {fileID: 1568384459} - - component: {fileID: 1568384462} - component: {fileID: 1568384461} + - component: {fileID: 1568384462} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -46425,6 +47304,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c1b136fe9693203418aa8d9bacb7cfcf, type: 3} m_Name: m_EditorClassIdentifier: + interactor: {fileID: 1045947015} --- !u!1 &1570547337 GameObject: m_ObjectHideFlags: 0 @@ -47354,6 +48234,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 531461037095252097, guid: ec558ae7b235c734d8b40fd18dcfbdc7, type: 3} m_PrefabInstance: {fileID: 1585777167} m_PrefabAsset: {fileID: 0} +--- !u!114 &1586187739 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3634828268933930783, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0924bcaa9eb50df458a783ae0e2b59f5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1586537279 PrefabInstance: m_ObjectHideFlags: 0 @@ -47569,6 +48460,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 137306686372391610, guid: 04c8d99f4a1aca9409a268f12c31b52e, type: 3} m_PrefabInstance: {fileID: 1589692221} m_PrefabAsset: {fileID: 0} +--- !u!4 &1593514764 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2380200622737473597, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1596340559 PrefabInstance: m_ObjectHideFlags: 0 @@ -51268,6 +52164,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 4284670423041837249, guid: 2732753a1c318d042b6ab205476622be, type: 3} m_PrefabInstance: {fileID: 1690708756} m_PrefabAsset: {fileID: 0} +--- !u!4 &1693698893 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 416036698525924379, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1694469441 PrefabInstance: m_ObjectHideFlags: 0 @@ -51971,6 +52872,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5551975150691102061, guid: d8e76f03f4fe8b740960497b0e5d1f02, type: 3} m_PrefabInstance: {fileID: 1708640608} m_PrefabAsset: {fileID: 0} +--- !u!4 &1709638491 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3412383046812127883, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1710196207 PrefabInstance: m_ObjectHideFlags: 0 @@ -52756,6 +53662,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 775197342873461764, guid: db2d086fe2ffee04dbb1f233c83f567a, type: 3} m_PrefabInstance: {fileID: 1724822171} m_PrefabAsset: {fileID: 0} +--- !u!114 &1740693043 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4722521666264654502, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8693657abb5062a40a80ba3cb86ef181, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1741670569 PrefabInstance: m_ObjectHideFlags: 0 @@ -53479,6 +54396,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 775197342873461764, guid: db2d086fe2ffee04dbb1f233c83f567a, type: 3} m_PrefabInstance: {fileID: 1777371708} m_PrefabAsset: {fileID: 0} +--- !u!4 &1778443687 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5980025480856715166, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1 &1780220921 GameObject: m_ObjectHideFlags: 0 @@ -54327,6 +55249,11 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!4 &1812734870 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8320340804924925946, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1813617961 PrefabInstance: m_ObjectHideFlags: 0 @@ -55476,6 +56403,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 4106791946970566897, guid: 04e2e84adfe5ce6408a6777431fcb927, type: 3} m_PrefabInstance: {fileID: 1849344550} m_PrefabAsset: {fileID: 0} +--- !u!4 &1855702598 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2666950081188509781, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1856568633 PrefabInstance: m_ObjectHideFlags: 0 @@ -55900,6 +56832,253 @@ Transform: m_CorrespondingSourceObject: {fileID: 1169705456215034644, guid: 622d27435be179a46a71f3838c62a961, type: 3} m_PrefabInstance: {fileID: 1861099121} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1861494134 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 168239029} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5335555045901936782, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 25a72e6d30096e542933654841593a2c, type: 2} + - target: {fileID: 919132149155446097, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_Name + value: RightHand + objectReference: {fileID: 0} + - target: {fileID: 8879528566716807029, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8879528566716807029, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8879528566716807029, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + insertIndex: -1 + addedObject: {fileID: 181211726} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + insertIndex: -1 + addedObject: {fileID: 171857798} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + insertIndex: -1 + addedObject: {fileID: 1861494139} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + insertIndex: -1 + addedObject: {fileID: 1861494138} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + insertIndex: -1 + addedObject: {fileID: 1861494141} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + insertIndex: -1 + addedObject: {fileID: 1861494140} + m_SourcePrefab: {fileID: 100100000, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} +--- !u!4 &1861494135 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!137 &1861494136 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -5335555045901936782, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1861494137 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d60c39e7670d1ea46b57d0446b6eb326, type: 3} + m_PrefabInstance: {fileID: 1861494134} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1861494138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861494137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21096d6d8059a5343a1f2b4d050e4789, type: 3} + m_Name: + m_EditorClassIdentifier: + m_XRHandTrackingEvents: {fileID: 1861494139} + m_HandMeshRenderer: {fileID: 1861494136} + m_ShowMeshWhenTrackingIsAcquired: 1 + m_HideMeshWhenTrackingIsLost: 1 +--- !u!114 &1861494139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861494137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5b9cf54c47f40ee9c3eb30ea8eb89b9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Handedness: 2 + m_UpdateType: 2 + m_PoseUpdated: + m_PersistentCalls: + m_Calls: [] + m_JointsUpdated: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 200522542} + m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Samples.Hands.PinchPointFollow, + Unity.XR.Interaction.Toolkit.Samples.Hands + m_MethodName: OnJointsUpdated + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TrackingAcquired: + m_PersistentCalls: + m_Calls: [] + m_TrackingLost: + m_PersistentCalls: + m_Calls: [] + m_TrackingChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1861494140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861494137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e1f6ec8e1334364b4bbcae77749ff85, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PokeInteractorObject: {fileID: 2043885220} + m_PokeStrengthSnapThreshold: 0.01 + m_SmoothingAmount: 24 + m_FixedOffset: 0.005 +--- !u!114 &1861494141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861494137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07aaccfa1bc2417d8fbd0d9e2e102c2c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_XRHandTrackingEvents: {fileID: 1861494139} + m_RootTransform: {fileID: 1339882578} + m_JointTransformReferences: + - m_XRHandJointID: 1 + m_JointTransform: {fileID: 1339882578} + - m_XRHandJointID: 7 + m_JointTransform: {fileID: 1339882577} + - m_XRHandJointID: 8 + m_JointTransform: {fileID: 1339882576} + - m_XRHandJointID: 9 + m_JointTransform: {fileID: 1339882575} + - m_XRHandJointID: 10 + m_JointTransform: {fileID: 1339882574} + - m_XRHandJointID: 11 + m_JointTransform: {fileID: 1339882573} + - m_XRHandJointID: 22 + m_JointTransform: {fileID: 1339882557} + - m_XRHandJointID: 23 + m_JointTransform: {fileID: 1339882556} + - m_XRHandJointID: 24 + m_JointTransform: {fileID: 1339882555} + - m_XRHandJointID: 25 + m_JointTransform: {fileID: 1339882554} + - m_XRHandJointID: 26 + m_JointTransform: {fileID: 1339882553} + - m_XRHandJointID: 12 + m_JointTransform: {fileID: 1339882572} + - m_XRHandJointID: 13 + m_JointTransform: {fileID: 1339882571} + - m_XRHandJointID: 14 + m_JointTransform: {fileID: 1339882570} + - m_XRHandJointID: 15 + m_JointTransform: {fileID: 1339882569} + - m_XRHandJointID: 16 + m_JointTransform: {fileID: 1339882568} + - m_XRHandJointID: 17 + m_JointTransform: {fileID: 1339882567} + - m_XRHandJointID: 18 + m_JointTransform: {fileID: 1339882566} + - m_XRHandJointID: 19 + m_JointTransform: {fileID: 1339882565} + - m_XRHandJointID: 20 + m_JointTransform: {fileID: 1339882564} + - m_XRHandJointID: 21 + m_JointTransform: {fileID: 1339882563} + - m_XRHandJointID: 3 + m_JointTransform: {fileID: 1339882561} + - m_XRHandJointID: 4 + m_JointTransform: {fileID: 1339882560} + - m_XRHandJointID: 5 + m_JointTransform: {fileID: 1339882559} + - m_XRHandJointID: 6 + m_JointTransform: {fileID: 1339882558} + - m_XRHandJointID: 2 + m_JointTransform: {fileID: 1339882562} --- !u!1001 &1867036230 PrefabInstance: m_ObjectHideFlags: 0 @@ -57772,6 +58951,16 @@ Transform: m_CorrespondingSourceObject: {fileID: 4103102361958272015, guid: 19f19b649e487124195384d8890a9b27, type: 3} m_PrefabInstance: {fileID: 1923211060} m_PrefabAsset: {fileID: 0} +--- !u!4 &1923306769 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1755095928203445697, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1928185291 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 45689846689192900, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1928531730 PrefabInstance: m_ObjectHideFlags: 0 @@ -57894,7 +59083,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4381072889419385576, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4412248471636014729, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_TrackedHandModeStarted.m_PersistentCalls.m_Calls.Array.size @@ -57920,6 +59109,26 @@ PrefabInstance: propertyPath: m_MotionControllerModeStarted.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 4484450480579079777, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4665992848338501520, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: -4299625302041532480, guid: bf7151579c38e2a44be94ba8773876c1, type: 3} + - target: {fileID: 4665992848338501520, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4665992848338501520, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 455ef821a5429de4baeed61fa958acbc, type: 2} + - target: {fileID: 4665992848338501520, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: c1c1d86181c00bf4dabbad3ca0b191e7, type: 2} - target: {fileID: 4750419573833148750, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -58036,21 +59245,57 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5949727424041121515, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_MetaQuestLeftHandMesh + value: + objectReference: {fileID: 288421754} + - target: {fileID: 5949727424041121515, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_MetaQuestRightHandMesh + value: + objectReference: {fileID: 1861494137} - target: {fileID: 5961466993189031681, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6308738152630716225, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6480875618724468155, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6480875618724468155, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7270950585248332961, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - target: {fileID: 7431851489725401817, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7766330768354966698, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7917674758326848207, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: near clip plane value: 0.3 objectReference: {fileID: 0} + - target: {fileID: 8151105433200462960, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8228137535934343709, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8298782634366228632, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8806329115733545877, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_Name @@ -58062,7 +59307,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalPosition.x - value: -1.169 + value: -2.905 objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalPosition.y @@ -58070,7 +59315,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalPosition.z - value: -0.374 + value: 0.001 objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalRotation.w @@ -58102,6 +59347,10 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8935853449824297509, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9031377291277648298, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - target: {fileID: 9059786329452581396, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} @@ -58110,7 +59359,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3849287962258532554, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + insertIndex: 5 + addedObject: {fileID: 288421755} + - targetCorrespondingSourceObject: {fileID: 3704889835333334857, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + insertIndex: 5 + addedObject: {fileID: 1861494135} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} --- !u!20 &1928531731 stripped @@ -59303,6 +60558,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 6424268603467558571, guid: cf81d94c328b77a4494785a27f7166bf, type: 3} m_PrefabInstance: {fileID: 1992509453} m_PrefabAsset: {fileID: 0} +--- !u!4 &1992999467 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5286840350869868188, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1995714540 PrefabInstance: m_ObjectHideFlags: 0 @@ -60663,6 +61923,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4012132410924601370, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} m_PrefabInstance: {fileID: 1928531730} m_PrefabAsset: {fileID: 0} +--- !u!114 &2043885220 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1517992048397969941, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + m_PrefabInstance: {fileID: 1928531730} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043885219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0924bcaa9eb50df458a783ae0e2b59f5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2052318582 PrefabInstance: m_ObjectHideFlags: 0 @@ -61305,6 +62576,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 259572300626904456, guid: 00dd62b22991bb34083ab42efdfdb2b0, type: 3} m_PrefabInstance: {fileID: 2078818416} m_PrefabAsset: {fileID: 0} +--- !u!4 &2080281283 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8990332886817063586, guid: 681c1cadbb14b604d9438dc819da8e9a, type: 3} + m_PrefabInstance: {fileID: 894211030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2082840797 PrefabInstance: m_ObjectHideFlags: 0 @@ -63029,6 +64305,8 @@ MonoBehaviour: motorStatusIndicator2: {fileID: 2476781507827223150} indicatorMaterial1: {fileID: 2100000, guid: 8429ea8a04d5dd844875dc07c5f6c06b, type: 2} indicatorMaterial2: {fileID: 2100000, guid: d5b595f8848b48a418815999bef1b127, type: 2} + movementPosition: {x: 0, y: 0, z: 0} + IsMovementRunning: 0 --- !u!23 &967835047034871637 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AppManager.cs b/Assets/Scripts/AppManager.cs index 91a6c6e..36eaed9 100644 --- a/Assets/Scripts/AppManager.cs +++ b/Assets/Scripts/AppManager.cs @@ -7,35 +7,80 @@ using UnityEngine; public class AppManager : MonoBehaviour { + public static AppManager Instance { get; private set; } + [SerializeField] private ProgramView view; [SerializeField] private TCPView tcpView; [SerializeField] private RobotController robotController; - [SerializeField] private InteractionView interactionView; + private InteractionView interactionView; [SerializeField] private PointManagerView pointManagerView; [SerializeField] private PathLineView pathLineView; [SerializeField] private PopupView popupView; [SerializeField] private float motorStatePollInterval = 1.0f; + public CancellationTokenSource cancellationTokenSource; + private bool isModelAndStaticViewsReady = false; + private ProgramModel model; private ProgramPresenter presenter; private string hostip; private int tcpPort; private int udpPort; private string configFileName = "config.cfg"; - private CancellationToken cancellationToken; + + + void Awake() + { + if (Instance != null && Instance != this) + { + Destroy(gameObject); + } + else + { + Instance = this; + } + } async void Start() { LoadConfig(); - ProgramModel model = new ProgramModel(hostip, tcpPort, udpPort); + model = new ProgramModel(hostip, tcpPort, udpPort, robotController); await model.InitializeAsync(); - _ = model.GetTCPAsync(cancellationToken); - presenter = new ProgramPresenter(model, view, tcpView, interactionView, pointManagerView, popupView, pathLineView); + isModelAndStaticViewsReady = true; + TryCreatePresenter(); + } + + public void RegisterView(InteractionView Iview) + { + if (this.interactionView != null) return; + this.interactionView = Iview; + + TryCreatePresenter(); + } + + private void TryCreatePresenter() + { + if (presenter != null) return; + + presenter = new ProgramPresenter( + model, + view, + tcpView, + interactionView, + pointManagerView, + popupView, + pathLineView + ); + presenter.RegisterControlledRobot(robotController); + _ = presenter.UpdateMotorStateAsync(); + + cancellationTokenSource = new CancellationTokenSource(); + _ = model.GetTCPAsync(cancellationTokenSource.Token); + _ = model.StartMovementCheckLoopAsync(cancellationTokenSource.Token); - await presenter.UpdateMotorStateAsync(); view.DisplayProgram(null); StartCoroutine(PollMotorStateCoroutine()); } diff --git a/Assets/Scripts/Model/ProgramModel.cs b/Assets/Scripts/Model/ProgramModel.cs index eed99eb..720cb2f 100644 --- a/Assets/Scripts/Model/ProgramModel.cs +++ b/Assets/Scripts/Model/ProgramModel.cs @@ -23,23 +23,21 @@ public class ProgramModel : IProgramModel private string tcpBaseUrl; private string udpBaseUrl; HttpClient httpClient = new HttpClient(); - private SingleTcpClient tcpClient; private SingleUdpClient udpClientForHttp; public UdpClientManager manager = new UdpClientManager(); private List allProgramsCache = new List(); public RobotProgram CurrentProgram { get; private set; } - private RobotData robotData; + private RobotController robotController; private readonly object lockObject = new object(); private bool hasNewData; - public bool IsUdpLoopRunning = false; public bool IsMoving; - public CancellationTokenSource cancellationTokenSource; private Vector3 startMovementPosition; + public CancellationTokenSource cancellationTokenSource; - public ProgramModel(string hostip, int tcpPort, int udpPort) + public ProgramModel(string hostip, int tcpPort, int udpPort, RobotController robotController) { tcpBaseUrl = $"http://{hostip}:{tcpPort}"; udpBaseUrl = $"http://{hostip}:{udpPort}"; @@ -50,8 +48,8 @@ public class ProgramModel : IProgramModel { await LoadAllPrograms(); hasNewData = false; - IsUdpLoopRunning = true; IsMoving = false; + cancellationTokenSource = new CancellationTokenSource(); return; } @@ -87,6 +85,8 @@ public class ProgramModel : IProgramModel public async Task CreateNewProgram(string userInputId) { + string robotModelName; + if (string.IsNullOrEmpty(userInputId)) return false; string newProgramId = $"{userInputId}.job"; @@ -99,9 +99,6 @@ public class ProgramModel : IProgramModel else Debug.Log($"{newProgramId} "); - - string robotModelName; - try { robotModelName = await GetRobotModelNameAsync(); @@ -170,7 +167,7 @@ public class ProgramModel : IProgramModel JObject data = JObject.Parse(jsonResponse); int motorState = (int)data.SelectToken("enable_state"); - if (motorState == 2 || motorState == 256) + if (motorState == 0 || motorState == 256) return true; else if (motorState == 1) return false; @@ -182,11 +179,10 @@ public class ProgramModel : IProgramModel public async Task GetTCPAsync(CancellationToken token) { - while (IsUdpLoopRunning) + while (!token.IsCancellationRequested) { try { - //string requestUri = $"{udpBaseUrl}/project/robot/po_cur"; string requestUri = $"{tcpBaseUrl}/project/robot/po_cur"; HttpResponseMessage result = await httpClient.GetAsync(requestUri); @@ -201,7 +197,7 @@ public class ProgramModel : IProgramModel } await Task.Delay(50); } - catch (System.Exception e) + catch (Exception e) { Debug.Log(e); await Task.Delay(1000); // @@ -347,13 +343,20 @@ public class ProgramModel : IProgramModel } // ǽð κ TCP ̵ - public async Task StreamPoseToRobotUdpAsync(RobotData pose) + public async Task StreamPoseUdpAsync(RobotData pose) { try { byte[] udpPacket = ConvertPoseToPacket(pose); - await udpClientForHttp.SendBytesAsync(udpPacket); + if (udpClientForHttp != null) + { + await udpClientForHttp.SendBytesAsync(udpPacket); + } + else + { + Debug.LogWarning("UDP Ŭ̾Ʈ ʾҽϴ."); + } } catch (Exception e) { @@ -361,6 +364,89 @@ public class ProgramModel : IProgramModel } } + // Ÿ ̵ + public async Task MoveToPoseTcpAsync(RobotData pose) + { + try + { + string jsonString = $"{{\"pose_tg\":{{\"crd\":\"robot\",\"_type\":\"Pose\",\"mechinfo\":1,\"x\":{pose.x},\"y\":{pose.y},\"z\":{pose.z}, \"rx\":{pose.rx}, \"ry\":{pose.ry}, \"rz\":{pose.rz}}}}}"; + HttpContent jsonPayload = new StringContent(jsonString, Encoding.UTF8, "application/json"); + + HttpResponseMessage result = await httpClient.PostAsync("/project/robot/move_to_pose_manual", jsonPayload); + + if (result.IsSuccessStatusCode) + { + Debug.Log("TCP POST (Move) "); + + this.startMovementPosition = new Vector3(pose.x, pose.y, pose.z); + this.IsMoving = true; + return true; + } + else + { + string errorResponse = await result.Content.ReadAsStringAsync(); + Debug.LogError($"TCP POST (Move) ({result.StatusCode}): {errorResponse}"); + return false; + } + } + catch (Exception e) + { + Debug.Log(e); + return false; + } + } + + // TCP POST ̵ üũ + public async Task StartMovementCheckLoopAsync(CancellationToken token) + { + while (!token.IsCancellationRequested) + { + if (IsMoving) + { + try + { + await udpClientForHttp.SendFilledBytesAsync(new Dictionary { { 2, 0x20 } }); + + RobotData currentPose = null; + lock (lockObject) + { + currentPose = this.robotData; + } + + if (currentPose != null) + { + bool isApproximatelyX = Mathf.Approximately(startMovementPosition.x, Convert.ToSingle(Math.Round(currentPose.x, 2))); + bool isApproximatelyY = Mathf.Approximately(startMovementPosition.y, Convert.ToSingle(Math.Round(currentPose.y, 2))); + bool isApproximatelyZ = Mathf.Approximately(startMovementPosition.z, Convert.ToSingle(Math.Round(currentPose.z, 2))); + + if (isApproximatelyX && isApproximatelyY && isApproximatelyZ) + { + IsMoving = false; // Ϸ + Debug.Log("TCP Move: ǥ Ϸ."); + } + } + await Task.Delay(100, token); // 100ms Ȯ + } + catch (TaskCanceledException) + { + Debug.Log("Movement Check Ǿϴ."); + break; + } + catch (Exception e) + { + Debug.Log($"Movement Check : {e.Message}"); + IsMoving = false; // ߻ ߴ + await Task.Delay(1000, token); + } + } + else + { + // (IsMoving = false 1ʰ ) + await Task.Delay(1000, token); + } + } + } + private byte[] ConvertPoseToPacket(RobotData pose) { using (MemoryStream stream = new MemoryStream()) @@ -378,39 +464,9 @@ public class ProgramModel : IProgramModel } } - // tcp 巡 ̵ ϴ - public async Task StartMovement(Vector3 position) - { - startMovementPosition.x = Convert.ToSingle(Math.Round(-1 * position.x * 1000, 2)); - startMovementPosition.y = Convert.ToSingle(Math.Round(-1 * position.z * 1000, 2)); - startMovementPosition.z = Convert.ToSingle(Math.Round(position.y * 1000, 2)); - var jsonResponse = await tcpClient.SendPostRequestAsync("/project/robot/move_to_pose_manual", $"{{\"pose_tg\":{{\"crd\":\"robot\",\"_type\":\"Pose\",\"mechinfo\":1,\"x\":{startMovementPosition.x},\"y\":{startMovementPosition.y},\"z\":{startMovementPosition.z}, \"rx\":{robotData.rx}, \"ry\":{robotData.ry}, \"rz\":{robotData.rz}}}}}"); - return jsonResponse.Contains("200"); - } - - //Ÿ ޱ ̵ - private async Task MovementLoopAsync() - { - while (!cancellationTokenSource.Token.IsCancellationRequested) - { - if (IsMoving) - { - await udpClientForHttp.SendFilledBytesAsync(new Dictionary { { 2, 0x20 } }); - await Task.Delay(100); - bool isApproximatelyX = Mathf.Approximately(startMovementPosition.x, Convert.ToSingle(Math.Round(robotData.x, 2))); - bool isApproximatelyY = Mathf.Approximately(startMovementPosition.y, Convert.ToSingle(Math.Round(robotData.y, 2))); - bool isApproximatelyZ = Mathf.Approximately(startMovementPosition.z, Convert.ToSingle(Math.Round(robotData.z, 2))); - if (isApproximatelyX && isApproximatelyY && isApproximatelyZ) - { - IsMoving = false; - } - } - - } - } - void OnDestroy() { - IsUdpLoopRunning = false; + cancellationTokenSource?.Cancel(); + cancellationTokenSource?.Dispose(); } } \ No newline at end of file diff --git a/Assets/Scripts/Presenter/ProgramPresenter.cs b/Assets/Scripts/Presenter/ProgramPresenter.cs index dd72aaa..fddf738 100644 --- a/Assets/Scripts/Presenter/ProgramPresenter.cs +++ b/Assets/Scripts/Presenter/ProgramPresenter.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; +using System.Net.Sockets; using System.Threading.Tasks; using UnityEngine; +using UnityEngine.UIElements; using UnityEngine.XR.ARSubsystems; public enum PopupState @@ -16,16 +18,16 @@ public enum PopupState public class ProgramPresenter { private ProgramModel model; - private IProgramView view; + private ProgramView view; private TCPView tcpView; private RobotController controlledRobot; private string _programId; private bool lastKnownMotorState = false; - private IInteractionView interactionView; - private IPointManagerView pointManagerView; - private IPathLineView pathLineView; - private IPopupView popupView; + private InteractionView interactionView; + private PointManagerView pointManagerView; + private PathLineView pathLineView; + private PopupView popupView; private PopupState currentPopupState = PopupState.None; private RobotData pendingPointData; // ˾â ٸ ӽ @@ -33,12 +35,16 @@ public class ProgramPresenter private bool IsDragging = false; - public ProgramPresenter(ProgramModel model, IProgramView view, TCPView tcpView, - IInteractionView interactionView, IPointManagerView pmView, IPopupView popView, IPathLineView pathLineView) + public ProgramPresenter(ProgramModel model, ProgramView view, TCPView tcpView, + InteractionView interactionView, PointManagerView pmView, PopupView popView, PathLineView pathLineView) { this.model = model; this.view = view; this.tcpView = tcpView; + this.interactionView = interactionView; + this.pointManagerView = pmView; + this.popupView = popView; + this.pathLineView = pathLineView; this.view.OnCreateProgramClicked += async (id) => await HandleCreateProgram(id); this.view.OnLoadProgramListRequested += HandleLoadProgramList; @@ -48,11 +54,12 @@ public class ProgramPresenter this.view.OnAddPointClicked += HandleAddPoint; this.tcpView.OnTCPupdateRequested += HandleTCPViewUpdate; - //this.interactionView.OnRobotReleased += HandleRobotReleased; + this.interactionView.OnRobotGrabbed += HandleRobotGrabbed; + this.interactionView.OnRobotReleased += HandleRobotReleased; //this.interactionView.OnPointClicked += HandlePointClicked; - //this.interactionView.OnPointDragStart += HandlePointDragStart; - //this.interactionView.OnPointDragUpdate += HandlePointDragUpdate; - //this.interactionView.OnPointDragEnd += HandlePointDragEnd; + this.interactionView.OnPointDragStart += HandlePointDragStart; + this.interactionView.OnPointDragUpdate += HandlePointDragUpdate; + this.interactionView.OnPointDragEnd += HandlePointDragEnd; //this.popupView.OnPopupResponse += HandlePopupResponse; } @@ -60,7 +67,8 @@ public class ProgramPresenter public void RegisterControlledRobot(RobotController robot) { this.controlledRobot = robot; - this.controlledRobot.OnPoseUpdateRequest += HandlePoseViewUpdate; + this.controlledRobot.OnPoseUpdateRequest += HandleGETPose; + //this.controlledRobot.OnPoseUpdateReceive += HandlePOSTPose; } public async Task UpdateMotorStateAsync() @@ -157,19 +165,58 @@ public class ProgramPresenter } } - // --- ǽð ȭ --- - private void HandlePoseViewUpdate() + // --- ǽð ȭ(->3d) --- + private void HandleGETPose() { + //Debug.Log($"⵿ȭ : {interactionView.isGrabbingRobot}"); + //if (interactionView.isGrabbingRobot) + // return; // 3d -> ̸ + RobotData data = model.GetLatestRobotData(); - controlledRobot.SetRobotPosition(data); // 3D κ ġ Ʈ + if (data != null) + { + controlledRobot.DisableIK(); + controlledRobot.SetRobotPosition(data); // 3D κ ġ Ʈ + } + } + + // --- ǽð ȭ(3d->) --- + private RobotData ConvertPoseToRobotData(Vector3 newWorldPos, Quaternion newWorldRot) + { + RobotData targetPose = new RobotData(); + + targetPose.x = Convert.ToSingle(Math.Round(-1 * newWorldPos.x * 1000, 2)); + targetPose.y = Convert.ToSingle(Math.Round(-1 * newWorldPos.z * 1000, 2)); // Unity Z -> Robot Y + targetPose.z = Convert.ToSingle(Math.Round(newWorldPos.y * 1000, 2)); // Unity Y -> Robot Z + + Vector3 eulerAngles = newWorldRot.eulerAngles; + + targetPose.rx = Convert.ToSingle(Math.Round(eulerAngles.x, 2)); + targetPose.ry = Convert.ToSingle(Math.Round(eulerAngles.y, 2)); + targetPose.rz = Convert.ToSingle(Math.Round(eulerAngles.z, 2)); + + return targetPose; + } + + private async void HandleRobotGrabbed(Vector3 newWorldPos, Quaternion newWorldRot) + { + // controlledRobot.EnableIK(); + + RobotData newPose = ConvertPoseToRobotData(newWorldPos, newWorldRot); + + await model.StreamPoseUdpAsync(newPose); } // --- Ʈ ߰ --- private void HandleRobotReleased(RobotData pose) { - pendingPointData = pose; // 1. ӽ - currentPopupState = PopupState.ConfirmAddPoint; // 2. - popupView.ShowConfirmPopup("ġ Ȯ", " ġ Ʈ Ͻðڽϱ?"); // 3. ˾ û + IsDragging = false; + //controlledRobot.DisableIK(); + interactionView.isGrabbingRobot = false; + HandleGETPose(); + //pendingPointData = pose; // ӽ + //currentPopupState = PopupState.ConfirmAddPoint; // + //popupView.ShowConfirmPopup("ġ Ȯ", " ġ Ʈ Ͻðڽϱ?"); // ˾ û } // --- Ʈ Ŭ --- @@ -186,6 +233,8 @@ public class ProgramPresenter private void HandlePointDragStart(int index) { IsDragging = true; + controlledRobot.EnableIK(); + activePointIndex = index; originalDragPose = model.CurrentProgram.GetStepPose(index); @@ -195,20 +244,20 @@ public class ProgramPresenter private async void HandlePointDragUpdate(int index, Vector3 newWorldPos) { - if (!IsDragging) return; + ////if (!IsDragging) return; //RobotData newPose = ConvertVectorToRobotData(newWorldPos); - // Ʈ κ, Ʈ, ǽð ̵ - //interactionView.ShowGhostRobot(newPose); - //pointManagerView.UpdatePointPosition(index, newPose); - //pathLineView.DrawPath(GetFullPathOfProgramWithTempChange(index, newPose)); // ӽ ׸ + //// Ʈ κ, Ʈ, ǽð ̵ + ////interactionView.ShowGhostRobot(newPose); + ////pointManagerView.UpdatePointPosition(index, newPose); + ////pathLineView.DrawPath(GetFullPathOfProgramWithTempChange(index, newPose)); // ӽ ׸ - //await model.StreamPoseToRobotUdpAsync(newPose); + //await model.StreamPoseToRobotUdpAsync(newWorldPos); } private void HandlePointDragEnd(int index) { - //IsDragging = false; + IsDragging = false; //interactionView.HideDragArrow(); //interactionView.HideGhostRobot(); @@ -302,5 +351,12 @@ public class ProgramPresenter this.view.OnSaveClicked -= HandleSaveProgram; this.view.OnAddPointClicked -= HandleAddPoint; this.tcpView.OnTCPupdateRequested -= HandleTCPViewUpdate; + this.controlledRobot.OnPoseUpdateRequest -= HandleGETPose; + //this.controlledRobot.OnPoseUpdateReceive -= HandlePOSTPose; + this.interactionView.OnRobotGrabbed -= HandleRobotGrabbed; + this.interactionView.OnRobotReleased -= HandleRobotReleased; + this.interactionView.OnPointDragStart -= HandlePointDragStart; + this.interactionView.OnPointDragUpdate -= HandlePointDragUpdate; + this.interactionView.OnPointDragEnd -= HandlePointDragEnd; } } \ No newline at end of file diff --git a/Assets/Scripts/View/InteractionView.cs b/Assets/Scripts/View/InteractionView.cs index e8a086d..bc64e21 100644 --- a/Assets/Scripts/View/InteractionView.cs +++ b/Assets/Scripts/View/InteractionView.cs @@ -1,9 +1,12 @@ using System; using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; // Presenter InteractionView ϱ ̽ public interface IInteractionView { + event Action OnRobotGrabbed; // VR Ʈѷ κ Ҵ ߻ event Action OnRobotReleased; // VR Ʈѷ Ư Ʈ Ŭ ߻ @@ -20,38 +23,139 @@ public interface IInteractionView void HideDragArrow(); } -// ( ũƮ VR Ʈѷ ִ پ մϴ) public class InteractionView : MonoBehaviour, IInteractionView { + public event Action OnRobotGrabbed; public event Action OnRobotReleased; public event Action OnPointClicked; public event Action OnPointDragStart; public event Action OnPointDragUpdate; public event Action OnPointDragEnd; + private XRBaseInteractor interactor; + + private bool isInitialized = false; + private bool isGrabbingPoint = false; + private int currentGrabbedPointIndex = -1; + + public bool isGrabbingRobot = false; + + void Start() + { + // Ray Interactor Direct Interactor ó ֵ XRBaseInteractor + interactor = GetComponent(); + if (interactor == null) + { + Debug.LogError("InteractionView requires an XRBaseInteractor (Ray or Direct) on the same GameObject.", this); + return; + } + } + + // --- ǽð Ʈ Update --- void Update() { - // Ʈѷ κ ִ - // if (IsGrabbingRobot()) { ... } + if (isInitialized) + { + if (isGrabbingPoint) + { + Vector3 currentControllerPosition = interactor.attachTransform.position; + OnPointDragUpdate?.Invoke(currentGrabbedPointIndex, currentControllerPosition); + } + else if(isGrabbingRobot) + { + Vector3 currentHandleTransform = interactor.attachTransform.position; + Quaternion currentControllerRotation = interactor.attachTransform.rotation; + OnRobotGrabbed?.Invoke(currentHandleTransform, currentControllerRotation); + } + } + else + { + if (interactor == null) + { + interactor = GetComponentInChildren(true); + } + if (interactor != null && interactor.gameObject.activeInHierarchy) + { + InitializeInteraction(); + } + } + } - // Ʈѷ ׷ ư - // if (OnGrabRelease()) - // { - // RobotData currentPose = GetCurrentRobotPose(); - // OnRobotReleased?.Invoke(currentPose); // 2. "ġ Ȯ?" ˾ û - // } + private void InitializeInteraction() + { + // XRI ̺Ʈ + interactor.selectEntered.AddListener(HandleGrabStart); + interactor.selectExited.AddListener(HandleGrabEnd); - // Ʈѷ Ʈ Ŭ - // if (OnPointClick(out int clickedPointIndex)) - // { - // OnPointClicked?.Invoke(clickedPointIndex); // 8. "̵/?" ˾ û - // } + // 'Ŭ' Ϸ interactor.activated ̺Ʈ ؾ - // Ʈѷ Ʈ (巡 ) - // if (OnPointHold(out int draggedPointIndex)) - // { - // OnPointDragStart?.Invoke(draggedPointIndex); // 5. 巡 - // } + isInitialized = true; + AppManager.Instance.RegisterView(this); + Debug.Log("InteractionView ʱȭ Ϸ. Interactor ̺Ʈ ."); + } + + private void OnDestroy() + { + if (interactor != null) + { + interactor.selectEntered.RemoveListener(HandleGrabStart); + interactor.selectExited.RemoveListener(HandleGrabEnd); + } + } + + // --- XRI ̺Ʈ ڵ鷯 --- + + // "" ư + private void HandleGrabStart(SelectEnterEventArgs args) + { + // Ʈ + GameObject grabbedGO = args.interactableObject.transform.gameObject; + + //// "Ʈ" Ȯ (RobotPoint ũƮ Ž) + //RobotPoint point = grabbedGO.GetComponent(); + //if (point != null) + //{ + // isGrabbingPoint = true; + // currentGrabbedPointIndex = point.pointIndex; + + // // Presenter "巡 " ̺Ʈ + // OnPointDragStart?.Invoke(currentGrabbedPointIndex); + //} + // "κ" Ȯ + if (grabbedGO.CompareTag("RobotArm")) + { + isGrabbingRobot = true; + } + } + + // "" ư + private void HandleGrabEnd(SelectExitEventArgs args) + { + // "Ʈ" ִ ̾ٸ + if (isGrabbingPoint) + { + // Presenter "巡 " ̺Ʈ (˾ Ʈſ) + OnPointDragEnd?.Invoke(currentGrabbedPointIndex); + } + // "κ" ִ ̾ٸ + else if (isGrabbingRobot) + { + // Presenter "κ " ̺Ʈ (˾ Ʈſ) + RobotData currentPose = GetCurrentRobotPoseFromController(); + OnRobotReleased?.Invoke(currentPose); + } + + // ʱȭ + isGrabbingPoint = false; + currentGrabbedPointIndex = -1; + } + + private RobotData GetCurrentRobotPoseFromController() + { + // View Presenter ȯ (ConvertVrToRobotPose) Ƿ, + // Ʈѷ ġ/ȸ '¥' RobotData + // Presenter ͸ ޾ ٽ ȯ(Ǵ )ؾ + return new RobotData(); // ӽ } // --- Presenter ȣ Լ --- diff --git a/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Hands Variant.prefab b/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Hands Variant.prefab index 02e23dc..03ec3b0 100644 --- a/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Hands Variant.prefab +++ b/Assets/VRTemplateAssets/Prefabs/Setup/Complete XR Origin Set Up Hands Variant.prefab @@ -618,7 +618,19 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 657184242222895506, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} insertIndex: -1 addedObject: {fileID: 1632400500797467239} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 657184243640684908, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + insertIndex: -1 + addedObject: {fileID: 3516698780648971481} + - targetCorrespondingSourceObject: {fileID: 657184242222895507, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + insertIndex: -1 + addedObject: {fileID: 6543791313805139832} + - targetCorrespondingSourceObject: {fileID: 6355494128053973299, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + insertIndex: -1 + addedObject: {fileID: 8047923434058926918} + - targetCorrespondingSourceObject: {fileID: 1800725127586568702, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + insertIndex: -1 + addedObject: {fileID: 4059851328209584392} m_SourcePrefab: {fileID: 100100000, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} --- !u!114 &866406836232131125 stripped MonoBehaviour: @@ -653,6 +665,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 75b29b6c6428c984a8a73ffc2d58063b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &4381072889419385576 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6355494128053973299, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + m_PrefabInstance: {fileID: 7277802326999645147} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8047923434058926918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4381072889419385576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1b136fe9693203418aa8d9bacb7cfcf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7917674758240283208 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 657184242222895507, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + m_PrefabInstance: {fileID: 7277802326999645147} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6543791313805139832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7917674758240283208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1b136fe9693203418aa8d9bacb7cfcf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &7917674758240283209 stripped Transform: m_CorrespondingSourceObject: {fileID: 657184242222895506, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} @@ -668,6 +714,23 @@ Transform: m_CorrespondingSourceObject: {fileID: 657184243640684915, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} m_PrefabInstance: {fileID: 7277802326999645147} m_PrefabAsset: {fileID: 0} +--- !u!1 &7917674758919744183 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 657184243640684908, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + m_PrefabInstance: {fileID: 7277802326999645147} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3516698780648971481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7917674758919744183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1b136fe9693203418aa8d9bacb7cfcf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &8053059486601427065 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 810019319561094050, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} @@ -684,3 +747,20 @@ Transform: m_CorrespondingSourceObject: {fileID: 1684926014057179930, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} m_PrefabInstance: {fileID: 7277802326999645147} m_PrefabAsset: {fileID: 0} +--- !u!1 &8935853449824297509 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1800725127586568702, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + m_PrefabInstance: {fileID: 7277802326999645147} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4059851328209584392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8935853449824297509} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1b136fe9693203418aa8d9bacb7cfcf, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 7e69d25..b97216a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 3 tags: - Anchor + - RobotArm layers: - Default - TransparentFX