From ecfacee5876ad73a5fc4daa1746914390b2db8ae Mon Sep 17 00:00:00 2001 From: William Moberg Date: Tue, 9 Feb 2016 19:33:28 +0100 Subject: [PATCH] Undo debug test code. --- src/Engine/Collision/Collision.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Engine/Collision/Collision.cpp b/src/Engine/Collision/Collision.cpp index a20ae4d3..c0c27190 100644 --- a/src/Engine/Collision/Collision.cpp +++ b/src/Engine/Collision/Collision.cpp @@ -568,10 +568,10 @@ bool AABBvsTriangles(const AABB& box, boost::optional EntityAbsoluteAABB(EntityWrapper& entity) { AABB modelSpaceBox; - /*if (entity.HasComponent("AABB")) { + if (entity.HasComponent("AABB")) { ComponentWrapper& cAABB = entity["AABB"]; modelSpaceBox = EntityAABB::FromOriginSize((glm::vec3)cAABB["Origin"], (glm::vec3)cAABB["Size"]); - } else */if (entity.HasComponent("Model")) { + } else if (entity.HasComponent("Model")) { Model* model; std::string res = entity["Model"]["Resource"]; if (res.empty()) { @@ -584,7 +584,6 @@ boost::optional EntityAbsoluteAABB(EntityWrapper& entity) } catch (const std::exception&) { return boost::none; } - entity.AttachComponent("AABB"); modelSpaceBox = model->Box(); } else { return boost::none; @@ -610,8 +609,6 @@ boost::optional EntityAbsoluteAABB(EntityWrapper& entity) aabb = AABB(mini, maxi); aabb.Entity = entity; - (glm::vec3&)entity["AABB"]["Origin"] = aabb.Origin(); - (glm::vec3&)entity["AABB"]["Size"] = aabb.Size(); return aabb; }