@@ -33,11 +33,10 @@ pub fn mouse(
33
33
) {
34
34
let pos = Point2 :: from ( window. cursor_position ( ) . map_or ( max * 0.5 , |pos| pos - min) ) ;
35
35
let max = max. into ( ) ;
36
- let just_pressed_button = |button : Option < MouseButton > | {
37
- button. map_or ( false , |button| mouse_input. just_pressed ( button) )
38
- } ;
36
+ let just_pressed_button =
37
+ |button : Option < MouseButton > | button. is_some_and ( |button| mouse_input. just_pressed ( button) ) ;
39
38
let just_released_button = |button : Option < MouseButton > | {
40
- button. map_or ( false , |button| mouse_input. just_released ( button) )
39
+ button. is_some_and ( |button| mouse_input. just_released ( button) )
41
40
} ;
42
41
if just_pressed_button ( controller. input . first_button ) {
43
42
controller. first . capture ( trackball. frame . yaw_axis ( ) ) ;
@@ -95,7 +94,7 @@ pub fn mouse(
95
94
if controller
96
95
. input
97
96
. orbit_button
98
- . map_or ( false , |button| mouse_input. pressed ( button) )
97
+ . is_some_and ( |button| mouse_input. pressed ( button) )
99
98
{
100
99
if let Some ( ( _num, pos, _rot, _rat) ) = controller. touch . compute ( None , pos. into ( ) , 0 ) {
101
100
if let Some ( rot) = controller. orbit . compute ( & pos, & max) {
@@ -106,7 +105,7 @@ pub fn mouse(
106
105
if controller
107
106
. input
108
107
. slide_button
109
- . map_or ( false , |button| mouse_input. pressed ( button) )
108
+ . is_some_and ( |button| mouse_input. pressed ( button) )
110
109
{
111
110
if let Some ( vec) = controller
112
111
. slide
0 commit comments