Skip to content

Commit b9dd895

Browse files
chris-massiechris-massie
authored
Merge pull request #66 from Unity-Technologies/staging-1.0.0-pre.4
Update examples for 1.0.0-pre.4
2 parents 4461c5c + 7383d26 commit b9dd895

30 files changed

+210
-33
lines changed

‎AR/Packages/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"com.unity.xr.arcore": "2.1.16",
1818
"com.unity.xr.arfoundation": "2.1.16",
1919
"com.unity.xr.arkit": "2.1.16",
20-
"com.unity.xr.interaction.toolkit": "1.0.0-pre.3",
20+
"com.unity.xr.interaction.toolkit": "1.0.0-pre.4",
2121
"com.unity.xr.management": "3.2.17",
2222
"com.unity.modules.ai": "1.0.0",
2323
"com.unity.modules.androidjni": "1.0.0",

‎AR/Packages/packages-lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"url": "https://packages.unity.com"
165165
},
166166
"com.unity.xr.interaction.toolkit": {
167-
"version": "1.0.0-pre.3",
167+
"version": "1.0.0-pre.4",
168168
"depth": 0,
169169
"source": "registry",
170170
"dependencies": {

‎VR/Assets/Prefabs/DeprecatedXRRigDemo.prefab‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ MonoBehaviour:
5151
m_EnableInputActions: 1
5252
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
5353
type: 3}
54-
m_ModelTransform: {fileID: 1717954561063364409}
54+
m_ModelParent: {fileID: 1717954561063364409}
55+
m_Model: {fileID: 0}
5556
m_AnimateModel: 0
5657
m_ModelSelectTransition:
5758
m_ModelDeSelectTransition:
@@ -264,7 +265,8 @@ MonoBehaviour:
264265
m_EnableInputActions: 1
265266
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
266267
type: 3}
267-
m_ModelTransform: {fileID: 1717954560623744797}
268+
m_ModelParent: {fileID: 1717954560623744797}
269+
m_Model: {fileID: 0}
268270
m_AnimateModel: 0
269271
m_ModelSelectTransition:
270272
m_ModelDeSelectTransition:
@@ -644,7 +646,8 @@ MonoBehaviour:
644646
m_EnableInputActions: 1
645647
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
646648
type: 3}
647-
m_ModelTransform: {fileID: 1717954561962503726}
649+
m_ModelParent: {fileID: 1717954561962503726}
650+
m_Model: {fileID: 0}
648651
m_AnimateModel: 0
649652
m_ModelSelectTransition:
650653
m_ModelDeSelectTransition:
@@ -1051,7 +1054,8 @@ MonoBehaviour:
10511054
m_EnableInputActions: 1
10521055
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
10531056
type: 3}
1054-
m_ModelTransform: {fileID: 1717954560542311230}
1057+
m_ModelParent: {fileID: 1717954560542311230}
1058+
m_Model: {fileID: 0}
10551059
m_AnimateModel: 0
10561060
m_ModelSelectTransition:
10571061
m_ModelDeSelectTransition:
@@ -1403,7 +1407,7 @@ Transform:
14031407
m_PrefabAsset: {fileID: 0}
14041408
m_GameObject: {fileID: 1717954561314460871}
14051409
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1406-
m_LocalPosition: {x: -0, y: 1.36144, z: -1.438}
1410+
m_LocalPosition: {x: -0, y: 1.36144, z: 0}
14071411
m_LocalScale: {x: 1, y: 1, z: 1}
14081412
m_Children:
14091413
- {fileID: 1717954562053134906}
@@ -1465,9 +1469,10 @@ MonoBehaviour:
14651469
m_RigBaseGameObject: {fileID: 1717954561456925282}
14661470
m_CameraFloorOffsetObject: {fileID: 1717954561314460871}
14671471
m_CameraGameObject: {fileID: 1717954562053134886}
1468-
m_TrackingOriginMode: 1
1469-
m_TrackingSpace: 3
1472+
m_RequestedTrackingOriginMode: 1
14701473
m_CameraYOffset: 1.36144
1474+
m_TrackingSpace: 3
1475+
m_TrackingOriginMode: -2147483648
14711476
--- !u!114 &1717954561456925285
14721477
MonoBehaviour:
14731478
m_ObjectHideFlags: 0

