TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

android: fix compile errors in androiddisplay module

Browse Source
This commit is contained in:
rdb 2019-01-01 21:49:38 +01:00
parent ac8be1a2e6
commit dccf8074fd
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
panda/src/androiddisplay/androidGraphicsWindow.cxx
View File

@ -55,9 +55,9 @@ AndroidGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe,
_app = panda_android_app; _app = panda_android_app;
GraphicsWindowInputDevice device = PT(GraphicsWindowInputDevice) device = GraphicsWindowInputDevice::pointer_and_keyboard(this, "keyboard_mouse");
GraphicsWindowInputDevice::pointer_and_keyboard(this, "keyboard_mouse");
add_input_device(device); add_input_device(device);
_input = device;
} }
/** /**
@ -486,22 +486,22 @@ handle_key_event(const AInputEvent *event) {
/* /*
int32_t meta = AKeyEvent_getMetaState(event); int32_t meta = AKeyEvent_getMetaState(event);
if (meta | AMETA_ALT_ON) { if (meta | AMETA_ALT_ON) {
_input_devices[0].button_down(KeyboardButton.alt()); _input->button_down(KeyboardButton.alt());
} }
if (meta | AMETA_ALT_LEFT_ON) { if (meta | AMETA_ALT_LEFT_ON) {
_input_devices[0].button_down(KeyboardButton.lalt()); _input->button_down(KeyboardButton.lalt());
} }
if (meta | AMETA_ALT_RIGHT_ON) { if (meta | AMETA_ALT_RIGHT_ON) {
_input_devices[0].button_down(KeyboardButton.ralt()); _input->button_down(KeyboardButton.ralt());
} }
if (meta | AMETA_SHIFT_ON) { if (meta | AMETA_SHIFT_ON) {
_input_devices[0].button_down(KeyboardButton.shift()); _input->button_down(KeyboardButton.shift());
} }
if (meta | AMETA_SHIFT_LEFT_ON) { if (meta | AMETA_SHIFT_LEFT_ON) {
_input_devices[0].button_down(KeyboardButton.lshift()); _input->button_down(KeyboardButton.lshift());
} }
if (meta | AMETA_SHIFT_RIGHT_ON) { if (meta | AMETA_SHIFT_RIGHT_ON) {
_input_devices[0].button_down(KeyboardButton.rshift()); _input->button_down(KeyboardButton.rshift());
}*/ }*/
int32_t keycode = AKeyEvent_getKeyCode(event); int32_t keycode = AKeyEvent_getKeyCode(event);
@ -517,12 +517,12 @@ handle_key_event(const AInputEvent *event) {
int32_t action = AKeyEvent_getAction(event); int32_t action = AKeyEvent_getAction(event);
if (action == AKEY_EVENT_ACTION_DOWN) { if (action == AKEY_EVENT_ACTION_DOWN) {
if (AKeyEvent_getRepeatCount(event) > 0) { if (AKeyEvent_getRepeatCount(event) > 0) {
_input_devices[0].button_resume_down(button); _input->button_resume_down(button);
} else { } else {
_input_devices[0].button_down(button); _input->button_down(button);
} }
} else if (action == AKEY_EVENT_ACTION_UP) { } else if (action == AKEY_EVENT_ACTION_UP) {
_input_devices[0].button_up(button); _input->button_up(button);
} }
// TODO AKEY_EVENT_ACTION_MULTIPLE // TODO AKEY_EVENT_ACTION_MULTIPLE
@ -549,16 +549,16 @@ handle_motion_event(const AInputEvent *event) {
if (changed != 0) { if (changed != 0) {
if (changed & AMOTION_EVENT_BUTTON_PRIMARY) { if (changed & AMOTION_EVENT_BUTTON_PRIMARY) {
if (button_state & AMOTION_EVENT_BUTTON_PRIMARY) { if (button_state & AMOTION_EVENT_BUTTON_PRIMARY) {
_input_devices[0].button_down(MouseButton::one()); _input->button_down(MouseButton::one());
} else { } else {
_input_devices[0].button_up(MouseButton::one()); _input->button_up(MouseButton::one());
} }
} }
if (changed & AMOTION_EVENT_BUTTON_SECONDARY) { if (changed & AMOTION_EVENT_BUTTON_SECONDARY) {
if (button_state & AMOTION_EVENT_BUTTON_SECONDARY) { if (button_state & AMOTION_EVENT_BUTTON_SECONDARY) {
_input_devices[0].button_down(MouseButton::three()); _input->button_down(MouseButton::three());
} else { } else {
_input_devices[0].button_up(MouseButton::three()); _input->button_up(MouseButton::three());
} }
} }
_mouse_button_state = button_state; _mouse_button_state = button_state;
@ -568,7 +568,7 @@ handle_motion_event(const AInputEvent *event) {
float x = AMotionEvent_getX(event, 0) - _app->contentRect.left; float x = AMotionEvent_getX(event, 0) - _app->contentRect.left;
float y = AMotionEvent_getY(event, 0) - _app->contentRect.top; float y = AMotionEvent_getY(event, 0) - _app->contentRect.top;
_input_devices[0].set_pointer_in_window(x, y); _input->set_pointer_in_window(x, y);
return 1; return 1;
} }

2
panda/src/androiddisplay/androidGraphicsWindow.h
View File

@ -73,7 +73,7 @@ private:
int32_t _mouse_button_state; int32_t _mouse_button_state;
const ARect *rect; GraphicsWindowInputDevice *_input;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {