@@ -52,12 +52,9 @@ public void DoEvent(Event @event)
5252 Array . Resize ( ref _axes , @event . Jaxis . Axis + 1 ) ;
5353 }
5454
55- AxisMoved ? . Invoke
56- (
57- this ,
58- _axes [ @event . Jaxis . Axis ] = new Axis
59- ( @event . Jaxis . Axis , ( float ) @event . Jaxis . Value / short . MaxValue )
60- ) ;
55+ _axes [ @event . Jaxis . Axis ] = new Axis
56+ ( @event . Jaxis . Axis , ( float ) @event . Jaxis . Value / short . MaxValue ) ;
57+ AxisMoved ? . Invoke ( this , _axes [ @event . Jaxis . Axis ] ) ;
6158 break ;
6259 }
6360 case EventType . Joyballmotion :
@@ -73,17 +70,14 @@ public void DoEvent(Event @event)
7370 }
7471
7572 var val = @event . Jhat . Value ;
76- HatMoved ? . Invoke
73+ _hats [ @event . Jhat . Hat ] = new Hat
7774 (
78- this ,
79- _hats [ @event . Jhat . Hat ] = new Hat
80- (
81- @event . Jhat . Hat , ( Position2D ) ( ( val & 0x01 ) * ( int ) Position2D . Up +
82- ( val & 0x02 ) * ( int ) Position2D . Right +
83- ( val & 0x04 ) * ( int ) Position2D . Down +
84- ( val & 0x08 ) * ( int ) Position2D . Left )
85- )
75+ @event . Jhat . Hat , ( Position2D ) ( ( val & 0x01 ) * ( int ) Position2D . Up +
76+ ( val & 0x02 ) * ( int ) Position2D . Right +
77+ ( val & 0x04 ) * ( int ) Position2D . Down +
78+ ( val & 0x08 ) * ( int ) Position2D . Left )
8679 ) ;
80+ HatMoved ? . Invoke ( this , _hats [ @event . Jhat . Hat ] ) ;
8781 break ;
8882 }
8983 case EventType . Joybuttondown :
@@ -93,12 +87,9 @@ public void DoEvent(Event @event)
9387 Array . Resize ( ref _buttons , @event . Jbutton . Button + 1 ) ;
9488 }
9589
96- ButtonDown ? . Invoke
97- (
98- this ,
99- _buttons [ @event . Jbutton . Button ] = new Button
100- ( ( ButtonName ) @event . Jbutton . Button , @event . Jbutton . Button , true )
101- ) ;
90+ _buttons [ @event . Jbutton . Button ] = new Button
91+ ( ( ButtonName ) @event . Jbutton . Button , @event . Jbutton . Button , true ) ;
92+ ButtonDown ? . Invoke ( this , _buttons [ @event . Jbutton . Button ] ) ;
10293 break ;
10394 }
10495 case EventType . Joybuttonup :
@@ -108,12 +99,9 @@ public void DoEvent(Event @event)
10899 Array . Resize ( ref _buttons , @event . Jbutton . Button + 1 ) ;
109100 }
110101
111- ButtonUp ? . Invoke
112- (
113- this ,
114- _buttons [ @event . Jbutton . Button ] = new Button
115- ( ( ButtonName ) @event . Jbutton . Button , @event . Jbutton . Button , false )
116- ) ;
102+ _buttons [ @event . Jbutton . Button ] = new Button
103+ ( ( ButtonName ) @event . Jbutton . Button , @event . Jbutton . Button , false ) ;
104+ ButtonUp ? . Invoke ( this , _buttons [ @event . Jbutton . Button ] ) ;
117105 break ;
118106 }
119107 case EventType . Joydeviceadded :
0 commit comments