From 49a7f8c9108e8b9a12a58ee3b42d89be931f2975 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 15 May 2014 12:42:38 -0700 Subject: [PATCH] formatting some lines that are too long --- interface/src/renderer/Model.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp index 6cb62dbcfd..90ae9e5e46 100644 --- a/interface/src/renderer/Model.cpp +++ b/interface/src/renderer/Model.cpp @@ -674,14 +674,16 @@ void Model::computeBoundingShape(const FBXGeometry& geometry) { if (parentIndex == -1) { glm::mat4 baseTransform = glm::scale(_scale) * glm::translate(_offset); glm::quat combinedRotation = joint.preRotation * joint.rotation * joint.postRotation; - transforms[i] = baseTransform * geometry.offset * glm::translate(joint.translation) * joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform; + transforms[i] = baseTransform * geometry.offset * glm::translate(joint.translation) + * joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform; rootOffset = extractTranslation(transforms[i]); finalRotations[i] = combinedRotation; ++numShapesSet; shapeIsSet[i] = true; } else if (shapeIsSet[parentIndex]) { glm::quat combinedRotation = joint.preRotation * joint.rotation * joint.postRotation; - transforms[i] = transforms[parentIndex] * glm::translate(joint.translation) * joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform; + transforms[i] = transforms[parentIndex] * glm::translate(joint.translation) + * joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform; finalRotations[i] = finalRotations[parentIndex] * combinedRotation; ++numShapesSet; shapeIsSet[i] = true;