From 29a308dcaacfa138b721d183a146b38befe3988a Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Tue, 5 Mar 2019 10:07:33 -0800 Subject: [PATCH 1/3] adding modelScale initialization so that it does not fail the validScale check assert --- libraries/entities/src/ModelEntityItem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index 505ee26c0f..87d80ee044 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -40,6 +40,7 @@ ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID) : EntityItem( _type = EntityTypes::Model; _lastKnownCurrentFrame = -1; _visuallyReady = false; + _modelScale=glm::vec3(1.0f); } const QString ModelEntityItem::getTextures() const { From 36e9c604e9e70efde65c5a7f64044d0da052a022 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Tue, 5 Mar 2019 10:45:15 -0800 Subject: [PATCH 2/3] fixed based on comment --- libraries/entities/src/ModelEntityItem.cpp | 1 - libraries/entities/src/ModelEntityItem.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index 87d80ee044..505ee26c0f 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -40,7 +40,6 @@ ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID) : EntityItem( _type = EntityTypes::Model; _lastKnownCurrentFrame = -1; _visuallyReady = false; - _modelScale=glm::vec3(1.0f); } const QString ModelEntityItem::getTextures() const { diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h index 0efbbbb16c..89acd6179b 100644 --- a/libraries/entities/src/ModelEntityItem.h +++ b/libraries/entities/src/ModelEntityItem.h @@ -164,7 +164,7 @@ protected: int _lastKnownCurrentFrame{-1}; glm::u8vec3 _color; - glm::vec3 _modelScale; + glm::vec3 _modelScale {1.0f}; QString _modelURL; bool _relayParentJoints; bool _groupCulled { false }; From fab343a1d4d703009c585aca2bc7eba64e983cfe Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Tue, 5 Mar 2019 10:52:54 -0800 Subject: [PATCH 3/3] correcting spacing --- libraries/entities/src/ModelEntityItem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h index 89acd6179b..08468617ba 100644 --- a/libraries/entities/src/ModelEntityItem.h +++ b/libraries/entities/src/ModelEntityItem.h @@ -164,7 +164,7 @@ protected: int _lastKnownCurrentFrame{-1}; glm::u8vec3 _color; - glm::vec3 _modelScale {1.0f}; + glm::vec3 _modelScale { 1.0f }; QString _modelURL; bool _relayParentJoints; bool _groupCulled { false };