@@ -177,34 +177,34 @@ public IEnumerator NearInteractionTouchablePointerEvents()
177177 using ( var catcher = CreatePointerEventCatcher ( touchable ) )
178178 {
179179 // Touch started and completed when entering and exiting
180- yield return PlayModeTestUtilities . MoveHandFromTo ( initialHandPosition , objectPosition , numSteps , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
180+ yield return PlayModeTestUtilities . MoveHand ( initialHandPosition , objectPosition , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
181181 Assert . AreEqual ( 1 , catcher . EventsStarted ) ;
182182 Assert . AreEqual ( 0 , catcher . EventsCompleted ) ;
183- yield return PlayModeTestUtilities . MoveHandFromTo ( objectPosition , rightPosition , numSteps , ArticulatedHandPose . GestureId . Pinch , Handedness . Right , inputSim ) ;
183+ yield return PlayModeTestUtilities . MoveHand ( objectPosition , rightPosition , ArticulatedHandPose . GestureId . Pinch , Handedness . Right , inputSim ) ;
184184 Assert . AreEqual ( 1 , catcher . EventsStarted ) ;
185185 Assert . AreEqual ( 1 , catcher . EventsCompleted ) ;
186186 Assert . Greater ( catcher . DragEventCount , 0 ) ;
187187
188188 // Touch started and completed when entering and exiting behind the plane
189- yield return PlayModeTestUtilities . MoveHandFromTo ( initialHandPosition , objectPosition , numSteps , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
189+ yield return PlayModeTestUtilities . MoveHand ( initialHandPosition , objectPosition , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
190190 Assert . AreEqual ( 2 , catcher . EventsStarted ) ;
191191 Assert . AreEqual ( 1 , catcher . EventsCompleted ) ;
192- yield return PlayModeTestUtilities . MoveHandFromTo ( objectPosition , backPosition , numSteps , ArticulatedHandPose . GestureId . Pinch , Handedness . Right , inputSim ) ;
192+ yield return PlayModeTestUtilities . MoveHand ( objectPosition , backPosition , ArticulatedHandPose . GestureId . Pinch , Handedness . Right , inputSim ) ;
193193 Assert . AreEqual ( 2 , catcher . EventsStarted ) ;
194194 Assert . AreEqual ( 2 , catcher . EventsCompleted ) ;
195195 Assert . Greater ( catcher . DragEventCount , 1 ) ;
196196 int dragEventCount = catcher . DragEventCount ;
197197
198198 // No touch when moving at behind the plane
199- yield return PlayModeTestUtilities . MoveHandFromTo ( backPosition , rightPosition , numSteps , ArticulatedHandPose . GestureId . Pinch , Handedness . Right , inputSim ) ;
199+ yield return PlayModeTestUtilities . MoveHand ( backPosition , rightPosition , ArticulatedHandPose . GestureId . Pinch , Handedness . Right , inputSim ) ;
200200 Assert . AreEqual ( 2 , catcher . EventsStarted ) ;
201201 Assert . AreEqual ( 2 , catcher . EventsCompleted ) ;
202202 Assert . AreEqual ( dragEventCount , catcher . DragEventCount , "No drag events should fire when poke pointer moving behind plane" ) ;
203203
204204
205205 // No touch when moving outside the bounds
206- yield return PlayModeTestUtilities . MoveHandFromTo ( initialHandPosition + outOfBoundsOffset , objectPosition + outOfBoundsOffset , numSteps , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
207- yield return PlayModeTestUtilities . MoveHandFromTo ( objectPosition + outOfBoundsOffset , rightPosition , numSteps , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
206+ yield return PlayModeTestUtilities . MoveHand ( initialHandPosition + outOfBoundsOffset , objectPosition + outOfBoundsOffset , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
207+ yield return PlayModeTestUtilities . MoveHand ( objectPosition + outOfBoundsOffset , rightPosition , ArticulatedHandPose . GestureId . Open , Handedness . Right , inputSim ) ;
208208 Assert . AreEqual ( 2 , catcher . EventsStarted ) ;
209209 Assert . AreEqual ( 2 , catcher . EventsCompleted ) ;
210210 Assert . AreEqual ( dragEventCount , catcher . DragEventCount , "No drag events should fire when poke pointer moving outside bounds" ) ;
0 commit comments