From c2b0ccd6b395ec6a5729adfc17f0cac15f98a4d1 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 11 Nov 2015 08:30:04 -0800
Subject: [PATCH] show simulation ownership with status icons

---
 .../src/RenderableEntityItem.cpp              | 13 ++++++++++++
 .../src/RenderableEntityItem.h                | 21 +++++++++----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/libraries/entities-renderer/src/RenderableEntityItem.cpp b/libraries/entities-renderer/src/RenderableEntityItem.cpp
index e55ba44487..ea6f004b30 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -75,4 +75,17 @@ void makeEntityItemStatusGetters(EntityItem* entity, render::Item::Status::Gette
         return render::Item::Status::Value(0.0f, render::Item::Status::Value::BLUE,
                                            (unsigned char)RenderItemStatusIcon::ACTIVE_IN_BULLET);
     });
+
+    statusGetters.push_back([entity] () -> render::Item::Status::Value {
+        auto nodeList = DependencyManager::get<NodeList>();
+        const QUuid& myNodeID = nodeList->getSessionUUID();
+        bool weOwnSimulation = entity->getSimulationOwner().matchesValidID(myNodeID);
+
+        if (weOwnSimulation) {
+            return render::Item::Status::Value(1.0f, render::Item::Status::Value::BLUE,
+                                               (unsigned char)RenderItemStatusIcon::SIMULATION_OWNER);
+        }
+        return render::Item::Status::Value(0.0f, render::Item::Status::Value::BLUE,
+                                           (unsigned char)RenderItemStatusIcon::SIMULATION_OWNER);
+    });
 }
diff --git a/libraries/entities-renderer/src/RenderableEntityItem.h b/libraries/entities-renderer/src/RenderableEntityItem.h
index 254a76d291..4da8ff1b4c 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -18,12 +18,11 @@
 // These or the icon "name" used by the render item status value, they correspond to the atlas texture used by the DrawItemStatus
 // job in the current rendering pipeline defined as of now  (11/2015) in render-utils/RenderDeferredTask.cpp.
 enum class RenderItemStatusIcon {
-	PACKET_RECEIVED = 2,
-	PACKET_SENT = 1,
-	ACTIVE_IN_BULLET = 0,
-	SIMULATION_OWNER = 3,
-
-	NONE = 255
+    ACTIVE_IN_BULLET = 0,
+    PACKET_SENT = 1,
+    PACKET_RECEIVED = 2,
+    SIMULATION_OWNER = 3,
+    NONE = 255
 };
 
 
@@ -32,7 +31,7 @@ public:
     RenderableEntityItemProxy(EntityItemPointer entity) : entity(entity) { }
     typedef render::Payload<RenderableEntityItemProxy> Payload;
     typedef Payload::DataPointer Pointer;
-    
+
     EntityItemPointer entity;
 };
 
@@ -47,19 +46,19 @@ class SimpleRenderableEntityItem {
 public:
     bool addToScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) {
         _myItem = scene->allocateID();
-        
+
         auto renderData = std::make_shared<RenderableEntityItemProxy>(self);
         auto renderPayload = std::make_shared<RenderableEntityItemProxy::Payload>(renderData);
-        
+
         pendingChanges.resetItem(_myItem, renderPayload);
-        
+
         return true;
     }
 
     void removeFromScene(EntityItemPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) {
         pendingChanges.removeItem(_myItem);
     }
-    
+
 private:
     render::ItemID _myItem;
 };