From e0d4a0b1e15d0ba572fdad15eadc3ea19e040c26 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 23 Apr 2015 09:36:41 -0700
Subject: [PATCH] Add functionality to turn zone picking off

---
 libraries/entities/src/EntityScriptingInterface.cpp | 9 +++++++++
 libraries/entities/src/EntityScriptingInterface.h   | 3 +++
 libraries/entities/src/ZoneEntityItem.cpp           | 6 ++++++
 libraries/entities/src/ZoneEntityItem.h             | 6 +++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 53335beda0..13e6b83393 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -15,6 +15,7 @@
 #include "EntityTree.h"
 #include "LightEntityItem.h"
 #include "ModelEntityItem.h"
+#include "ZoneEntityItem.h"
 
 
 EntityScriptingInterface::EntityScriptingInterface() :
@@ -315,6 +316,14 @@ bool EntityScriptingInterface::getLightsArePickable() const {
     return LightEntityItem::getLightsArePickable();
 }
 
+void EntityScriptingInterface::setZonesArePickable(bool value) {
+    ZoneEntityItem::setZonesArePickable(value);
+}
+
+bool EntityScriptingInterface::getZonesArePickable() const {
+    return ZoneEntityItem::getZonesArePickable();
+}
+
 void EntityScriptingInterface::setSendPhysicsUpdates(bool value) {
     EntityItem::setSendPhysicsUpdates(value);
 }
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 075f5a712b..151036e926 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -111,6 +111,9 @@ public slots:
     Q_INVOKABLE void setLightsArePickable(bool value);
     Q_INVOKABLE bool getLightsArePickable() const;
 
+    Q_INVOKABLE void setZonesArePickable(bool value);
+    Q_INVOKABLE bool getZonesArePickable() const;
+
     Q_INVOKABLE void setSendPhysicsUpdates(bool value);
     Q_INVOKABLE bool getSendPhysicsUpdates() const;
 
diff --git a/libraries/entities/src/ZoneEntityItem.cpp b/libraries/entities/src/ZoneEntityItem.cpp
index e0fe238c57..60a61e4e89 100644
--- a/libraries/entities/src/ZoneEntityItem.cpp
+++ b/libraries/entities/src/ZoneEntityItem.cpp
@@ -185,3 +185,9 @@ void ZoneEntityItem::debugDump() const {
     qCDebug(entities) << "                _stageHour:" << _stageHour;
 }
 
+bool ZoneEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+                         bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face,
+                         void** intersectedObject, bool precisionPicking) const {
+
+    return _zonesArePickable;
+}
diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h
index 8f1b15d174..bc1d77ab65 100644
--- a/libraries/entities/src/ZoneEntityItem.h
+++ b/libraries/entities/src/ZoneEntityItem.h
@@ -91,7 +91,11 @@ public:
 
     static bool getZonesArePickable() { return _zonesArePickable; }
     static void setZonesArePickable(bool value) { _zonesArePickable = value; }
-  
+
+    virtual bool supportsDetailedRayIntersection() const { return true; }
+    virtual bool findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+                         bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face,
+                         void** intersectedObject, bool precisionPicking) const;
 
     virtual void debugDump() const;