From 44dba03a491911cfcdb40c5227de56be00f57383 Mon Sep 17 00:00:00 2001 From: David Rose Date: Sat, 5 Dec 2009 19:04:05 +0000 Subject: [PATCH] fix VirtualMouse code rot --- panda/src/device/virtualMouse.cxx | 5 +++++ panda/src/device/virtualMouse.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/panda/src/device/virtualMouse.cxx b/panda/src/device/virtualMouse.cxx index 92e695268f..6d91bd343d 100644 --- a/panda/src/device/virtualMouse.cxx +++ b/panda/src/device/virtualMouse.cxx @@ -27,10 +27,12 @@ VirtualMouse(const string &name) : DataNode(name) { _pixel_xy_output = define_output("pixel_xy", EventStoreVec2::get_class_type()); + _pixel_size_output = define_output("pixel_size", EventStoreVec2::get_class_type()); _xy_output = define_output("xy", EventStoreVec2::get_class_type()); _button_events_output = define_output("button_events", ButtonEventList::get_class_type()); _pixel_xy = new EventStoreVec2(LPoint2f(0.0f, 0.0f)); + _pixel_size = new EventStoreVec2(LPoint2f(0.0f, 0.0f)); _xy = new EventStoreVec2(LPoint2f(0.0f, 0.0f)); _button_events = new ButtonEventList; _next_button_events = new ButtonEventList; @@ -128,6 +130,9 @@ do_transmit_data(DataGraphTraverser *, const DataNodeTransmit &, _next_button_events->clear(); output.set_data(_button_events_output, EventParameter(_button_events)); + _pixel_size->set_value(LPoint2f(_win_width, _win_height)); + output.set_data(_pixel_size_output, EventParameter(_pixel_size)); + if (_mouse_on) { // The mouse is within the window. _pixel_xy->set_value(LPoint2f(_mouse_x, _mouse_y)); diff --git a/panda/src/device/virtualMouse.h b/panda/src/device/virtualMouse.h index e341b63ea8..2a398f6ca9 100644 --- a/panda/src/device/virtualMouse.h +++ b/panda/src/device/virtualMouse.h @@ -58,10 +58,12 @@ protected: private: // outputs int _pixel_xy_output; + int _pixel_size_output; int _xy_output; int _button_events_output; PT(EventStoreVec2) _pixel_xy; + PT(EventStoreVec2) _pixel_size; PT(EventStoreVec2) _xy; PT(ButtonEventList) _button_events; PT(ButtonEventList) _next_button_events;