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

EntityWrapper to uniquely identify entities and make using them a little easier

Browse Source
This commit is contained in:
sippeangelo
2016-01-14 15:43:19 +01:00
parent 28392def79
commit d34470256b
20 changed files with 106 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Collision/Collision.cpp
+5 -5
View File
@@ -283,15 +283,15 @@ bool attachAABBComponentFromModel(World* world, EntityID id)
return true;
}
boost::optional<AABB> EntityAbsoluteAABB(World* world, EntityID entity)
boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& entity)
{
if (!world->HasComponent(entity, "AABB")) {
if (!entity.HasComponent("AABB")) {
return boost::none;
}
ComponentWrapper& cAABB = world->GetComponent(entity, "AABB");
glm::vec3 absPosition = RenderQueueFactory::AbsolutePosition(world, entity);
glm::vec3 absScale = RenderQueueFactory::AbsoluteScale(world, entity);
ComponentWrapper& cAABB = entity["AABB"];
glm::vec3 absPosition = RenderQueueFactory::AbsolutePosition(entity.World, entity.ID);
glm::vec3 absScale = RenderQueueFactory::AbsoluteScale(entity.World, entity.ID);
glm::vec3 origin = absPosition + (glm::vec3)cAABB["Origin"];
glm::vec3 size = (glm::vec3)cAABB["Size"] * absScale;
return AABB::FromOriginSize(origin, size);