Skip to content

Commit b53408f

Browse files
author
lawwong
committed
Replace with VRCameraHook in prefabs and scenes
1 parent bf27f8d commit b53408f

File tree

5 files changed

+27
-49
lines changed

5 files changed

+27
-49
lines changed

Assets/HTC.UnityPlugin/ViveInputUtility/Examples/6.ControllerManagerSample/ControllerManagerSample.unity

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3129,10 +3129,6 @@ Prefab:
31293129
propertyPath: m_RootOrder
31303130
value: 0
31313131
objectReference: {fileID: 0}
3132-
- target: {fileID: 11411378, guid: cbfd31aaac017204885fcc03f0579a1a, type: 2}
3133-
propertyPath: customModelActiveMode
3134-
value: 1
3135-
objectReference: {fileID: 0}
31363132
m_RemovedComponents: []
31373133
m_ParentPrefab: {fileID: 100100000, guid: cbfd31aaac017204885fcc03f0579a1a, type: 2}
31383134
m_IsPrefabParent: 0

Assets/HTC.UnityPlugin/ViveInputUtility/Examples/7.RoleBindingExample/RoleBindingExample.unity

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,6 @@ GameObject:
20382038
m_Component:
20392039
- 4: {fileID: 1517009474}
20402040
- 20: {fileID: 1517009477}
2041-
- 124: {fileID: 1517009476}
20422041
- 114: {fileID: 1517009475}
20432042
m_Layer: 0
20442043
m_Name: Camera
@@ -2063,23 +2062,14 @@ Transform:
20632062
--- !u!114 &1517009475
20642063
MonoBehaviour:
20652064
m_ObjectHideFlags: 0
2066-
m_PrefabParentObject: {fileID: 11413550, guid: cb3370c18187bb444b240cfb08dcc02f,
2067-
type: 2}
2065+
m_PrefabParentObject: {fileID: 0}
20682066
m_PrefabInternal: {fileID: 0}
20692067
m_GameObject: {fileID: 1517009473}
20702068
m_Enabled: 1
20712069
m_EditorHideFlags: 0
2072-
m_Script: {fileID: 11500000, guid: bcf697fb9de885d47b4c990c8a58936a, type: 3}
2070+
m_Script: {fileID: 11500000, guid: 326f9add24fafee418bdcd053a0324a0, type: 3}
20732071
m_Name:
20742072
m_EditorClassIdentifier:
2075-
--- !u!124 &1517009476
2076-
Behaviour:
2077-
m_ObjectHideFlags: 0
2078-
m_PrefabParentObject: {fileID: 12406598, guid: cb3370c18187bb444b240cfb08dcc02f,
2079-
type: 2}
2080-
m_PrefabInternal: {fileID: 0}
2081-
m_GameObject: {fileID: 1517009473}
2082-
m_Enabled: 1
20832073
--- !u!20 &1517009477
20842074
Camera:
20852075
m_ObjectHideFlags: 0

