@@ -79,65 +79,25 @@ public TouchSurfaceView(Context context) {
79
79
setRenderMode (GLSurfaceView .RENDERMODE_WHEN_DIRTY );
80
80
}
81
81
82
- @ Override
83
- public boolean onKeyDown (int keyCode , KeyEvent event ) {
84
- // Release pointer capture on any key press.
85
- if (event .getAction () == KeyEvent .ACTION_DOWN && hasPointerCapture ()) {
86
- releasePointerCapture ();
87
- }
88
- return super .onKeyDown (keyCode , event );
89
- }
90
-
91
82
@ Override public boolean onTrackballEvent (MotionEvent e ) {
92
83
mRenderer .mAngleX += e .getX () * TRACKBALL_SCALE_FACTOR ;
93
84
mRenderer .mAngleY += e .getY () * TRACKBALL_SCALE_FACTOR ;
94
85
requestRender ();
95
86
return true ;
96
87
}
97
88
98
- @ Override public boolean onHoverEvent (MotionEvent e ) {
99
- if (hasPointerCapture ()) {
100
- switch (e .getAction ()) {
101
- case MotionEvent .ACTION_HOVER_MOVE :
102
- case MotionEvent .ACTION_HOVER_EXIT :
103
- case MotionEvent .ACTION_HOVER_ENTER :
104
- updateAngles (e );
105
- break ;
106
- }
107
- }
108
- return super .onHoverEvent (e );
109
- }
110
-
111
89
@ Override public boolean onTouchEvent (MotionEvent e ) {
112
- switch (e .getAction ()) {
113
- case MotionEvent .ACTION_DOWN :
114
- if (e .isFromSource (InputDevice .SOURCE_MOUSE )) {
115
- if (hasPointerCapture ()) {
116
- releasePointerCapture ();
117
- } else {
118
- requestPointerCapture ();
119
- }
120
- }
121
- break ;
122
-
123
- case MotionEvent .ACTION_MOVE :
124
- updateAngles (e );
125
- break ;
90
+ if (e .getActionMasked () == MotionEvent .ACTION_MOVE ) {
91
+ updateAngles (e );
126
92
}
127
93
mPreviousX = e .getX ();
128
94
mPreviousY = e .getY ();
129
95
return true ;
130
96
}
131
97
132
98
private void updateAngles (MotionEvent e ) {
133
- float dx , dy ;
134
- if (e .isFromSource (InputDevice .SOURCE_MOUSE ) && hasPointerCapture ()) {
135
- dx = e .getAxisValue (MotionEvent .AXIS_RELATIVE_X );
136
- dy = e .getAxisValue (MotionEvent .AXIS_RELATIVE_Y );
137
- } else {
138
- dx = e .getX () - mPreviousX ;
139
- dy = e .getY () - mPreviousY ;
140
- }
99
+ float dx = e .getX () - mPreviousX ;
100
+ float dy = e .getY () - mPreviousY ;
141
101
if (dx != 0 && dy != 0 ) {
142
102
mRenderer .mAngleX += dx * TOUCH_SCALE_FACTOR ;
143
103
mRenderer .mAngleY += dy * TOUCH_SCALE_FACTOR ;
0 commit comments