Skip to content

Commit 5c1302e

Browse files
committed
fix(Teleport): fix issue with examples due to teleport code change
The examples relying on teleport all had the `Limit To Nav Mesh` checked meaning without a nav mesh they wouldn't allow teleporting. The `ModelVillage_TeleportLocation` script has also been updated as it doesn't need to register it's own destination event now as the basic teleporter will register events on behalf of other objects.
1 parent 65baf0b commit 5c1302e

14 files changed

+3550
-5603
lines changed

Assets/SteamVR_Unity_Toolkit/Examples/004_CameraRig_BasicTeleport.unity

Lines changed: 134 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,13 @@ MonoBehaviour:
280280
m_Name:
281281
m_EditorClassIdentifier:
282282
enableTeleport: 1
283+
controller: {fileID: 0}
283284
pointerHitColor: {r: 0, g: 0.5, b: 0, a: 1}
284285
pointerMissColor: {r: 0.8, g: 0, b: 0, a: 1}
285286
showPlayAreaCursor: 0
286287
playAreaCursorDimensions: {x: 0, y: 0}
287288
handlePlayAreaCursorCollisions: 0
288-
beamAlwaysOn: 0
289+
pointerVisibility: 0
289290
activateDelay: 0
290291
pointerThickness: 0.002
291292
pointerLength: 100
@@ -369,134 +370,6 @@ Transform:
369370
m_Children: []
370371
m_Father: {fileID: 1907973909}
371372
m_RootOrder: 6
372-
--- !u!43 &421405417
373-
Mesh:
374-
m_ObjectHideFlags: 0
375-
m_PrefabParentObject: {fileID: 0}
376-
m_PrefabInternal: {fileID: 0}
377-
m_Name:
378-
serializedVersion: 8
379-
m_SubMeshes:
380-
- serializedVersion: 2
381-
firstByte: 0
382-
indexCount: 24
383-
topology: 0
384-
firstVertex: 0
385-
vertexCount: 8
386-
localAABB:
387-
m_Center: {x: 0, y: 0.01, z: 0}
388-
m_Extent: {x: 1.2499999, y: 0, z: 0.9000001}
389-
m_Shapes:
390-
vertices: []
391-
shapes: []
392-
channels: []
393-
fullWeights: []
394-
m_BindPose: []
395-
m_BoneNameHashes:
396-
m_RootBoneNameHash: 0
397-
m_MeshCompression: 0
398-
m_IsReadable: 1
399-
m_KeepVertices: 1
400-
m_KeepIndices: 1
401-
m_IndexBuffer: 000001000400010005000400010002000500020006000500020003000600030007000600030000000700000004000700
402-
m_Skin: []
403-
m_VertexData:
404-
m_CurrentChannels: 13
405-
m_VertexCount: 8
406-
m_Channels:
407-
- stream: 0
408-
offset: 0
409-
format: 0
410-
dimension: 3
411-
- stream: 0
412-
offset: 0
413-
format: 0
414-
dimension: 0
415-
- stream: 0
416-
offset: 12
417-
format: 0
418-
dimension: 4
419-
- stream: 0
420-
offset: 28
421-
format: 0
422-
dimension: 2
423-
- stream: 0
424-
offset: 0
425-
format: 0
426-
dimension: 0
427-
- stream: 0
428-
offset: 0
429-
format: 0
430-
dimension: 0
431-
- stream: 0
432-
offset: 0
433-
format: 0
434-
dimension: 0
435-
- stream: 0
436-
offset: 0
437-
format: 0
438-
dimension: 0
439-
m_DataSize: 288
440-
_typelessdata: cccc8c3f0ad7233c020040bf000000000000803f0000803f0000803f0000000000000000cccc8cbf0ad7233c020040bf000000000000803f0000803f0000803f0000803f00000000cccc8cbf0ad7233c0200403f000000000000803f0000803f0000803f0000000000000000cccc8c3f0ad7233c0200403f000000000000803f0000803f0000803f0000803f00000000ffff9f3f0ad7233c686666bf000000000000803f0000803f00000000000000000000803fffff9fbf0ad7233c686666bf000000000000803f0000803f000000000000803f0000803fffff9fbf0ad7233c6866663f000000000000803f0000803f00000000000000000000803fffff9f3f0ad7233c6866663f000000000000803f0000803f000000000000803f0000803f
441-
m_CompressedMesh:
442-
m_Vertices:
443-
m_NumItems: 0
444-
m_Range: 0
445-
m_Start: 0
446-
m_Data:
447-
m_BitSize: 0
448-
m_UV:
449-
m_NumItems: 0
450-
m_Range: 0
451-
m_Start: 0
452-
m_Data:
453-
m_BitSize: 0
454-
m_Normals:
455-
m_NumItems: 0
456-
m_Range: 0
457-
m_Start: 0
458-
m_Data:
459-
m_BitSize: 0
460-
m_Tangents:
461-
m_NumItems: 0
462-
m_Range: 0
463-
m_Start: 0
464-
m_Data:
465-
m_BitSize: 0
466-
m_Weights:
467-
m_NumItems: 0
468-
m_Data:
469-
m_BitSize: 0
470-
m_NormalSigns:
471-
m_NumItems: 0
472-
m_Data:
473-
m_BitSize: 0
474-
m_TangentSigns:
475-
m_NumItems: 0
476-
m_Data:
477-
m_BitSize: 0
478-
m_FloatColors:
479-
m_NumItems: 0
480-
m_Range: 0
481-
m_Start: 0
482-
m_Data:
483-
m_BitSize: 0
484-
m_BoneIndices:
485-
m_NumItems: 0
486-
m_Data:
487-
m_BitSize: 0
488-
m_Triangles:
489-
m_NumItems: 0
490-
m_Data:
491-
m_BitSize: 0
492-
m_UVInfo: 0
493-
m_LocalAABB:
494-
m_Center: {x: 0, y: 0.01, z: 0}
495-
m_Extent: {x: 1.2499999, y: 0, z: 0.9000001}
496-
m_MeshUsageFlags: 0
497-
m_BakedConvexCollisionMesh:
498-
m_BakedTriangleCollisionMesh:
499-
m_MeshOptimized: 0
500373
--- !u!1 &540946614 stripped
501374
GameObject:
502375
m_PrefabParentObject: {fileID: 149372, guid: 1bb80779de0d85b4bba906974dbaa477, type: 2}
@@ -540,12 +413,13 @@ MonoBehaviour:
540413
m_Name:
541414
m_EditorClassIdentifier:
542415
enableTeleport: 1
416+
controller: {fileID: 0}
543417
pointerHitColor: {r: 0, g: 0.5, b: 0, a: 1}
544418
pointerMissColor: {r: 0.8, g: 0, b: 0, a: 1}
545419
showPlayAreaCursor: 0
546420
playAreaCursorDimensions: {x: 0, y: 0}
547421
handlePlayAreaCursorCollisions: 0
548-
beamAlwaysOn: 0
422+
pointerVisibility: 0
549423
activateDelay: 0
550424
pointerThickness: 0.002
551425
pointerLength: 100
@@ -671,7 +545,7 @@ Prefab:
671545
- target: {fileID: 3376060, guid: 1bb80779de0d85b4bba906974dbaa477, type: 2}
672546
propertyPath: m_Mesh
673547
value:
674-
objectReference: {fileID: 421405417}
548+
objectReference: {fileID: 1951047359}
675549
m_RemovedComponents: []
676550
m_ParentPrefab: {fileID: 100100000, guid: 1bb80779de0d85b4bba906974dbaa477, type: 2}
677551
m_IsPrefabParent: 0
@@ -998,6 +872,7 @@ MonoBehaviour:
998872
distanceBlinkDelay: 0
999873
headsetPositionCompensation: 1
1000874
ignoreTargetWithTagOrClass:
875+
limitToNavMesh: 0
1001876
--- !u!1 &1888186376
1002877
GameObject:
1003878
m_ObjectHideFlags: 0
@@ -1109,6 +984,134 @@ Transform:
1109984
- {fileID: 304210281}
1110985
m_Father: {fileID: 0}
1111986
m_RootOrder: 4
987+
--- !u!43 &1951047359
988+
Mesh:
989+
m_ObjectHideFlags: 0
990+
m_PrefabParentObject: {fileID: 0}
991+
m_PrefabInternal: {fileID: 0}
992+
m_Name:
993+
serializedVersion: 8
994+
m_SubMeshes:
995+
- serializedVersion: 2
996+
firstByte: 0
997+
indexCount: 24
998+
topology: 0
999+
firstVertex: 0
1000+
vertexCount: 8
1001+
localAABB:
1002+
m_Center: {x: 0, y: 0.01, z: 0}
1003+
m_Extent: {x: 1.2499999, y: 0, z: 0.9000001}
1004+
m_Shapes:
1005+
vertices: []
1006+
shapes: []
1007+
channels: []
1008+
fullWeights: []
1009+
m_BindPose: []
1010+
m_BoneNameHashes:
1011+
m_RootBoneNameHash: 0
1012+
m_MeshCompression: 0
1013+
m_IsReadable: 1
1014+
m_KeepVertices: 1
1015+
m_KeepIndices: 1
1016+
m_IndexBuffer: 000001000400010005000400010002000500020006000500020003000600030007000600030000000700000004000700
1017+
m_Skin: []
1018+
m_VertexData:
1019+
m_CurrentChannels: 13
1020+
m_VertexCount: 8
1021+
m_Channels:
1022+
- stream: 0
1023+
offset: 0
1024+
format: 0
1025+
dimension: 3
1026+
- stream: 0
1027+
offset: 0
1028+
format: 0
1029+
dimension: 0
1030+
- stream: 0
1031+
offset: 12
1032+
format: 0
1033+
dimension: 4
1034+
- stream: 0
1035+
offset: 28
1036+
format: 0
1037+
dimension: 2
1038+
- stream: 0
1039+
offset: 0
1040+
format: 0
1041+
dimension: 0
1042+
- stream: 0
1043+
offset: 0
1044+
format: 0
1045+
dimension: 0
1046+
- stream: 0
1047+
offset: 0
1048+
format: 0
1049+
dimension: 0
1050+
- stream: 0
1051+
offset: 0
1052+
format: 0
1053+
dimension: 0
1054+
m_DataSize: 288
1055+
_typelessdata: cccc8c3f0ad7233c020040bf000000000000803f0000803f0000803f0000000000000000cccc8cbf0ad7233c020040bf000000000000803f0000803f0000803f0000803f00000000cccc8cbf0ad7233c0200403f000000000000803f0000803f0000803f0000000000000000cccc8c3f0ad7233c0200403f000000000000803f0000803f0000803f0000803f00000000ffff9f3f0ad7233c686666bf000000000000803f0000803f00000000000000000000803fffff9fbf0ad7233c686666bf000000000000803f0000803f000000000000803f0000803fffff9fbf0ad7233c6866663f000000000000803f0000803f00000000000000000000803fffff9f3f0ad7233c6866663f000000000000803f0000803f000000000000803f0000803f
1056+
m_CompressedMesh:
1057+
m_Vertices:
1058+
m_NumItems: 0
1059+
m_Range: 0
1060+
m_Start: 0
1061+
m_Data:
1062+
m_BitSize: 0
1063+
m_UV:
1064+
m_NumItems: 0
1065+
m_Range: 0
1066+
m_Start: 0
1067+
m_Data:
1068+
m_BitSize: 0
1069+
m_Normals:
1070+
m_NumItems: 0
1071+
m_Range: 0
1072+
m_Start: 0
1073+
m_Data:
1074+
m_BitSize: 0
1075+
m_Tangents:
1076+
m_NumItems: 0
1077+
m_Range: 0
1078+
m_Start: 0
1079+
m_Data:
1080+
m_BitSize: 0
1081+
m_Weights:
1082+
m_NumItems: 0
1083+
m_Data:
1084+
m_BitSize: 0
1085+
m_NormalSigns:
1086+
m_NumItems: 0
1087+
m_Data:
1088+
m_BitSize: 0
1089+
m_TangentSigns:
1090+
m_NumItems: 0
1091+
m_Data:
1092+
m_BitSize: 0
1093+
m_FloatColors:
1094+
m_NumItems: 0
1095+
m_Range: 0
1096+
m_Start: 0
1097+
m_Data:
1098+
m_BitSize: 0
1099+
m_BoneIndices:
1100+
m_NumItems: 0
1101+
m_Data:
1102+
m_BitSize: 0
1103+
m_Triangles:
1104+
m_NumItems: 0
1105+
m_Data:
1106+
m_BitSize: 0
1107+
m_UVInfo: 0
1108+
m_LocalAABB:
1109+
m_Center: {x: 0, y: 0.01, z: 0}
1110+
m_Extent: {x: 1.2499999, y: 0, z: 0.9000001}
1111+
m_MeshUsageFlags: 0
1112+
m_BakedConvexCollisionMesh:
1113+
m_BakedTriangleCollisionMesh:
1114+
m_MeshOptimized: 0
11121115
--- !u!1 &2123877843
11131116
GameObject:
11141117
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)