Browse Source

wegbgl-port: merge fix

MouseData has been renamed PointerData to be more inclusive
in https://github.com/panda3d/panda3d/commit/9b85a288616be32dfbb0060b8ce9b435c6beff6d
Paul m. p. Peny 2 years ago
parent
commit
22d5fc5cb7
1 changed files with 2 additions and 2 deletions
  1. 2 2
      panda/src/webgldisplay/webGLGraphicsWindow.cxx

+ 2 - 2
panda/src/webgldisplay/webGLGraphicsWindow.cxx

@@ -17,7 +17,7 @@
 #include "mouseButton.h"
 #include "keyboardButton.h"
 #include "throw_event.h"
-
+#include "pointerData.h"
 #include <emscripten.h>
 
 TypeHandle WebGLGraphicsWindow::_type_handle;
@@ -568,7 +568,7 @@ on_mouse_event(int type, const EmscriptenMouseEvent *event, void *user_data) {
       emscripten_get_pointerlock_status(&ev);
 
       if (ev.isActive) {
-        MouseData md = device->get_pointer();
+        PointerData md = device->get_pointer();
         device->set_pointer_in_window(md.get_x() + event->movementX,
                                       md.get_y() + event->movementY);
       } else {