File tree Expand file tree Collapse file tree
Scripts/Modules/FeedbackModule
Workspaces/PolyWorkspace/Scripts Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -56,8 +56,8 @@ public GameObject settingsMenuItemInstance
5656 if ( m_Preferences != null )
5757 toggle . isOn = m_Preferences . enabled ;
5858
59- m_Toggles . Add ( toggle ) ;
60-
59+ m_Toggles . Add ( toggle ) ;
60+
6161#if INCLUDE_TEXT_MESH_PRO
6262 var label = value . GetComponentInChildren < TextMeshProUGUI > ( ) ;
6363
@@ -74,7 +74,7 @@ public GameObject settingsMenuItemInstance
7474
7575 var handle = value . GetComponent < BaseHandle > ( ) ;
7676 handle . hoverStarted += ( baseHandle , data ) => { label . text = m_Preferences . enabled ? disableFeedback : enableFeedback ; } ;
77- handle . hoverEnded += ( baseHandle , data ) => { label . text = m_Preferences . enabled ? feedbackEnabled : feedbackDisabled ; } ;
77+ handle . hoverEnded += ( baseHandle , data ) => { label . text = m_Preferences . enabled ? feedbackEnabled : feedbackDisabled ; } ;
7878#endif
7979 }
8080 }
Original file line number Diff line number Diff line change @@ -488,7 +488,7 @@ IEnumerator ShowGrabbedObject()
488488 yield break ; // Exit coroutine if m_GrabbedObject is destroyed before the loop is finished
489489
490490 currentTime += Time . deltaTime ;
491- m_DragObject . localScale = Vector3 . Lerp ( currentLocalScale , targetScale ,
491+ m_DragObject . localScale = Vector3 . Lerp ( currentLocalScale , targetScale ,
492492 MathUtilsExt . SmoothInOutLerpFloat ( currentTime / duration ) ) ;
493493
494494 if ( m_PreviewObjectClone )
@@ -500,7 +500,7 @@ IEnumerator ShowGrabbedObject()
500500 yield return null ;
501501 }
502502
503- m_DragObject . localScale = targetScale ;
503+ m_DragObject . localScale = targetScale ;
504504 //No need to hard-set the preview object position/rotation because they will set in OnDragging in parent class
505505 }
506506
You can’t perform that action at this time.
0 commit comments