Merge remote-tracking branch 'origin/master' into RendererDecoupling

# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
Tleety
2015-12-14 13:16:56 +01:00
16 changed files with 260 additions and 130 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ glm::vec3 RenderQueueFactory::AbsolutePosition(World* world, EntityID entity)
do {
ComponentWrapper transform = world->GetComponent(entity, "Transform");
position += AbsoluteOrientation(world, entity) * (glm::vec3)transform["Position"];
position += (glm::vec3)transform["Position"];
entity = world->GetParent(entity);
} while (entity != 0);