From 92d4b08c3854c92ccb41374eb5c92b97793b1057 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 15 May 2015 17:52:06 +0200 Subject: [PATCH] Init _transform with correct values --- libraries/entities/src/EntityItem.cpp | 3 +++ libraries/entities/src/EntityItemPropertiesDefaults.h | 1 + libraries/shared/src/Transform.h | 9 ++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 9e0b755ca2..0a6a3ae051 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -40,6 +40,9 @@ EntityItem::EntityItem(const EntityItemID& entityItemID) : _lastEditedFromRemoteInRemoteTime(0), _created(UNKNOWN_CREATED_TIME), _changedOnServer(0), + _transform(ENTITY_ITEM_DEFAULT_ROTATION, + ENTITY_ITEM_DEFAULT_DIMENSIONS, + ENTITY_ITEM_DEFAULT_POSITION), _glowLevel(ENTITY_ITEM_DEFAULT_GLOW_LEVEL), _localRenderAlpha(ENTITY_ITEM_DEFAULT_LOCAL_RENDER_ALPHA), _density(ENTITY_ITEM_DEFAULT_DENSITY), diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h index b33e6de1ac..3f634557d1 100644 --- a/libraries/entities/src/EntityItemPropertiesDefaults.h +++ b/libraries/entities/src/EntityItemPropertiesDefaults.h @@ -36,6 +36,7 @@ const glm::vec3 ENTITY_ITEM_DEFAULT_REGISTRATION_POINT = glm::vec3(0.5f, 0.5f, 0 const float ENTITY_ITEM_IMMORTAL_LIFETIME = -1.0f; /// special lifetime which means the entity lives for ever const float ENTITY_ITEM_DEFAULT_LIFETIME = ENTITY_ITEM_IMMORTAL_LIFETIME; +const glm::vec3 ENTITY_ITEM_DEFAULT_POSITION = ENTITY_ITEM_ZERO_VEC3; const glm::quat ENTITY_ITEM_DEFAULT_ROTATION; const float ENTITY_ITEM_DEFAULT_WIDTH = 0.1f; const glm::vec3 ENTITY_ITEM_DEFAULT_DIMENSIONS = glm::vec3(ENTITY_ITEM_DEFAULT_WIDTH); diff --git a/libraries/shared/src/Transform.h b/libraries/shared/src/Transform.h index ec4513e51c..fd6a4bda4b 100644 --- a/libraries/shared/src/Transform.h +++ b/libraries/shared/src/Transform.h @@ -34,7 +34,14 @@ public: Transform() : _rotation(1.0f, 0, 0, 0), _scale(1.0f), - _translation(0), + _translation(0.0f), + _flags(FLAG_CACHE_INVALID_BITSET) // invalid cache + { + } + Transform(Quat rotation, Vec3 scale, Vec3 translation) : + _rotation(rotation), + _scale(scale), + _translation(translation), _flags(FLAG_CACHE_INVALID_BITSET) // invalid cache { }