From 7f0a7b4f7ededc30b4f583ad9b4b61cab9e8a437 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 3 Jun 2015 17:15:50 -0700
Subject: [PATCH] Fixing web entity glow and 'back' behavior

---
 .../src/RenderableWebEntityItem.cpp           | 32 ++++++++++++++++---
 .../src/RenderableWebEntityItem.h             |  1 +
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
index 2e623de6c5..74405ba586 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -8,10 +8,13 @@
 
 #include "RenderableWebEntityItem.h"
 
+#include <QMouseEvent>
+
 #include <glm/gtx/quaternion.hpp>
 
 #include <gpu/GPUConfig.h>
 
+#include <GlowEffect.h>
 #include <DeferredLightingEffect.h>
 #include <GeometryCache.h>
 #include <PerfStat.h>
@@ -64,7 +67,6 @@ RenderableWebEntityItem::~RenderableWebEntityItem() {
 void RenderableWebEntityItem::render(RenderArgs* args) {
     QOpenGLContext * currentContext = QOpenGLContext::currentContext();
     QSurface * currentSurface = currentContext->surface();
-
     if (!_webSurface) {
         _webSurface = new OffscreenQmlSurface();
         _webSurface->create(currentContext);
@@ -98,16 +100,35 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
                 return;
             }
 
+            if (event->button() == Qt::MouseButton::RightButton) {
+                if (event->type() == QEvent::MouseButtonPress) {
+                    const QMouseEvent* mouseEvent = static_cast<const QMouseEvent*>(event);
+                    _lastPress = toGlm(mouseEvent->pos());
+                }
+            }
+
             if (intersection.entityID == getID()) {
                 if (event->button() == Qt::MouseButton::RightButton) {
                     if (event->type() == QEvent::MouseButtonRelease) {
-                        AbstractViewStateInterface::instance()->postLambdaEvent([this] {
-                            QMetaObject::invokeMethod(_webSurface->getRootItem(), "goBack");
-                        });
+                        const QMouseEvent* mouseEvent = static_cast<const QMouseEvent*>(event);
+                        ivec2 dist = glm::abs(toGlm(mouseEvent->pos()) - _lastPress);
+                        if (!glm::any(glm::greaterThan(dist, ivec2(1)))) {
+                            AbstractViewStateInterface::instance()->postLambdaEvent([this] {
+                                QMetaObject::invokeMethod(_webSurface->getRootItem(), "goBack");
+                            });
+                        }
+                        _lastPress = ivec2(INT_MIN);
                     }
                     return;
                 }
 
+                // FIXME doesn't work... double click events not received
+                if (event->type() == QEvent::MouseButtonDblClick) {
+                    AbstractViewStateInterface::instance()->postLambdaEvent([this] {
+                        _webSurface->getRootItem()->setProperty("url", _sourceUrl);
+                    });
+                }
+
                 if (event->button() == Qt::MouseButton::MiddleButton) {
                     if (event->type() == QEvent::MouseButtonRelease) {
                         AbstractViewStateInterface::instance()->postLambdaEvent([this] {
@@ -133,6 +154,7 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
                 QCoreApplication::sendEvent(_webSurface->getWindow(), &mappedEvent);
             }
         };
+
         EntityTreeRenderer* renderer = static_cast<EntityTreeRenderer*>(args->_renderer);
         QObject::connect(renderer, &EntityTreeRenderer::mousePressOnEntity, forwardMouseEvent);
         QObject::connect(renderer, &EntityTreeRenderer::mouseReleaseOnEntity, forwardMouseEvent);
@@ -147,6 +169,7 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
     _webSurface->resize(QSize(dims.x, dims.y));
     currentContext->makeCurrent(currentSurface);
 
+    Glower glow(0);
     PerformanceTimer perfTimer("RenderableWebEntityItem::render");
     assert(getType() == EntityTypes::Web);
     glm::vec3 position = getPosition();
@@ -181,6 +204,7 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
 }
 
 void RenderableWebEntityItem::setSourceUrl(const QString& value) {
+    qDebug() << "Setting web entity source URL to " << value;
     if (_sourceUrl != value) {
         _sourceUrl = value;
         if (_webSurface) {
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.h b/libraries/entities-renderer/src/RenderableWebEntityItem.h
index 8dad2a0855..559392367c 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.h
@@ -29,6 +29,7 @@ private:
     OffscreenQmlSurface* _webSurface{ nullptr };
     QMetaObject::Connection _connection;
     uint32_t _texture{ 0 };
+    ivec2  _lastPress{ INT_MIN };
     QMutex _textureLock;
 };