BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Debug test code.

Browse Source
This commit is contained in:
William Moberg
2016-02-09 19:23:12 +01:00
parent 7140b740b5
commit a93ccecfeb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Collision/Collision.cpp
+5 -3
View File
@@ -568,10 +568,10 @@ bool AABBvsTriangles(const AABB& box,
boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity) boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity)
{ {
AABB modelSpaceBox; AABB modelSpaceBox;
if (entity.HasComponent("AABB")) { /*if (entity.HasComponent("AABB")) {
ComponentWrapper& cAABB = entity["AABB"]; ComponentWrapper& cAABB = entity["AABB"];
modelSpaceBox = EntityAABB::FromOriginSize((glm::vec3)cAABB["Origin"], (glm::vec3)cAABB["Size"]); modelSpaceBox = EntityAABB::FromOriginSize((glm::vec3)cAABB["Origin"], (glm::vec3)cAABB["Size"]);
} else if (entity.HasComponent("Model")) { } else */if (entity.HasComponent("Model")) {
Model* model; Model* model;
std::string res = entity["Model"]["Resource"]; std::string res = entity["Model"]["Resource"];
if (res.empty()) { if (res.empty()) {
@@ -584,6 +584,7 @@ boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity)
} catch (const std::exception&) { } catch (const std::exception&) {
return boost::none; return boost::none;
} }
entity.AttachComponent("AABB");
modelSpaceBox = model->Box(); modelSpaceBox = model->Box();
} else { } else {
return boost::none; return boost::none;
@@ -609,7 +610,8 @@ boost::optional<EntityAABB> EntityAbsoluteAABB(EntityWrapper& entity)
aabb = AABB(mini, maxi); aabb = AABB(mini, maxi);
aabb.Entity = entity; aabb.Entity = entity;
(glm::vec3&)entity["AABB"]["Origin"] = aabb.Origin();
(glm::vec3&)entity["AABB"]["Size"] = aabb.Size();
return aabb; return aabb;
} }