From cf4e7c66fdb9bad48258913ca0dc1ae80f648c2b Mon Sep 17 00:00:00 2001 From: Mark Joshwel Date: Fri, 31 Jan 2025 19:30:03 +0800 Subject: [PATCH] game(interaction/drawer): fixed xr origin --- .../Scenes/DrawerInteractionPlayground.unity | 356 +++--------------- 1 file changed, 57 insertions(+), 299 deletions(-) diff --git a/Game/Assets/Scenes/DrawerInteractionPlayground.unity b/Game/Assets/Scenes/DrawerInteractionPlayground.unity index 8f59699..b87a559 100644 --- a/Game/Assets/Scenes/DrawerInteractionPlayground.unity +++ b/Game/Assets/Scenes/DrawerInteractionPlayground.unity @@ -333,240 +333,63 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &227016488 -GameObject: +--- !u!1001 &391301144 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 227016489} - m_Layer: 0 - m_Name: Camera Offset - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &227016489 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227016488} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.1176, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 542109478} - m_Father: {fileID: 1549486125} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &542109477 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 542109478} - - component: {fileID: 542109481} - - component: {fileID: 542109480} - - component: {fileID: 542109479} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &542109478 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542109477} - 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: 227016489} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &542109479 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542109477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackingType: 0 - m_UpdateType: 0 - m_IgnoreTrackingState: 0 - m_PositionInput: - m_UseReference: 0 - m_Action: - m_Name: Position - m_Type: 0 - m_ExpectedControlType: Vector3 - m_Id: 24d7f3de-1e94-432a-90e7-b73bd9925d0b - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: 256ec7d9-d27f-41ec-9c09-ecf6077525c5 - m_Path: /centerEyePosition - m_Interactions: - m_Processors: - m_Groups: - m_Action: Position - m_Flags: 0 - - m_Name: - m_Id: ba2de741-7dd0-45d8-ac80-64e01660d217 - m_Path: /devicePosition - m_Interactions: - m_Processors: - m_Groups: - m_Action: Position - m_Flags: 0 - m_Flags: 0 - m_Reference: {fileID: 0} - m_RotationInput: - m_UseReference: 0 - m_Action: - m_Name: Rotation - m_Type: 0 - m_ExpectedControlType: Quaternion - m_Id: bddb0590-7f94-4bfe-b9c4-d99440488d93 - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: a3fd521d-e81c-4767-b2d7-7b829a02d6fa - m_Path: /centerEyeRotation - m_Interactions: - m_Processors: - m_Groups: - m_Action: Rotation - m_Flags: 0 - - m_Name: - m_Id: eb087236-4fda-4e09-90ec-ca1710ec9d1d - m_Path: /deviceRotation - m_Interactions: - m_Processors: - m_Groups: - m_Action: Rotation - m_Flags: 0 - m_Flags: 0 - m_Reference: {fileID: 0} - m_TrackingStateInput: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: Integer - m_Id: 1dc016ee-f00b-428a-ad9c-a2176dd29af6 - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: 08b0c00b-60e7-4142-b1ac-a417d7f4e950 - m_Path: /trackingState - m_Interactions: - m_Processors: - m_Groups: - m_Action: Tracking State - m_Flags: 0 - m_Flags: 0 - m_Reference: {fileID: 0} - m_PositionAction: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: 912623b6-b282-4542-b6a2-b435584f135b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_RotationAction: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: 7dd95a0f-28b2-49a5-8d6c-757db260463c - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 ---- !u!81 &542109480 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542109477} - m_Enabled: 1 ---- !u!20 &542109481 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542109477} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.01 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1717954561962503725, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_Name + value: XR Origin (XR Rig) + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} --- !u!1 &750816880 GameObject: m_ObjectHideFlags: 0 @@ -1309,71 +1132,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f08520c74595f984ca1507db4e8aaa41, type: 3} ---- !u!1 &1549486122 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549486125} - - component: {fileID: 1549486124} - - component: {fileID: 1549486123} - m_Layer: 0 - m_Name: XR Origin (VR) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1549486123 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549486122} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 017c5e3933235514c9520e1dace2a4b2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ActionAssets: - - {fileID: -944628639613478452, guid: c348712bda248c246b8c49b3db54643f, type: 3} ---- !u!114 &1549486124 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549486122} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Camera: {fileID: 542109481} - m_OriginBaseGameObject: {fileID: 1549486122} - m_CameraFloorOffsetObject: {fileID: 227016488} - m_RequestedTrackingOriginMode: 0 - m_CameraYOffset: 1.1176 ---- !u!4 &1549486125 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549486122} - 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: - - {fileID: 227016489} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1614766243 Mesh: m_ObjectHideFlags: 0 @@ -1639,7 +1397,7 @@ Transform: m_GameObject: {fileID: 1839797121} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.29655266, z: 1.75} + m_LocalPosition: {x: 0, y: 0, z: 1.75} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1817,5 +1575,5 @@ SceneRoots: - {fileID: 750816882} - {fileID: 1428704711} - {fileID: 98555320} - - {fileID: 1549486125} - {fileID: 1839797125} + - {fileID: 391301144}