From 7713c1f4bfb664cf9d3e322367e219fe049a24f8 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Wed, 3 Aug 2016 15:56:41 -0700
Subject: [PATCH] try to fade in web entities

---
 libraries/entities-renderer/src/RenderableEntityItem.cpp  | 2 +-
 .../entities-renderer/src/RenderablePolyLineEntityItem.h  | 2 ++
 .../entities-renderer/src/RenderableWebEntityItem.cpp     | 8 ++++++--
 libraries/entities-renderer/src/RenderableWebEntityItem.h | 5 +++++
 libraries/render-utils/src/simple.slf                     | 3 ++-
 libraries/render-utils/src/simple_textured.slf            | 3 ++-
 libraries/render-utils/src/simple_textured_unlit.slf      | 3 ++-
 7 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index d49eacdf7b..bd34506250 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -19,7 +19,7 @@ namespace render {
             if (payload->entity->getType() == EntityTypes::Light) {
                 return ItemKey::Builder::light();
             }
-            if (payload && (payload->entity->getType() == EntityTypes::PolyLine || payload->entity->isTransparent())) {
+            if (payload && payload->entity->isTransparent()) {
                 return ItemKey::Builder::transparentShape();
             }
         }
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index dfde97c407..46716e5bab 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -32,6 +32,8 @@ public:
     virtual void update(const quint64& now) override;
     virtual bool needsToCallUpdate() const override { return true; };
 
+    bool isTransparent() override { return true; }
+
     SIMPLE_RENDERABLE();
 
     NetworkTexturePointer _texture;
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
index d86aa8e2f9..bb5cb7e2f8 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -181,6 +181,7 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
         if (!buildWebSurface(static_cast<EntityTreeRenderer*>(args->_renderer))) {
             return;
         }
+        _fadeStartTime = usecTimestampNow();
         #endif
     }
 
@@ -208,10 +209,13 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
         batch._glActiveBindTexture(GL_TEXTURE0, GL_TEXTURE_2D, _texture);
         textured = emissive = true;
     }
-    bool transparent = false;
+
+    float fadeRatio = Interpolate::calculateFadeRatio(_fadeStartTime);
+    bool transparent = fadeRatio < 1.0f;
+    batch._glColor4f(1.0f, 1.0f, 1.0f, fadeRatio);
 
     DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch, textured, transparent, culled, emissive);
-    DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, texMin, texMax, glm::vec4(1.0f, 1.0f, 1.0f, 0.0f));
+    DependencyManager::get<GeometryCache>()->renderQuad(batch, topLeft, bottomRight, texMin, texMax, glm::vec4(1.0f, 1.0f, 1.0f, 1.0f));
 }
 
 void RenderableWebEntityItem::setSourceUrl(const QString& value) {
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.h b/libraries/entities-renderer/src/RenderableWebEntityItem.h
index 4125be61dd..049575ec95 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.h
@@ -12,6 +12,7 @@
 #include <QSharedPointer>
 
 #include <WebEntityItem.h>
+#include <Interpolate.h>
 
 #include "RenderableEntityItem.h"
 
@@ -35,6 +36,8 @@ public:
     void update(const quint64& now) override;
     bool needsToCallUpdate() const override { return _webSurface != nullptr; }
 
+    bool isTransparent() override { return Interpolate::calculateFadeRatio(_fadeStartTime) < 1.0f; }
+
     SIMPLE_RENDERABLE();
 
 private:
@@ -53,6 +56,8 @@ private:
     QMetaObject::Connection _mouseReleaseConnection;
     QMetaObject::Connection _mouseMoveConnection;
     QMetaObject::Connection _hoverLeaveConnection;
+
+    quint64 _fadeStartTime;
 };
 
 
diff --git a/libraries/render-utils/src/simple.slf b/libraries/render-utils/src/simple.slf
index fff91a9261..85d85b3db7 100644
--- a/libraries/render-utils/src/simple.slf
+++ b/libraries/render-utils/src/simple.slf
@@ -49,7 +49,8 @@ void main(void) {
 
 #endif
 
-    if (_color.a < 1.0) {
+    const float ALPHA_THRESHOLD = 0.999;
+    if (_color.a < ALPHA_THRESHOLD) {
         if (emissiveAmount > 0.0) {
             // TODO: transparent emissive?
             packDeferredFragmentTranslucent(
diff --git a/libraries/render-utils/src/simple_textured.slf b/libraries/render-utils/src/simple_textured.slf
index 815d28310f..6067c81a1b 100644
--- a/libraries/render-utils/src/simple_textured.slf
+++ b/libraries/render-utils/src/simple_textured.slf
@@ -30,7 +30,8 @@ void main(void) {
         texel = colorToLinearRGBA(texel);
     }
 
-    if (_color.a * texel.a < 1.0) {
+    const float ALPHA_THRESHOLD = 0.999;
+    if (_color.a * texel.a < ALPHA_THRESHOLD) {
         packDeferredFragmentTranslucent(
             normalize(_normal),
             _color.a * texel.a,
diff --git a/libraries/render-utils/src/simple_textured_unlit.slf b/libraries/render-utils/src/simple_textured_unlit.slf
index 296f805902..4f02140825 100644
--- a/libraries/render-utils/src/simple_textured_unlit.slf
+++ b/libraries/render-utils/src/simple_textured_unlit.slf
@@ -29,7 +29,8 @@ void main(void) {
         texel = colorToLinearRGBA(texel);
     }
 
-    if (_color.a * texel.a < 1.0) {
+    const float ALPHA_THRESHOLD = 0.999;
+    if (_color.a * texel.a < ALPHA_THRESHOLD) {
         packDeferredFragmentTranslucent(
             normalize(_normal),
             _color.a * texel.a,