Browse Source

removed some unnecessary comments

pull/527/head
nodoteve 5 years ago
parent
commit
3b6d51befb
  1. 1
      src/Magnum/Platform/AndroidApplication.cpp
  2. 6
      src/Magnum/Platform/AndroidApplication.h

1
src/Magnum/Platform/AndroidApplication.cpp

@ -309,6 +309,7 @@ std::int32_t AndroidApplication::inputEvent(android_app* state, AInputEvent* eve
app._previousMouseMovePosition[pointerId] = position; app._previousMouseMovePosition[pointerId] = position;
app.mouseMoveEvent(e); app.mouseMoveEvent(e);
// is it ok?
r = r || e.isAccepted(); r = r || e.isAccepted();
} }

6
src/Magnum/Platform/AndroidApplication.h

@ -828,7 +828,6 @@ class AndroidApplication::MouseEvent: public InputEvent {
std::size_t pointerCount() const { return _pointerCount; } std::size_t pointerCount() const { return _pointerCount; }
private: private:
// Did it almost like MouseMoveEvent with _relativePosition
explicit MouseEvent(AInputEvent* event, explicit MouseEvent(AInputEvent* event,
std::size_t pointerIndex = 0, std::int32_t pointerId = 0, std::size_t pointerCount = 1): std::size_t pointerIndex = 0, std::int32_t pointerId = 0, std::size_t pointerCount = 1):
InputEvent(event), InputEvent(event),
@ -837,7 +836,6 @@ class AndroidApplication::MouseEvent: public InputEvent {
const std::size_t _pointerIndex; const std::size_t _pointerIndex;
const std::int32_t _pointerId; const std::int32_t _pointerId;
const std::size_t _pointerCount; const std::size_t _pointerCount;
}; };
/** /**
@ -899,10 +897,6 @@ class AndroidApplication::MouseMoveEvent: public InputEvent {
/** @brief Position */ /** @brief Position */
Vector2i position() const { Vector2i position() const {
// aw, that was painful
// return {Int(AMotionEvent_getX(_event, 0)),
// Int(AMotionEvent_getY(_event, 0))};
return {Int(AMotionEvent_getX(_event, _pointerIndex)), return {Int(AMotionEvent_getX(_event, _pointerIndex)),
Int(AMotionEvent_getY(_event, _pointerIndex))}; Int(AMotionEvent_getY(_event, _pointerIndex))};
} }

Loading…
Cancel
Save