Skip to content

Commit 4b39ba6

Browse files
author
lawwong
committed
Update to v1.12.2
Fix teleport target not set to vr origin object Revert "single item grabbing, handle stickygrabbable holding basic grabbable" This feature will be added in later version
1 parent 9ca4d55 commit 4b39ba6

File tree

4 files changed

+28
-58
lines changed

4 files changed

+28
-58
lines changed

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ MonoBehaviour:
14641464
m_Name:
14651465
m_EditorClassIdentifier:
14661466
Normal: {fileID: 2100000, guid: 041d9bdcafbd02b40946f96a381b16d5, type: 2}
1467-
Heightlight: {fileID: 2100000, guid: 38c5f53e7f1806a4a9fc159718f63db0, type: 2}
1467+
Hovered: {fileID: 2100000, guid: 38c5f53e7f1806a4a9fc159718f63db0, type: 2}
14681468
Pressed: {fileID: 2100000, guid: 9cdad01e44871fc419f9f98ca8e08ec9, type: 2}
14691469
dragged: {fileID: 0}
14701470
heighlightButton: 0
@@ -2296,6 +2296,8 @@ MonoBehaviour:
22962296
m_followingDuration: 0.04
22972297
m_overrideMaxAngularVelocity: 1
22982298
m_unblockableGrab: 1
2299+
m_primaryGrabButton: 0
2300+
m_secondaryGrabButton: 1
22992301
m_grabButton: 0
23002302
m_allowMultipleGrabbers: 1
23012303
m_afterGrabbed:
@@ -3089,11 +3091,27 @@ MonoBehaviour:
30893091
m_Script: {fileID: 11500000, guid: 4f753025abc16bb45bbc83939f863bfb, type: 3}
30903092
m_Name:
30913093
m_EditorClassIdentifier:
3092-
target: {fileID: 676368209}
3094+
target: {fileID: 511087344}
30933095
pivot: {fileID: 1804374876}
30943096
fadeDuration: 0.3
3097+
primaryTeleportButton: 0
3098+
secondaryTeleportButton: 2
3099+
_teleportButton: 1
3100+
triggeredType: 0
30953101
m_reticleMaterial: {fileID: 2100000, guid: 3320905fb6f6bd54297f26399d87c525, type: 2}
3096-
teleportButton: 1
3102+
rotateToHitObjectFront: 0
3103+
teleportToHitObjectPivot: 0
3104+
useSteamVRFade: 1
3105+
onBeforeTeleport:
3106+
m_PersistentCalls:
3107+
m_Calls: []
3108+
m_TypeName: HTC.UnityPlugin.Vive.Teleportable+UnityEventTeleport, Assembly-CSharp,
3109+
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
3110+
onAfterTeleport:
3111+
m_PersistentCalls:
3112+
m_Calls: []
3113+
m_TypeName: HTC.UnityPlugin.Vive.Teleportable+UnityEventTeleport, Assembly-CSharp,
3114+
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
30973115
--- !u!1001 &1804374875
30983116
Prefab:
30993117
m_ObjectHideFlags: 0
@@ -3409,7 +3427,7 @@ MonoBehaviour:
34093427
m_Name:
34103428
m_EditorClassIdentifier:
34113429
Normal: {fileID: 2100000, guid: 041d9bdcafbd02b40946f96a381b16d5, type: 2}
3412-
Heightlight: {fileID: 2100000, guid: 38c5f53e7f1806a4a9fc159718f63db0, type: 2}
3430+
Hovered: {fileID: 2100000, guid: 38c5f53e7f1806a4a9fc159718f63db0, type: 2}
34133431
Pressed: {fileID: 2100000, guid: 9cdad01e44871fc419f9f98ca8e08ec9, type: 2}
34143432
dragged: {fileID: 2100000, guid: 926919ce7f495aa44b10ce012bb13b43, type: 2}
34153433
heighlightButton: 0

‎Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/BasicGrabbable.cs‎

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public class BasicGrabbable : GrabbableBase<BasicGrabbable.Grabber>
1616
, IColliderEventDragFixedUpdateHandler
1717
, IColliderEventDragUpdateHandler
1818
, IColliderEventDragEndHandler
19-
, IColliderEventPressUpHandler
2019
{
2120
[Serializable]
2221
public class UnityEventGrabbable : UnityEvent<BasicGrabbable> { }
@@ -55,8 +54,7 @@ public RigidPose grabberOrigin
5554

5655
public RigidPose grabOffset { get; set; }
5756
}
58-
[Tooltip("StickyGrabbable grabbing this BasicGrabbable")]
59-
public StickyGrabbable stickyGrabbable;
57+
6058
private IndexedTable<ColliderButtonEventData, Grabber> m_eventGrabberSet;
6159

