Rework modules

src/Nazara/Physics3D/Physics3D.cpp

@@ -13,65 +13,22 @@
 
 namespace Nz
 {
+	Physics3D::Physics3D() :
+	Module("Physics3D", this)
+	{
+		if (!Collider3D::Initialize())
+			throw std::runtime_error("failed to initialize colliders");
+	}
+
+	Physics3D::~Physics3D()
+	{
+		Collider3D::Uninitialize();
+	}
+
 	unsigned int Physics3D::GetMemoryUsed()
 	{
 		return NewtonGetMemoryUsed();
 	}
 
-	bool Physics3D::Initialize()
-	{
-		if (s_moduleReferenceCounter > 0)
-		{
-			s_moduleReferenceCounter++;
-			return true; // Déjà initialisé
-		}
-
-		// Initialisation des dépendances
-		if (!Core::Initialize())
-		{
-			NazaraError("Failed to initialize core module");
-			return false;
-		}
-
-		s_moduleReferenceCounter++;
-
-		// Initialisation du module
-		if (!Collider3D::Initialize())
-		{
-			NazaraError("Failed to initialize geoms");
-			return false;
-		}
-
-		NazaraNotice("Initialized: Physics3D module");
-		return true;
-	}
-
-	bool Physics3D::IsInitialized()
-	{
-		return s_moduleReferenceCounter != 0;
-	}
-
-	void Physics3D::Uninitialize()
-	{
-		if (s_moduleReferenceCounter != 1)
-		{
-			// Le module est soit encore utilisé, soit pas initialisé
-			if (s_moduleReferenceCounter > 1)
-				s_moduleReferenceCounter--;
-
-			return;
-		}
-
-		// Libération du module
-		Collider3D::Uninitialize();
-
-		s_moduleReferenceCounter = 0;
-
-		NazaraNotice("Uninitialized: Physics3D module");
-
-		// Libération des dépendances
-		Core::Uninitialize();
-	}
-
-	unsigned int Physics3D::s_moduleReferenceCounter = 0;
+	Physics3D* Physics3D::s_instance;
 }