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

Merge pull request #11014 from zfox23/contextOverlays_improvements2

Browse source 
Five major improvements to context-overlays
This commit is contained in:
Zach Fox 2017-07-20 13:27:48 -07:00 committed by GitHub
commit bab58efc3c
3 changed files with 44 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ ContextOverlayInterface::ContextOverlayInterface() {
static const xColor BB_OVERLAY_COLOR = {255, 255, 0};
void ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
if (_enabled && event.getButton() == PointerEvent::SecondaryButton) {
EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
@ -63,7 +63,7 @@ void ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
if (_contextOverlayID == UNKNOWN_OVERLAY_ID || !qApp->getOverlays().isAddedOverlay(_contextOverlayID)) {
_contextOverlay = std::make_shared<Image3DOverlay>();
_contextOverlay->setAlpha(1.0f);
_contextOverlay->setAlpha(0.85f);
_contextOverlay->setPulseMin(0.75f);
_contextOverlay->setPulseMax(1.0f);
_contextOverlay->setColorPulse(1.0f);
@ -74,32 +74,49 @@ void ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
_contextOverlay->setParentID(entityItemID);
_contextOverlayID = qApp->getOverlays().addOverlay(_contextOverlay);
}
_contextOverlay->setDimensions(glm::vec2(0.05f, 0.05f) * glm::distance(entityProperties.getPosition(), qApp->getCamera().getPosition()));
_contextOverlay->setPosition(position);
glm::vec3 cameraPosition = qApp->getCamera().getPosition();
float distanceToEntity = glm::distance(position, cameraPosition);
glm::vec3 contextOverlayPosition;
glm::vec2 contextOverlayDimensions;
if (distanceToEntity > 1.5f) {
contextOverlayPosition = (distanceToEntity - 1.0f) * glm::normalize(entityProperties.getPosition() - cameraPosition) + cameraPosition;
contextOverlayDimensions = glm::vec2(0.08f, 0.08f) * glm::distance(contextOverlayPosition, cameraPosition);
} else {
// If the entity is too close to the camera, rotate the context overlay to the right of the entity.
// This makes it easy to inspect things you're holding.
contextOverlayPosition = (glm::quat(glm::radians(glm::vec3(0.0f, -20.0f, 0.0f))) * (entityProperties.getPosition() - cameraPosition)) + cameraPosition;
contextOverlayDimensions = glm::vec2(0.12f, 0.12f) * glm::distance(contextOverlayPosition, cameraPosition);
}
_contextOverlay->setPosition(contextOverlayPosition);
_contextOverlay->setDimensions(contextOverlayDimensions);
_contextOverlay->setRotation(entityProperties.getRotation());
_contextOverlay->setVisible(true);
return true;
}
} else if (_currentEntityWithContextOverlay == entityItemID) {
destroyContextOverlay(entityItemID, event);
} else {
return destroyContextOverlay(entityItemID, event);
}
return false;
}
void ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
setCurrentEntityWithContextOverlay(QUuid());
qApp->getOverlays().deleteOverlay(_contextOverlayID);
qApp->getOverlays().deleteOverlay(_bbOverlayID);
_contextOverlay = NULL;
_bbOverlay = NULL;
_contextOverlayID = UNKNOWN_OVERLAY_ID;
_bbOverlayID = UNKNOWN_OVERLAY_ID;
_entityMarketplaceID.clear();
bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
setCurrentEntityWithContextOverlay(QUuid());
qApp->getOverlays().deleteOverlay(_contextOverlayID);
qApp->getOverlays().deleteOverlay(_bbOverlayID);
_contextOverlay = NULL;
_bbOverlay = NULL;
_contextOverlayID = UNKNOWN_OVERLAY_ID;
_bbOverlayID = UNKNOWN_OVERLAY_ID;
_entityMarketplaceID.clear();
return true;
}
return false;
}
void ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID) {
ContextOverlayInterface::destroyContextOverlay(entityItemID, PointerEvent());
bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID) {
return ContextOverlayInterface::destroyContextOverlay(entityItemID, PointerEvent());
}
void ContextOverlayInterface::clickContextOverlay(const OverlayID& overlayID, const PointerEvent& event) {

6
interface/src/ui/overlays/ContextOverlayInterface.h
View file

@ -54,9 +54,9 @@ public:
bool getEnabled() { return _enabled; }
public slots:
void createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
void destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
void destroyContextOverlay(const EntityItemID& entityItemID);
bool createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
bool destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
bool destroyContextOverlay(const EntityItemID& entityItemID);
void clickContextOverlay(const OverlayID& overlayID, const PointerEvent& event);
private:

9
scripts/system/controllers/handControllerGrab.js
View file

@ -2227,8 +2227,6 @@ function MyController(hand) {
if (rayPickInfo.entityID === potentialEntityWithContextOverlay &&
!entityWithContextOverlay
&& contextualHand !== -1) {
entityWithContextOverlay = rayPickInfo.entityID;
potentialEntityWithContextOverlay = false;
var pointerEvent = {
type: "Move",
id: contextualHand + 1, // 0 is reserved for hardware mouse
@ -2238,7 +2236,10 @@ function MyController(hand) {
direction: rayPickInfo.searchRay.direction,
button: "Secondary"
};
ContextOverlay.createOrDestroyContextOverlay(rayPickInfo.entityID, pointerEvent);
if (ContextOverlay.createOrDestroyContextOverlay(rayPickInfo.entityID, pointerEvent)) {
entityWithContextOverlay = rayPickInfo.entityID;
potentialEntityWithContextOverlay = false;
}
}
}, 500);
contextualHand = this.hand;
@ -3632,8 +3633,6 @@ function MyController(hand) {
};
Overlays.sendMousePressOnOverlay(this.grabbedOverlay, pointerEvent);
entityWithContextOverlay = false;
potentialEntityWithContextOverlay = false;
this.touchingEnterTimer = 0;
this.touchingEnterPointerEvent = pointerEvent;