Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 21:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning

Browse source 
reposition context overlay when far away
This commit is contained in:
David Kelly 2017-07-21 13:35:57 -07:00 committed by GitHub
commit 8de09affad
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -49,6 +49,7 @@ static const float CONTEXT_OVERLAY_UNHOVERED_PULSEMIN = 0.6f;
static const float CONTEXT_OVERLAY_UNHOVERED_PULSEMAX = 1.0f; static const float CONTEXT_OVERLAY_UNHOVERED_PULSEMAX = 1.0f;
static const float CONTEXT_OVERLAY_UNHOVERED_PULSEPERIOD = 1.0f; static const float CONTEXT_OVERLAY_UNHOVERED_PULSEPERIOD = 1.0f;
static const float CONTEXT_OVERLAY_UNHOVERED_COLORPULSE = 1.0f; static const float CONTEXT_OVERLAY_UNHOVERED_COLORPULSE = 1.0f;
static const float CONTEXT_OVERLAY_FAR_OFFSET = 0.1f;
bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) { bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
if (_enabled && event.getButton() == PointerEvent::SecondaryButton) { if (_enabled && event.getButton() == PointerEvent::SecondaryButton) {
@ -95,7 +96,12 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
glm::vec3 contextOverlayPosition; glm::vec3 contextOverlayPosition;
glm::vec2 contextOverlayDimensions; glm::vec2 contextOverlayDimensions;
if (distanceToEntity > CONTEXT_OVERLAY_CLOSE_DISTANCE) { if (distanceToEntity > CONTEXT_OVERLAY_CLOSE_DISTANCE) {
contextOverlayPosition = (distanceToEntity - 1.0f) * glm::normalize(entityProperties.getPosition() - cameraPosition) + cameraPosition; auto direction = glm::normalize(bbPosition - cameraPosition);
PickRay pickRay(cameraPosition, direction);
_bbOverlay->setIgnoreRayIntersection(false);
auto result = qApp->getOverlays().findRayIntersection(pickRay);
_bbOverlay->setIgnoreRayIntersection(true);
contextOverlayPosition = result.intersection - direction * CONTEXT_OVERLAY_FAR_OFFSET;
contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_FAR_SIZE, CONTEXT_OVERLAY_FAR_SIZE) * glm::distance(contextOverlayPosition, cameraPosition); contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_FAR_SIZE, CONTEXT_OVERLAY_FAR_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
} else { } else {
// If the entity is too close to the camera, rotate the context overlay to the right of the entity. // If the entity is too close to the camera, rotate the context overlay to the right of the entity.