6260
public bool alignPosition;
@@ -75,8 +73,6 @@ public RigidPose grabberOrigin
7573
[SerializeField]
7674
private bool m_unblockableGrab = true;
7775
[SerializeField]
78-
private bool m_singleItemGrab = false;
79-
[SerializeField]
8076
[FlagsFromEnum(typeof(ControllerButton))]
8177
private ulong m_primaryGrabButton = 0ul;
8278
[SerializeField]
@@ -103,8 +99,6 @@ public RigidPose grabberOrigin
10399

104100
public bool unblockableGrab { get { return m_unblockableGrab; } set { m_unblockableGrab = value; } }
105101

106-
public bool singleItemGrab { get { return m_singleItemGrab; } set { m_singleItemGrab = value; } }
107-
108102
public UnityEventGrabbable afterGrabbed { get { return m_afterGrabbed; } }
109103

110104
public UnityEventGrabbable beforeRelease { get { return m_beforeRelease; } }
@@ -172,8 +166,7 @@ protected override void Awake()
172166

173167
protected virtual void OnDisable()
174168
{
175-
if (!m_allowMultipleGrabbers)
176-
ClearGrabbers(true);
169+
ClearGrabbers(true);
177170
ClearEventGrabberSet();
178171
}
179172

@@ -203,10 +196,7 @@ protected bool IsValidGrabButton(ColliderButtonEventData eventData)
203196
public virtual void OnColliderEventDragStart(ColliderButtonEventData eventData)
204197
{
205198
if (!IsValidGrabButton(eventData)) { return; }
206-
if(singleItemGrab) {
207-
ViveColliderEventCaster caster = eventData.eventCaster as ViveColliderEventCaster;
208-
if (!caster.canGrab) { return; }
209-
}
199+
210200
if (!m_allowMultipleGrabbers)
211201
{
212202
ClearGrabbers(false);
@@ -222,12 +212,6 @@ public virtual void OnColliderEventDragStart(ColliderButtonEventData eventData)
222212
if (m_eventGrabberSet == null) { m_eventGrabberSet = new IndexedTable<ColliderButtonEventData, Grabber>(); }
223213
m_eventGrabberSet.Add(eventData, grabber);
224214

225-
if (singleItemGrab)
226-
{
227-
ViveColliderEventCaster caster = eventData.eventCaster as ViveColliderEventCaster;
228-
caster.canGrab = false;
229-
}
230-
231215
AddGrabber(grabber);
232216
}
233217

@@ -251,43 +235,13 @@ public virtual void OnColliderEventDragUpdate(ColliderButtonEventData eventData)
251235
public virtual void OnColliderEventDragEnd(ColliderButtonEventData eventData)
252236
{
253237
if (m_eventGrabberSet == null) { return; }
254-
if (!IsValidGrabButton(eventData)) { return; }
238+
255239
Grabber grabber;
256240
if (!m_eventGrabberSet.TryGetValue(eventData, out grabber)) { return; }
257241

258242
RemoveGrabber(grabber);
259243
m_eventGrabberSet.Remove(eventData);
260244
Grabber.Release(grabber);
261-
if(singleItemGrab) {
262-
ViveColliderEventCaster caster = eventData.eventCaster as ViveColliderEventCaster;
263-
caster.canGrab = true;
264-
}
265-
}
266-
public void ForceRelease()
267-
{
268-
ClearEventGrabberSet();
269-
m_beforeRelease.Invoke(this);
270-
}
271-
272-
public void OnColliderEventPressUp(ColliderButtonEventData eventData)
273-
{
274-
if (stickyGrabbable!=null && stickyGrabbable.isGrabbed)
275-
{
276-
ForceRelease();
277-
}
278-
if(singleItemGrab) {
279-
if (!IsValidGrabButton(eventData)) { return; }
280-
ViveColliderEventCaster caster = eventData.eventCaster as ViveColliderEventCaster;
281-
if (isGrabbed)
282-
{
283-
caster.canGrab = true;
284-
if (m_onDrop != null)
285-
{
286-
m_onDrop.Invoke(this);
287-
}
288-
}
289-
caster.canGrab = true;
290-
}
291245
}
292246
}
293247
}

‎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.12.1.0");
9+
public static readonly Version current = new Version("1.12.2.0");
1010
}
1111
}

‎Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveColliderEvent/ViveColliderEventCaster.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ public class ViveColliderEventCaster : ColliderEventCaster, IViveRoleComponent
3232
private ScrollType m_scrollType = ScrollType.Auto;
3333
[SerializeField]
3434
private Vector2 m_scrollDeltaScale = new Vector2(1f, -1f);
35-
[SerializeField]
36-
private bool m_canGrab = true;
37-
public bool canGrab { get { return m_canGrab; } set { m_canGrab = value; } }
35+
3836
public ViveRoleProperty viveRole { get { return m_viveRole; } }
3937
public ScrollType scrollType { get { return m_scrollType; } set { m_scrollType = value; } }
4038
public Vector2 scrollDeltaScale { get { return m_scrollDeltaScale; } set { m_scrollDeltaScale = value; } }

0 commit comments

Comments
 (0)