Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 00:36:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code review

Browse source
This commit is contained in:
David Rowe 2018-01-20 10:07:23 +13:00
parent 94e6a68d41
commit 24dcc8788c
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/pointers/src/Pointer.cpp
View file

@ -236,7 +236,7 @@ void Pointer::generatePointerEvents(unsigned int pointerID, const PickResultPoin
} }
// if we disable the pointer or disable hovering, send hoverEnd events after triggerEnd // if we disable the pointer or disable hovering, send hoverEnd events after triggerEnd
if ((_hover || _prevHover) && ((!_enabled && _prevEnabled) || (!doHover && _prevDoHover))) { if ((!_enabled && _prevEnabled) || (!doHover && _prevDoHover)) {
if (_prevHoveredObject.type == ENTITY) { if (_prevHoveredObject.type == ENTITY) {
emit pointerManager->hoverEndEntity(_prevHoveredObject.objectID, hoveredEvent); emit pointerManager->hoverEndEntity(_prevHoveredObject.objectID, hoveredEvent);
} else if (_prevHoveredObject.type == OVERLAY) { } else if (_prevHoveredObject.type == OVERLAY) {
@ -249,7 +249,6 @@ void Pointer::generatePointerEvents(unsigned int pointerID, const PickResultPoin
_prevHoveredObject = hoveredObject; _prevHoveredObject = hoveredObject;
_prevButtons = buttons; _prevButtons = buttons;
_prevEnabled = _enabled; _prevEnabled = _enabled;
_prevHover = _hover;
_prevDoHover = doHover; _prevDoHover = doHover;
} }

1
libraries/pointers/src/Pointer.h
View file

@ -99,7 +99,6 @@ private:
PickedObject _prevHoveredObject; PickedObject _prevHoveredObject;
Buttons _prevButtons; Buttons _prevButtons;
bool _prevEnabled { false }; bool _prevEnabled { false };
bool _prevHover { false };
bool _prevDoHover { false }; bool _prevDoHover { false };
std::unordered_map<std::string, PickedObject> _triggeredObjects; std::unordered_map<std::string, PickedObject> _triggeredObjects;