From e711b86519e99eaf855a33788468689b3f434da1 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Sat, 10 Jan 2015 19:07:58 -0800
Subject: [PATCH] scale DEFAULT_DIMENSIONS correctly

also remove a block of commented out cruft
---
 libraries/entities/src/EntityItem.cpp | 27 ---------------------------
 libraries/entities/src/EntityItem.h   |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index b89f5fedc0..4bf394314b 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -21,33 +21,6 @@
 #include "EntityItem.h"
 #include "EntityTree.h"
 
-/*
-const float EntityItem::IMMORTAL = -1.0f; /// special lifetime which means the entity lives for ever. default lifetime
-const float EntityItem::DEFAULT_GLOW_LEVEL = 0.0f;
-const float EntityItem::DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;
-const float EntityItem::DEFAULT_MASS = 1.0f;
-const float EntityItem::DEFAULT_LIFETIME = EntityItem::IMMORTAL;
-const QString EntityItem::DEFAULT_USER_DATA = QString("");
-const float EntityItem::DEFAULT_DAMPING = 0.39347f;  // approx timescale = 2.0 sec (see damping timescale formula in header)
-const glm::vec3 EntityItem::NO_VELOCITY = glm::vec3(0, 0, 0);
-const float EntityItem::EPSILON_VELOCITY_LENGTH = (1.0f / 1000.0f) / (float)TREE_SCALE; // really small: 1mm/second
-const glm::vec3 EntityItem::DEFAULT_VELOCITY = EntityItem::NO_VELOCITY;
-const glm::vec3 EntityItem::NO_GRAVITY = glm::vec3(0, 0, 0);
-const glm::vec3 EntityItem::REGULAR_GRAVITY = glm::vec3(0, (-9.8f / TREE_SCALE), 0);
-const glm::vec3 EntityItem::DEFAULT_GRAVITY = EntityItem::NO_GRAVITY;
-const QString EntityItem::DEFAULT_SCRIPT = QString("");
-const glm::quat EntityItem::DEFAULT_ROTATION;
-const glm::vec3 EntityItem::DEFAULT_DIMENSIONS = glm::vec3(0.1f, 0.1f, 0.1f);
-const glm::vec3 EntityItem::DEFAULT_REGISTRATION_POINT = glm::vec3(0.5f, 0.5f, 0.5f); // center
-const glm::vec3 EntityItem::NO_ANGULAR_VELOCITY = glm::vec3(0.0f, 0.0f, 0.0f);
-const glm::vec3 EntityItem::DEFAULT_ANGULAR_VELOCITY = NO_ANGULAR_VELOCITY;
-const float EntityItem::DEFAULT_ANGULAR_DAMPING = 2.0f;
-const bool EntityItem::DEFAULT_VISIBLE = true;
-const bool EntityItem::DEFAULT_IGNORE_FOR_COLLISIONS = false;
-const bool EntityItem::DEFAULT_COLLISIONS_WILL_MOVE = false;
-const bool EntityItem::DEFAULT_LOCKED = false;
-*/
-
 void EntityItem::initFromEntityItemID(const EntityItemID& entityItemID) {
     _id = entityItemID.id;
     _creatorTokenID = entityItemID.creatorTokenID;
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 9bdd73c503..1b8afa930b 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -35,7 +35,7 @@ class EntityTreeElementExtraEncodeData;
 #define DONT_ALLOW_INSTANTIATION virtual void pureVirtualFunctionPlaceHolder() = 0;
 #define ALLOW_INSTANTIATION virtual void pureVirtualFunctionPlaceHolder() { };
 
-const glm::vec3 DEFAULT_DIMENSIONS = glm::vec3(0.1f);
+const glm::vec3 DEFAULT_DIMENSIONS = glm::vec3(0.1f) / (float)TREE_SCALE;
 const glm::quat DEFAULT_ROTATION;
 const float DEFAULT_GLOW_LEVEL = 0.0f;
 const float DEFAULT_LOCAL_RENDER_ALPHA = 1.0f;