Revert "Indentation style changed to Horstmann"

This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
This commit is contained in:
2014-04-12 01:48:15 +02:00
parent d7e65ff118
commit 3470a80f40
61 changed files with 697 additions and 354 deletions
+15 -12
View File
@@ -14,11 +14,13 @@
//}
glm::vec3 Systems::TransformSystem::AbsolutePosition(EntityID entity)
{ glm::vec3 absPosition;
{
glm::vec3 absPosition;
glm::quat accumulativeOrientation;
do
{ auto transform = m_World->GetComponent<Components::Transform>(entity, "Transform");
{
auto transform = m_World->GetComponent<Components::Transform>(entity, "Transform");
//absPosition += transform->Position;
entity = m_World->GetEntityParent(entity);
auto transform2 = m_World->GetComponent<Components::Transform>(entity, "Transform");
@@ -26,34 +28,35 @@ glm::vec3 Systems::TransformSystem::AbsolutePosition(EntityID entity)
absPosition += transform2->Orientation * transform->Position;
else
absPosition += transform->Position;
}
while (entity != 0);
} while (entity != 0);
return absPosition * accumulativeOrientation;
}
glm::quat Systems::TransformSystem::AbsoluteOrientation(EntityID entity)
{ glm::quat absOrientation;
{
glm::quat absOrientation;
do
{ auto transform = m_World->GetComponent<Components::Transform>(entity, "Transform");
{
auto transform = m_World->GetComponent<Components::Transform>(entity, "Transform");
absOrientation *= transform->Orientation;
entity = m_World->GetEntityParent(entity);
}
while (entity != 0);
} while (entity != 0);
return absOrientation;
}
glm::vec3 Systems::TransformSystem::AbsoluteScale(EntityID entity)
{ glm::vec3 absScale(1);
{
glm::vec3 absScale(1);
do
{ auto transform = m_World->GetComponent<Components::Transform>(entity, "Transform");
{
auto transform = m_World->GetComponent<Components::Transform>(entity, "Transform");
absScale *= transform->Scale;
entity = m_World->GetEntityParent(entity);
}
while (entity != 0);
} while (entity != 0);
return absScale;
}