Assets/HTC.UnityPlugin/ViveInputUtility/Prefabs/ViveCameraRig.prefab

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ GameObject:
2727
- 20: {fileID: 2071970}
2828
- 124: {fileID: 12406598}
2929
- 81: {fileID: 8189340}
30-
- 92: {fileID: 9261234}
31-
- 114: {fileID: 11413550}
30+
- 114: {fileID: 11450330}
3231
m_Layer: 0
3332
m_Name: Camera
3433
m_TagString: MainCamera
@@ -408,13 +407,6 @@ AudioListener:
408407
m_PrefabInternal: {fileID: 100100000}
409408
m_GameObject: {fileID: 116882}
410409
m_Enabled: 1
411-
--- !u!92 &9261234
412-
Behaviour:
413-
m_ObjectHideFlags: 1
414-
m_PrefabParentObject: {fileID: 0}
415-
m_PrefabInternal: {fileID: 100100000}
416-
m_GameObject: {fileID: 116882}
417-
m_Enabled: 1
418410
--- !u!114 &11401118
419411
MonoBehaviour:
420412
m_ObjectHideFlags: 1
@@ -475,17 +467,6 @@ MonoBehaviour:
475467
m_deviceIndex: 0
476468
m_overrideModel: 0
477469
m_overrideShader: {fileID: 0}
478-
--- !u!114 &11413550
479-
MonoBehaviour:
480-
m_ObjectHideFlags: 1
481-
m_PrefabParentObject: {fileID: 0}
482-
m_PrefabInternal: {fileID: 100100000}
483-
m_GameObject: {fileID: 116882}
484-
m_Enabled: 1
485-
m_EditorHideFlags: 0
486-
m_Script: {fileID: 11500000, guid: bcf697fb9de885d47b4c990c8a58936a, type: 3}
487-
m_Name:
488-
m_EditorClassIdentifier:
489470
--- !u!114 &11422458
490471
MonoBehaviour:
491472
m_ObjectHideFlags: 1
@@ -516,6 +497,17 @@ MonoBehaviour:
516497
m_roleTypeFullName: HTC.UnityPlugin.Vive.HandRole
517498
m_roleValueName: RightHand
518499
m_roleValueInt: 0
500+
--- !u!114 &11450330
501+
MonoBehaviour:
502+
m_ObjectHideFlags: 1
503+
m_PrefabParentObject: {fileID: 0}
504+
m_PrefabInternal: {fileID: 100100000}
505+
m_GameObject: {fileID: 116882}
506+
m_Enabled: 1
507+
m_EditorHideFlags: 0
508+
m_Script: {fileID: 11500000, guid: 326f9add24fafee418bdcd053a0324a0, type: 3}
509+
m_Name:
510+
m_EditorClassIdentifier:
519511
--- !u!114 &11450602
520512
MonoBehaviour:
521513
m_ObjectHideFlags: 1

Assets/HTC.UnityPlugin/ViveInputUtility/Prefabs/ViveRig.prefab

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ GameObject:
11921192
m_Component:
11931193
- 4: {fileID: 431768}
11941194
- 20: {fileID: 2029416}
1195-
- 114: {fileID: 11436036}
1195+
- 114: {fileID: 11470140}
11961196
m_Layer: 0
11971197
m_Name: Camera
11981198
m_TagString: MainCamera
@@ -3219,17 +3219,6 @@ MonoBehaviour:
32193219
segmentLength: 0.05
32203220
raycaster: {fileID: 11483628}
32213221
lineRenderer: {fileID: 12010886}
3222-
--- !u!114 &11436036
3223-
MonoBehaviour:
3224-
m_ObjectHideFlags: 1
3225-
m_PrefabParentObject: {fileID: 0}
3226-
m_PrefabInternal: {fileID: 100100000}
3227-
m_GameObject: {fileID: 197116}
3228-
m_Enabled: 1
3229-
m_EditorHideFlags: 0
3230-
m_Script: {fileID: 11500000, guid: bcf697fb9de885d47b4c990c8a58936a, type: 3}
3231-
m_Name:
3232-
m_EditorClassIdentifier:
32333222
--- !u!114 &11440968
32343223
MonoBehaviour:
32353224
m_ObjectHideFlags: 1
@@ -3616,6 +3605,17 @@ MonoBehaviour:
36163605
m_roleTypeFullName: HTC.UnityPlugin.Vive.TrackerRole
36173606
m_roleValueName: Tracker1
36183607
m_roleValueInt: 0
3608+
--- !u!114 &11470140
3609+
MonoBehaviour:
3610+
m_ObjectHideFlags: 1
3611+
m_PrefabParentObject: {fileID: 0}
3612+
m_PrefabInternal: {fileID: 100100000}
3613+
m_GameObject: {fileID: 197116}
3614+
m_Enabled: 1
3615+
m_EditorHideFlags: 0
3616+
m_Script: {fileID: 11500000, guid: 326f9add24fafee418bdcd053a0324a0, type: 3}
3617+
m_Name:
3618+
m_EditorClassIdentifier:
36193619
--- !u!114 &11470256
36203620
MonoBehaviour:
36213621
m_ObjectHideFlags: 1

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ namespace HTC.UnityPlugin.Vive
66
{
77
public static class VIUVersion
88
{
9-
public static readonly Version current = new Version("1.8.0.6");
9+
public static readonly Version current = new Version("1.8.0.7");
1010
}
1111
}

0 commit comments

Comments
 (0)