From b4c272aaa13c1f44beb2b6a9592e59171063aea3 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 9 Dec 2015 17:28:45 -0800
Subject: [PATCH 1/3] sam just left

---
 .../src/RenderableParticleEffectEntityItem.cpp        | 11 +++++++----
 libraries/script-engine/src/ScriptEngine.cpp          |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index 43c6373147..74c26c91d4 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -60,8 +60,7 @@ public:
     void setTexture(gpu::TexturePointer texture) { _texture = texture; }
     const gpu::TexturePointer& getTexture() const { return _texture; }
 
-    bool getVisibleFlag() const { return _visibleFlag; }
-    void setVisibleFlag(bool visibleFlag) { _visibleFlag = visibleFlag; }
+    bool getVisibleFlag() const { return _entity->isVisible(); }
 
     void render(RenderArgs* args) const {
         assert(_pipeline);
@@ -91,7 +90,7 @@ protected:
     gpu::BufferPointer _vertexBuffer;
     gpu::BufferPointer _indexBuffer;
     gpu::TexturePointer _texture;
-    bool _visibleFlag = true;
+
 };
 
 namespace render {
@@ -111,7 +110,11 @@ namespace render {
 
     template <>
     void payloadRender(const ParticlePayload::Pointer& payload, RenderArgs* args) {
-        payload->render(args);
+        if (args) {
+            if (payload && payload->getVisibleFlag()) {
+                payload->render(args);
+            }
+        }
     }
 }
 
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 3306659c80..a075b0a91d 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -82,7 +82,7 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) {
 }
 
 Q_DECLARE_METATYPE(controller::InputController*)
-static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
+//static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
 
 QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) {
     return engine->newQObject(in);

From 4e93f3ae81d1320b00e702a11ea69569d2ccbae1 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 9 Dec 2015 18:26:13 -0800
Subject: [PATCH 2/3] respect visibility yay

---
 .../src/RenderableParticleEffectEntityItem.cpp  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index 74c26c91d4..edbfb6158c 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -60,8 +60,6 @@ public:
     void setTexture(gpu::TexturePointer texture) { _texture = texture; }
     const gpu::TexturePointer& getTexture() const { return _texture; }
 
-    bool getVisibleFlag() const { return _entity->isVisible(); }
-
     void render(RenderArgs* args) const {
         assert(_pipeline);
 
@@ -80,23 +78,23 @@ public:
         auto numIndices = _indexBuffer->getSize() / sizeof(uint16_t);
         batch.drawIndexed(gpu::TRIANGLES, numIndices);
     }
+   
+    EntityItemPointer _entity;
 
 protected:
-    EntityItemPointer _entity;
     Transform _modelTransform;
     AABox _bound;
     gpu::PipelinePointer _pipeline;
     gpu::Stream::FormatPointer _vertexFormat;
     gpu::BufferPointer _vertexBuffer;
     gpu::BufferPointer _indexBuffer;
-    gpu::TexturePointer _texture;
-
+    gpu::TexturePointer _texture; 
 };
 
 namespace render {
     template <>
     const ItemKey payloadGetKey(const ParticlePayload::Pointer& payload) {
-        if (payload->getVisibleFlag()) {
+        if (payload->_entity->getVisible()) {
             return ItemKey::Builder::transparentShape();
         } else {
             return ItemKey::Builder().withInvisible().build();
@@ -110,11 +108,10 @@ namespace render {
 
     template <>
     void payloadRender(const ParticlePayload::Pointer& payload, RenderArgs* args) {
-        if (args) {
-            if (payload && payload->getVisibleFlag()) {
-                payload->render(args);
-            }
+        if (payload->_entity->getVisible()) {
+            payload->render(args);
         }
+
     }
 }
 

From 9ecb2b22770c25e421c80302b4b112c951ec9569 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 9 Dec 2015 18:27:45 -0800
Subject: [PATCH 3/3] uncomment sams change to scriptengine

---
 libraries/script-engine/src/ScriptEngine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index a075b0a91d..3306659c80 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -82,7 +82,7 @@ void avatarDataFromScriptValue(const QScriptValue &object, AvatarData* &out) {
 }
 
 Q_DECLARE_METATYPE(controller::InputController*)
-//static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
+static int inputControllerPointerId = qRegisterMetaType<controller::InputController*>();
 
 QScriptValue inputControllerToScriptValue(QScriptEngine *engine, controller::InputController* const &in) {
     return engine->newQObject(in);