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

Reset RenderQueueFactory.cpp to original state

Browse Source
This commit is contained in:
stiffly
2015-12-17 14:36:36 +01:00
parent 51a2da9cc0
commit 000adb198f
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Rendering/RenderQueueFactory.cpp
+6 -10
View File
@@ -46,11 +46,9 @@ glm::quat RenderQueueFactory::AbsoluteOrientation(World* world, EntityID entity)
glm::quat orientation; glm::quat orientation;
do { do {
if (world->HasComponent(entity, "Transform")) { ComponentWrapper transform = world->GetComponent(entity, "Transform");
ComponentWrapper transform = world->GetComponent(entity, "Transform"); orientation = glm::quat((glm::vec3)transform["Orientation"]) * orientation;
orientation = glm::quat((glm::vec3)transform["Orientation"]) * orientation; entity = world->GetParent(entity);
entity = world->GetParent(entity);
}
} while (entity != 0); } while (entity != 0);
return orientation; return orientation;
@@ -61,11 +59,9 @@ glm::vec3 RenderQueueFactory::AbsoluteScale(World* world, EntityID entity)
glm::vec3 scale(1.f); glm::vec3 scale(1.f);
do { do {
if (world->HasComponent(entity, "Transform")) { ComponentWrapper transform = world->GetComponent(entity, "Transform");
ComponentWrapper transform = world->GetComponent(entity, "Transform"); scale *= (glm::vec3)transform["Scale"];
scale *= (glm::vec3)transform["Scale"]; entity = world->GetParent(entity);
entity = world->GetParent(entity);
}
} while (entity != 0); } while (entity != 0);
return scale; return scale;