From 5c6df734c51a40f68cea2f8f51a7f19a4a062349 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 18 Nov 2015 10:47:53 -0800 Subject: [PATCH] initialize vector of vec3's --- libraries/fbx/src/FBXReader.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp index a4482574e2..2d2b2c4b0a 100644 --- a/libraries/fbx/src/FBXReader.cpp +++ b/libraries/fbx/src/FBXReader.cpp @@ -1535,15 +1535,16 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS meshIDsToMeshIndices.insert(it.key(), meshIndex); } - ShapeVertices cardinalDirections; - cardinalDirections.push_back(Vectors::UNIT_X); - cardinalDirections.push_back(Vectors::UNIT_Y); - cardinalDirections.push_back(Vectors::UNIT_Z); const float INV_SQRT_3 = 0.57735026918f; - cardinalDirections.push_back(glm::vec3(INV_SQRT_3, INV_SQRT_3, INV_SQRT_3)); - cardinalDirections.push_back(glm::vec3(INV_SQRT_3, -INV_SQRT_3, INV_SQRT_3)); - cardinalDirections.push_back(glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3)); - cardinalDirections.push_back(glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3)); + ShapeVertices cardinalDirections = { + Vectors::UNIT_X, + Vectors::UNIT_Y, + Vectors::UNIT_Z, + glm::vec3(INV_SQRT_3, INV_SQRT_3, INV_SQRT_3), + glm::vec3(INV_SQRT_3, -INV_SQRT_3, INV_SQRT_3), + glm::vec3(INV_SQRT_3, INV_SQRT_3, -INV_SQRT_3), + glm::vec3(INV_SQRT_3, -INV_SQRT_3, -INV_SQRT_3) + }; // now that all joints have been scanned compute a k-Dop bounding volume of mesh glm::vec3 defaultCapsuleAxis(0.0f, 1.0f, 0.0f);