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

add keyboard modifiers to entity pointer events

Browse source
This commit is contained in:
HifiExperiments 2024-02-16 12:23:15 -08:00
parent 1221b46a59
commit 0773e38afb
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -912,7 +912,7 @@ QUuid EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
pos2D, rayPickResult.intersection, pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction, rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event), toPointerButton(*event), toPointerButtons(*event),
Qt::NoModifier); // TODO -- check for modifier keys? event->modifiers());
emit entityScriptingInterface->mousePressOnEntity(rayPickResult.entityID, pointerEvent); emit entityScriptingInterface->mousePressOnEntity(rayPickResult.entityID, pointerEvent);
@ -943,9 +943,10 @@ void EntityTreeRenderer::mouseDoublePressEvent(QMouseEvent* event) {
if (rayPickResult.intersects && (entity = getTree()->findEntityByID(rayPickResult.entityID))) { if (rayPickResult.intersects && (entity = getTree()->findEntityByID(rayPickResult.entityID))) {
glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult); glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult);
PointerEvent pointerEvent(PointerEvent::Press, PointerManager::MOUSE_POINTER_ID, PointerEvent pointerEvent(PointerEvent::Press, PointerManager::MOUSE_POINTER_ID,
pos2D, rayPickResult.intersection, pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction, rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event), Qt::NoModifier); toPointerButton(*event), toPointerButtons(*event),
event->modifiers());
emit entityScriptingInterface->mouseDoublePressOnEntity(rayPickResult.entityID, pointerEvent); emit entityScriptingInterface->mouseDoublePressOnEntity(rayPickResult.entityID, pointerEvent);
@ -979,7 +980,7 @@ void EntityTreeRenderer::mouseReleaseEvent(QMouseEvent* event) {
pos2D, rayPickResult.intersection, pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction, rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event), toPointerButton(*event), toPointerButtons(*event),
Qt::NoModifier); // TODO -- check for modifier keys? event->modifiers());
emit entityScriptingInterface->mouseReleaseOnEntity(rayPickResult.entityID, pointerEvent); emit entityScriptingInterface->mouseReleaseOnEntity(rayPickResult.entityID, pointerEvent);
@ -995,7 +996,7 @@ void EntityTreeRenderer::mouseReleaseEvent(QMouseEvent* event) {
pos2D, rayPickResult.intersection, pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction, rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event), toPointerButton(*event), toPointerButtons(*event),
Qt::NoModifier); // TODO -- check for modifier keys? event->modifiers());
emit entityScriptingInterface->clickReleaseOnEntity(_currentClickingOnEntityID, pointerEvent); emit entityScriptingInterface->clickReleaseOnEntity(_currentClickingOnEntityID, pointerEvent);
} }
@ -1022,7 +1023,7 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
pos2D, rayPickResult.intersection, pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction, rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event), toPointerButton(*event), toPointerButtons(*event),
Qt::NoModifier); // TODO -- check for modifier keys? event->modifiers());
emit entityScriptingInterface->mouseMoveOnEntity(rayPickResult.entityID, pointerEvent); emit entityScriptingInterface->mouseMoveOnEntity(rayPickResult.entityID, pointerEvent);
@ -1036,7 +1037,7 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
pos2D, rayPickResult.intersection, pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction, rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event), toPointerButton(*event), toPointerButtons(*event),
Qt::NoModifier); // TODO -- check for modifier keys? event->modifiers());
emit entityScriptingInterface->hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent); emit entityScriptingInterface->hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent);
} }
@ -1064,10 +1065,10 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
if (!_currentHoverOverEntityID.isInvalidID()) { if (!_currentHoverOverEntityID.isInvalidID()) {
glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult); glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult);
PointerEvent pointerEvent(PointerEvent::Move, PointerManager::MOUSE_POINTER_ID, PointerEvent pointerEvent(PointerEvent::Move, PointerManager::MOUSE_POINTER_ID,
pos2D, rayPickResult.intersection, pos2D, rayPickResult.intersection,
rayPickResult.surfaceNormal, ray.direction, rayPickResult.surfaceNormal, ray.direction,
toPointerButton(*event), toPointerButtons(*event), toPointerButton(*event), toPointerButtons(*event),
Qt::NoModifier); // TODO -- check for modifier keys? event->modifiers());
emit entityScriptingInterface->hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent); emit entityScriptingInterface->hoverLeaveEntity(_currentHoverOverEntityID, pointerEvent);
_currentHoverOverEntityID = UNKNOWN_ENTITY_ID; // makes it the unknown ID _currentHoverOverEntityID = UNKNOWN_ENTITY_ID; // makes it the unknown ID