Merge fixes

2016-01-14 18:20:51 +01:00
parent 3a4f378ac5
commit 5e721325a4
10 changed files with 85 additions and 79 deletions
@@ -290,8 +290,8 @@ boost::optional<AABB> EntityAbsoluteAABB(EntityWrapper& 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 absPosition = Transform::AbsolutePosition(entity.World, entity.ID);
+    glm::vec3 absScale = Transform::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);