‎VR/Assets/Prefabs/LlamaBubbleGunPrefab.prefab‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ MonoBehaviour:
240240
m_AttachTransform: {fileID: 7850607587320484629}
241241
m_AttachEaseInTime: 0.15
242242
m_MovementType: 2
243+
m_VelocityDamping: 0.4
244+
m_VelocityScale: 1
245+
m_AngularVelocityDamping: 0.4
246+
m_AngularVelocityScale: 0.95
243247
m_TrackPosition: 1
244248
m_SmoothPosition: 0
245249
m_SmoothPositionAmount: 5
@@ -269,6 +273,7 @@ MonoBehaviour:
269273
m_ThrowAngularVelocityScale: 1
270274
m_ForceGravityOnDetach: 0
271275
m_RetainTransformParent: 1
276+
m_AttachPointCompatibilityMode: 0
272277
--- !u!65 &306082267053725907
273278
BoxCollider:
274279
m_ObjectHideFlags: 0
@@ -637,7 +642,7 @@ Transform:
637642
m_PrefabAsset: {fileID: 0}
638643
m_GameObject: {fileID: 3373810049257776468}
639644
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
640-
m_LocalPosition: {x: 0, y: 1.412, z: -0.175}
645+
m_LocalPosition: {x: 0, y: 0.50841, z: -0.175}
641646
m_LocalScale: {x: 1, y: 1, z: 1}
642647
m_Children: []
643648
m_Father: {fileID: 4498450296475097182}

‎VR/Assets/Prefabs/XRRigDemo.prefab‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ MonoBehaviour:
8282
m_EnableInputActions: 1
8383
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
8484
type: 3}
85-
m_ModelTransform: {fileID: 316239220}
85+
m_ModelParent: {fileID: 316239220}
86+
m_Model: {fileID: 0}
8687
m_AnimateModel: 0
8788
m_ModelSelectTransition:
8889
m_ModelDeSelectTransition:
@@ -579,7 +580,8 @@ MonoBehaviour:
579580
m_EnableInputActions: 0
580581
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
581582
type: 3}
582-
m_ModelTransform: {fileID: 153326091}
583+
m_ModelParent: {fileID: 153326091}
584+
m_Model: {fileID: 0}
583585
m_AnimateModel: 0
584586
m_ModelSelectTransition:
585587
m_ModelDeSelectTransition:
@@ -1232,7 +1234,8 @@ MonoBehaviour:
12321234
m_EnableInputActions: 0
12331235
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
12341236
type: 3}
1235-
m_ModelTransform: {fileID: 1499812065}
1237+
m_ModelParent: {fileID: 1499812065}
1238+
m_Model: {fileID: 0}
12361239
m_AnimateModel: 0
12371240
m_ModelSelectTransition:
12381241
m_ModelDeSelectTransition:
@@ -1725,7 +1728,8 @@ MonoBehaviour:
17251728
m_EnableInputActions: 1
17261729
m_ModelPrefab: {fileID: 1306640934352848695, guid: 902b196ba17fa284bae10bdc5878a72d,
17271730
type: 3}
1728-
m_ModelTransform: {fileID: 1980187690}
1731+
m_ModelParent: {fileID: 1980187690}
1732+
m_Model: {fileID: 0}
17291733
m_AnimateModel: 0
17301734
m_ModelSelectTransition:
17311735
m_ModelDeSelectTransition:
@@ -1937,7 +1941,7 @@ Transform:
19371941
m_PrefabAsset: {fileID: 0}
19381942
m_GameObject: {fileID: 1680501586}
19391943
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1940-
m_LocalPosition: {x: 0, y: 1.36144, z: -1.438}
1944+
m_LocalPosition: {x: 0, y: 1.36144, z: 0}
19411945
m_LocalScale: {x: 1, y: 1, z: 1}
19421946
m_Children:
19431947
- {fileID: 1767192434}
@@ -2202,9 +2206,10 @@ MonoBehaviour:
22022206
m_RigBaseGameObject: {fileID: 1717954561962503725}
22032207
m_CameraFloorOffsetObject: {fileID: 1680501586}
22042208
m_CameraGameObject: {fileID: 1767192433}
2205-
m_TrackingOriginMode: 1
2206-
m_TrackingSpace: 3
2209+
m_RequestedTrackingOriginMode: 1
22072210
m_CameraYOffset: 1.36144
2211+
m_TrackingSpace: 3
2212+
m_TrackingOriginMode: -2147483648
22082213
--- !u!114 &6232745470614056085
22092214
MonoBehaviour:
22102215
m_ObjectHideFlags: 0

VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.3.meta renamed to VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.4.meta

File renamed without changes.

VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.3/Default Input Actions.meta renamed to VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.4/Default Input Actions.meta

File renamed without changes.

VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.3/Default Input Actions/.sample.json renamed to VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.4/Default Input Actions/.sample.json

File renamed without changes.

VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.3/Default Input Actions/XRI Default Continuous Move.preset renamed to VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.4/Default Input Actions/XRI Default Continuous Move.preset

File renamed without changes.

VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.3/Default Input Actions/XRI Default Continuous Move.preset.meta renamed to VR/Assets/Samples/XR Interaction Toolkit/1.0.0-pre.4/Default Input Actions/XRI Default Continuous Move.preset.meta

File renamed without changes.

0 commit comments

Comments
 (0)