From ac46f84291d9325b0b41124eae6159ed6cfff76e Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 24 Apr 2015 18:36:41 -0700
Subject: [PATCH] cleanups

---
 .../entities-renderer/src/EntityTreeRenderer.cpp | 15 ---------------
 .../src/RenderableModelEntityItem.cpp            | 16 ++++------------
 libraries/entities/src/EntityItem.cpp            | 11 +++++------
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index fbfa882494..586e9a50ad 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -677,26 +677,11 @@ void EntityTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args)
                     if (bigEnoughToRender) {
                         renderProxies(entityItem, args);
 
-
-                        // XXX
-                        // auto nodeList = DependencyManager::get<NodeList>();
-                        // const QUuid& myNodeID = nodeList->getSessionUUID();
-                        // XXX
-
-
                         Glower* glower = NULL;
                         if (entityItem->getGlowLevel() > 0.0f) {
                             glower = new Glower(entityItem->getGlowLevel());
                         }
 
-                        // XXX glow things we are simulating
-                        // if (entityItem->getSimulatorID() == myNodeID) {
-                        //     if (glower) delete glower;
-                        //     glower = new Glower();
-                        // }
-                        // XXX glow things we are simulating
-
-
                         entityItem->render(args);
                         args->_itemsRendered++;
                         if (glower) {
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c4e12eb957..25922bed10 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -119,25 +119,17 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
     glm::vec3 dimensions = getDimensions();
     float size = glm::length(dimensions);
 
-    // XXX
-    auto nodeList = DependencyManager::get<NodeList>();
-    const QUuid& myNodeID = nodeList->getSessionUUID();
-    // XXX
-    
+    auto nodeList = DependencyManager::get<NodeList>(); // XXX for debugging
+    const QUuid& myNodeID = nodeList->getSessionUUID(); // XXX for debugging
+
     if (drawAsModel
-        && getSimulatorID() != myNodeID // XXX
+        && getSimulatorID() != myNodeID // XXX for debugging
         ) {
         remapTextures();
         glPushMatrix();
         {
             float alpha = getLocalRenderAlpha();
 
-            // XXX
-            // if (getSimulatorID() == myNodeID) {
-            //     alpha = 1.0;
-            // }
-            // XXX
-
             if (!_model || _needsModelReload) {
                 // TODO: this getModel() appears to be about 3% of model render time. We should optimize
                 PerformanceTimer perfTimer("getModel");
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 06a0cc52c2..5552013ca2 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -1151,14 +1151,13 @@ void EntityItem::updateVelocityInDomainUnits(const glm::vec3& value) {
 }
 
 void EntityItem::updateVelocity(const glm::vec3& value) { 
-    auto distance = glm::distance(_velocity, value);
-    if (distance > MIN_VELOCITY_DELTA) {
-        _dirtyFlags |= EntityItem::DIRTY_VELOCITY;
-        if (distance < MIN_VELOCITY_DELTA) {
+    if (glm::distance(_velocity, value) > MIN_VELOCITY_DELTA) {
+        if (glm::length(value) < MIN_VELOCITY_DELTA) {
             _velocity = ENTITY_ITEM_ZERO_VEC3;
         } else {
             _velocity = value;
         }
+        _dirtyFlags |= EntityItem::DIRTY_VELOCITY;
     }
 }
 
@@ -1176,15 +1175,15 @@ void EntityItem::updateGravityInDomainUnits(const glm::vec3& value) {
 
 void EntityItem::updateGravity(const glm::vec3& value) { 
     if (glm::distance(_gravity, value) > MIN_GRAVITY_DELTA) {
-        _dirtyFlags |= EntityItem::DIRTY_VELOCITY;
         _gravity = value;
+        _dirtyFlags |= EntityItem::DIRTY_VELOCITY;
     }
 }
 
 void EntityItem::updateAcceleration(const glm::vec3& value) { 
     if (glm::distance(_acceleration, value) > MIN_ACCELERATION_DELTA) {
-        _dirtyFlags |= EntityItem::DIRTY_VELOCITY;
         _acceleration = value;
+        _dirtyFlags |= EntityItem::DIRTY_VELOCITY;
     }
 }