diff --git a/SDK/src/NDK/Sdk.cpp b/SDK/src/NDK/Sdk.cpp index bf6c9abbb..895adf178 100644 --- a/SDK/src/NDK/Sdk.cpp +++ b/SDK/src/NDK/Sdk.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ namespace Ndk Nz::Lua::Initialize(); Nz::Noise::Initialize(); - Nz::Physics::Initialize(); + Nz::Physics3D::Initialize(); Nz::Utility::Initialize(); #ifndef NDK_SERVER @@ -161,7 +161,7 @@ namespace Ndk // Shared modules Nz::Lua::Uninitialize(); Nz::Noise::Uninitialize(); - Nz::Physics::Uninitialize(); + Nz::Physics3D::Uninitialize(); Nz::Utility::Uninitialize(); NazaraNotice("Uninitialized: SDK"); diff --git a/include/Nazara/Physics3D/Collider3D.hpp b/include/Nazara/Physics3D/Collider3D.hpp index e4f8de63e..463e6afac 100644 --- a/include/Nazara/Physics3D/Collider3D.hpp +++ b/include/Nazara/Physics3D/Collider3D.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once @@ -40,7 +40,7 @@ namespace Nz class NAZARA_PHYSICS3D_API Collider3D : public RefCounted { friend Collider3DLibrary; - friend class Physics; + friend class Physics3D; public: Collider3D() = default; diff --git a/include/Nazara/Physics3D/Collider3D.inl b/include/Nazara/Physics3D/Collider3D.inl index dc2d5184f..aeb7073d8 100644 --- a/include/Nazara/Physics3D/Collider3D.inl +++ b/include/Nazara/Physics3D/Collider3D.inl @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Physics3D/Config.hpp b/include/Nazara/Physics3D/Config.hpp index f2db50fce..91ecec8e3 100644 --- a/include/Nazara/Physics3D/Config.hpp +++ b/include/Nazara/Physics3D/Config.hpp @@ -1,5 +1,5 @@ /* - Nazara Engine - Physics module + Nazara Engine - Physics 3D module Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) diff --git a/include/Nazara/Physics3D/ConfigCheck.hpp b/include/Nazara/Physics3D/ConfigCheck.hpp index 937712b0e..6b1c82073 100644 --- a/include/Nazara/Physics3D/ConfigCheck.hpp +++ b/include/Nazara/Physics3D/ConfigCheck.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Physics3D/Debug.hpp b/include/Nazara/Physics3D/Debug.hpp index d8b47e454..f70a8b570 100644 --- a/include/Nazara/Physics3D/Debug.hpp +++ b/include/Nazara/Physics3D/Debug.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Physics3D/DebugOff.hpp b/include/Nazara/Physics3D/DebugOff.hpp index 4ea033e46..595f0ad94 100644 --- a/include/Nazara/Physics3D/DebugOff.hpp +++ b/include/Nazara/Physics3D/DebugOff.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp diff --git a/include/Nazara/Physics3D/Enums.hpp b/include/Nazara/Physics3D/Enums.hpp index 1951d3eda..853f30b23 100644 --- a/include/Nazara/Physics3D/Enums.hpp +++ b/include/Nazara/Physics3D/Enums.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Physics3D/PhysObject.hpp b/include/Nazara/Physics3D/PhysObject.hpp index e819c8e09..a2894d0ce 100644 --- a/include/Nazara/Physics3D/PhysObject.hpp +++ b/include/Nazara/Physics3D/PhysObject.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Physics3D/PhysWorld.hpp b/include/Nazara/Physics3D/PhysWorld.hpp index 1bd072bf2..06d0aea4e 100644 --- a/include/Nazara/Physics3D/PhysWorld.hpp +++ b/include/Nazara/Physics3D/PhysWorld.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Physics3D/Physics.hpp b/include/Nazara/Physics3D/Physics3D.hpp similarity index 66% rename from include/Nazara/Physics3D/Physics.hpp rename to include/Nazara/Physics3D/Physics3D.hpp index 4efaa5cb4..949301002 100644 --- a/include/Nazara/Physics3D/Physics.hpp +++ b/include/Nazara/Physics3D/Physics3D.hpp @@ -1,11 +1,11 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once -#ifndef NAZARA_PHYSICS_HPP -#define NAZARA_PHYSICS_HPP +#ifndef NAZARA_PHYSICS3D_HPP +#define NAZARA_PHYSICS3D_HPP #include #include @@ -13,11 +13,11 @@ namespace Nz { - class NAZARA_PHYSICS3D_API Physics + class NAZARA_PHYSICS3D_API Physics3D { public: - Physics() = delete; - ~Physics() = delete; + Physics3D() = delete; + ~Physics3D() = delete; static unsigned int GetMemoryUsed(); @@ -32,4 +32,4 @@ namespace Nz }; } -#endif // NAZARA_PHYSICS_HPP +#endif // NAZARA_PHYSICS3D_HPP diff --git a/src/Nazara/Physics3D/Collider3D.cpp b/src/Nazara/Physics3D/Collider3D.cpp index 1487bdd01..4ea0175e3 100644 --- a/src/Nazara/Physics3D/Collider3D.cpp +++ b/src/Nazara/Physics3D/Collider3D.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics3D/Debug/NewOverload.cpp b/src/Nazara/Physics3D/Debug/NewOverload.cpp index f6c7b64de..18092514c 100644 --- a/src/Nazara/Physics3D/Debug/NewOverload.cpp +++ b/src/Nazara/Physics3D/Debug/NewOverload.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics3D/PhysObject.cpp b/src/Nazara/Physics3D/PhysObject.cpp index f23070654..283d7ac84 100644 --- a/src/Nazara/Physics3D/PhysObject.cpp +++ b/src/Nazara/Physics3D/PhysObject.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics3D/PhysWorld.cpp b/src/Nazara/Physics3D/PhysWorld.cpp index 5d2170aad..020a54cfb 100644 --- a/src/Nazara/Physics3D/PhysWorld.cpp +++ b/src/Nazara/Physics3D/PhysWorld.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics3D/Physics.cpp b/src/Nazara/Physics3D/Physics3D.cpp similarity index 75% rename from src/Nazara/Physics3D/Physics.cpp rename to src/Nazara/Physics3D/Physics3D.cpp index 592075097..8fb470f2a 100644 --- a/src/Nazara/Physics3D/Physics.cpp +++ b/src/Nazara/Physics3D/Physics3D.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics module" +// This file is part of the "Nazara Engine - Physics 3D module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include @@ -13,12 +13,12 @@ namespace Nz { - unsigned int Physics::GetMemoryUsed() + unsigned int Physics3D::GetMemoryUsed() { return NewtonGetMemoryUsed(); } - bool Physics::Initialize() + bool Physics3D::Initialize() { if (s_moduleReferenceCounter > 0) { @@ -42,16 +42,16 @@ namespace Nz return false; } - NazaraNotice("Initialized: Physics module"); + NazaraNotice("Initialized: Physics3D module"); return true; } - bool Physics::IsInitialized() + bool Physics3D::IsInitialized() { return s_moduleReferenceCounter != 0; } - void Physics::Uninitialize() + void Physics3D::Uninitialize() { if (s_moduleReferenceCounter != 1) { @@ -67,11 +67,11 @@ namespace Nz s_moduleReferenceCounter = 0; - NazaraNotice("Uninitialized: Physics module"); + NazaraNotice("Uninitialized: Physics3D module"); // Libération des dépendances Core::Uninitialize(); } - unsigned int Physics::s_moduleReferenceCounter = 0; + unsigned int Physics3D::s_moduleReferenceCounter = 0; }