TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

tform: Change MouseWatcher::get_mouse() to return copy of LPoint2

Browse Source 
Instead of a reference, which is very unintuitive and a common stumbling block for comparisons
This commit is contained in:
rdb 2022-11-14 13:13:50 +01:00
parent 592f2b7d6e
commit 76b9df0e53
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/tform/mouseWatcher.I
View File

@ -34,12 +34,9 @@ is_mouse_open() const {
* It is only valid to call this if has_mouse() returns true. If so, this * It is only valid to call this if has_mouse() returns true. If so, this
* returns the current position of the mouse within the window. * returns the current position of the mouse within the window.
*/ */
INLINE const LPoint2 &MouseWatcher:: INLINE LPoint2 MouseWatcher::
get_mouse() const { get_mouse() const {
#ifndef NDEBUG nassertr(_has_mouse, LPoint2(0, 0));
static LPoint2 bogus_mouse(0.0f, 0.0f);
nassertr(_has_mouse, bogus_mouse);
#endif
return _mouse; return _mouse;
} }

2
panda/src/tform/mouseWatcher.h
View File

@ -67,7 +67,7 @@ PUBLISHED:
INLINE bool has_mouse() const; INLINE bool has_mouse() const;
INLINE bool is_mouse_open() const; INLINE bool is_mouse_open() const;
INLINE const LPoint2 &get_mouse() const; INLINE LPoint2 get_mouse() const;
INLINE PN_stdfloat get_mouse_x() const; INLINE PN_stdfloat get_mouse_x() const;
INLINE PN_stdfloat get_mouse_y() const; INLINE PN_stdfloat get_mouse_y() const;