Sdk: Rename [Collision|Physics]Component to [Collision|Physics]Component3D

2016-10-13 08:23:25 +02:00
parent b52c7c57bf
commit be44a89a85
18 changed files with 136 additions and 136 deletions
--- a/SDK/src/NDK/Systems/PhysicsSystem3D.cpp
+++ b/SDK/src/NDK/Systems/PhysicsSystem3D.cpp
@@ -0,0 +1,131 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#include <NDK/Systems/PhysicsSystem3D.hpp>
+#include <Nazara/Physics3D/RigidBody3D.hpp>
+#include <NDK/Components/CollisionComponent3D.hpp>
+#include <NDK/Components/NodeComponent.hpp>
+#include <NDK/Components/PhysicsComponent3D.hpp>
+
+namespace Ndk
+{
+	/*!
+	* \ingroup NDK
+	* \class Ndk::PhysicsSystem
+	* \brief NDK class that represents the physics system
+	*
+	* \remark This system is enabled if the entity has the trait: NodeComponent and any of these two: CollisionComponent3D or PhysicsComponent3D
+	* \remark Static objects do not have a velocity specified by the physical engine
+	*/
+
+	/*!
+	* \brief Constructs an PhysicsSystem object by default
+	*/
+
+	PhysicsSystem3D::PhysicsSystem3D()
+	{
+		Requires<NodeComponent>();
+		RequiresAny<CollisionComponent3D, PhysicsComponent3D>();
+	}
+
+	/*!
+	* \brief Constructs a PhysicsSystem object by copy semantic
+	*
+	* \param system PhysicsSystem to copy
+	*/
+
+	PhysicsSystem3D::PhysicsSystem3D(const PhysicsSystem3D& system) :
+	System(system),
+	m_world()
+	{
+	}
+
+	/*!
+	* \brief Operation to perform when entity is validated for the system
+	*
+	* \param entity Pointer to the entity
+	* \param justAdded Is the entity newly added
+	*/
+
+	void PhysicsSystem3D::OnEntityValidation(Entity* entity, bool justAdded)
+	{
+		// It's possible our entity got revalidated because of the addition/removal of a PhysicsComponent3D
+		if (!justAdded)
+		{
+			// We take the opposite array from which the entity should belong to
+			auto& entities = (entity->HasComponent<PhysicsComponent3D>()) ? m_staticObjects : m_dynamicObjects;
+			entities.Remove(entity);
+		}
+
+		auto& entities = (entity->HasComponent<PhysicsComponent3D>()) ? m_dynamicObjects : m_staticObjects;
+		entities.Insert(entity);
+
+		if (!m_world)
+			m_world = std::make_unique<Nz::PhysWorld3D>();
+	}
+
+	/*!
+	* \brief Operation to perform when system is updated
+	*
+	* \param elapsedTime Delta time used for the update
+	*/
+
+	void PhysicsSystem3D::OnUpdate(float elapsedTime)
+	{
+		if (!m_world)
+			return;
+
+		m_world->Step(elapsedTime);
+
+		for (const Ndk::EntityHandle& entity : m_dynamicObjects)
+		{
+			NodeComponent& node = entity->GetComponent<NodeComponent>();
+			PhysicsComponent3D& phys = entity->GetComponent<PhysicsComponent3D>();
+
+			Nz::RigidBody3D& physObj = phys.GetPhysObject();
+			node.SetRotation(physObj.GetRotation(), Nz::CoordSys_Global);
+			node.SetPosition(physObj.GetPosition(), Nz::CoordSys_Global);
+		}
+
+		float invElapsedTime = 1.f / elapsedTime;
+		for (const Ndk::EntityHandle& entity : m_staticObjects)
+		{
+			CollisionComponent3D& collision = entity->GetComponent<CollisionComponent3D>();
+			NodeComponent& node = entity->GetComponent<NodeComponent>();
+
+			Nz::RigidBody3D* physObj = collision.GetStaticBody();
+
+			Nz::Quaternionf oldRotation = physObj->GetRotation();
+			Nz::Vector3f oldPosition = physObj->GetPosition();
+			Nz::Quaternionf newRotation = node.GetRotation(Nz::CoordSys_Global);
+			Nz::Vector3f newPosition = node.GetPosition(Nz::CoordSys_Global);
+
+			// To move static objects and ensure their collisions, we have to specify them a velocity
+			// (/!\: the physical motor does not apply the speed on static objects)
+			if (newPosition != oldPosition)
+			{
+				physObj->SetPosition(newPosition);
+				physObj->SetVelocity((newPosition - oldPosition) * invElapsedTime);
+			}
+			else
+				physObj->SetVelocity(Nz::Vector3f::Zero());
+
+			if (newRotation != oldRotation)
+			{
+				Nz::Quaternionf transition = newRotation * oldRotation.GetConjugate();
+				Nz::EulerAnglesf angles = transition.ToEulerAngles();
+				Nz::Vector3f angularVelocity(Nz::ToRadians(angles.pitch * invElapsedTime),
+				                             Nz::ToRadians(angles.yaw * invElapsedTime),
+				                             Nz::ToRadians(angles.roll * invElapsedTime));
+
+				physObj->SetRotation(oldRotation);
+				physObj->SetAngularVelocity(angularVelocity);
+			}
+			else
+				physObj->SetAngularVelocity(Nz::Vector3f::Zero());
+		}
+	}
+
+	SystemIndex PhysicsSystem3D::systemIndex;
+}