mirror of
https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git
synced 2025-01-22 07:09:01 -05:00
Merge pull request 'bugfix/2204-Fix-Teleportation-On-Vive' (#32) from bugfix/2204-Fix-Teleportation-On-Vive into development
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/32
This commit is contained in:
Joshua Latham
commit
f1c86606bd
@ -329,7 +329,11 @@ PrefabInstance:
|
||||
- target: {fileID: 3528166653513292799, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_InteractionManager
|
||||
value:
|
||||
objectReference: {fileID: 1874824779}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3528166653513292799, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_InteractionLayers.m_Bits
|
||||
value: 2147483648
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3662649347706538169, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
@ -646,6 +650,14 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106111590868155510, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8106111590868155510, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_InteractionLayers.m_Bits
|
||||
value: 2147483648
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8730039991434424395, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
@ -703,11 +715,12 @@ PrefabInstance:
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 9066086382404825376, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3}
|
||||
--- !u!114 &1874824779 stripped
|
||||
--- !u!114 &1920805969 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 1652381695448977783, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
m_PrefabInstance: {fileID: 9070320327174004474}
|
||||
@ -726,6 +739,46 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 540459367475023178, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 685950657878190999, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: b317f5b7e6a07a34496fc07e2469f368, type: 2}
|
||||
- target: {fileID: 1100151162313162810, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -0.0321
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1693138946238447057, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_EnableFreeYMovement
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1859934563658731768, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1859934563658731768, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1859934563658731768, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1859934563658731768, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1859934563658731768, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1859934563658731768, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2232222763306151469, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.015
|
||||
@ -766,10 +819,134 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.0006
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.0027
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2746058932850546719, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3171061758723398214, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: textMeshPro
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_PositionAction.m_Reference
|
||||
value:
|
||||
objectReference: {fileID: 9126875591944302883, guid: c348712bda248c246b8c49b3db54643f, type: 3}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_RotationAction.m_Reference
|
||||
value:
|
||||
objectReference: {fileID: -3870559572202308136, guid: c348712bda248c246b8c49b3db54643f, type: 3}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_IsTrackedAction.m_Reference
|
||||
value:
|
||||
objectReference: {fileID: -7044516463258014562, guid: c348712bda248c246b8c49b3db54643f, type: 3}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_PositionAction.m_UseReference
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_RotationAction.m_UseReference
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_IsTrackedAction.m_UseReference
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_TrackingStateAction.m_Reference
|
||||
value:
|
||||
objectReference: {fileID: -1277054153949319361, guid: c348712bda248c246b8c49b3db54643f, type: 3}
|
||||
- target: {fileID: 4543501289064269059, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_TrackingStateAction.m_UseReference
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4678866017896952928, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_InteractionManager
|
||||
value:
|
||||
objectReference: {fileID: 1920805969}
|
||||
- target: {fileID: 4883245426080499922, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4883245426080499922, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.04
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5199386814634172582, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: watchOffsetRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5199386814634172582, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: watchOffsetRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5536342803307029701, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MAVRIC XR Hands Origin v2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6411218601319835270, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_LineType
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_Velocity
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_ReferenceFrame
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7392671680688226507, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_InteractionManager
|
||||
value:
|
||||
objectReference: {fileID: 1920805969}
|
||||
- target: {fileID: 7434633696072330849, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7636121662771443157, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_RequestedTrackingOriginMode
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7782730797006555982, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8936318752350673198, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3}
|
||||
propertyPath: m_CullTransparentMesh
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
Loading…
Reference in New Issue
Block a user