Physics3D: Rename Physics module class to Physics3D

This commit is contained in:
Lynix 2016-10-13 07:40:12 +02:00
parent 49f4df6496
commit 3c4d084b27
16 changed files with 33 additions and 33 deletions

View File

@ -9,7 +9,7 @@
#include <Nazara/Graphics/Graphics.hpp> #include <Nazara/Graphics/Graphics.hpp>
#include <Nazara/Lua/Lua.hpp> #include <Nazara/Lua/Lua.hpp>
#include <Nazara/Noise/Noise.hpp> #include <Nazara/Noise/Noise.hpp>
#include <Nazara/Physics3D/Physics.hpp> #include <Nazara/Physics3D/Physics3D.hpp>
#include <Nazara/Utility/Utility.hpp> #include <Nazara/Utility/Utility.hpp>
#include <NDK/Algorithm.hpp> #include <NDK/Algorithm.hpp>
#include <NDK/BaseSystem.hpp> #include <NDK/BaseSystem.hpp>
@ -68,7 +68,7 @@ namespace Ndk
Nz::Lua::Initialize(); Nz::Lua::Initialize();
Nz::Noise::Initialize(); Nz::Noise::Initialize();
Nz::Physics::Initialize(); Nz::Physics3D::Initialize();
Nz::Utility::Initialize(); Nz::Utility::Initialize();
#ifndef NDK_SERVER #ifndef NDK_SERVER
@ -161,7 +161,7 @@ namespace Ndk
// Shared modules // Shared modules
Nz::Lua::Uninitialize(); Nz::Lua::Uninitialize();
Nz::Noise::Uninitialize(); Nz::Noise::Uninitialize();
Nz::Physics::Uninitialize(); Nz::Physics3D::Uninitialize();
Nz::Utility::Uninitialize(); Nz::Utility::Uninitialize();
NazaraNotice("Uninitialized: SDK"); NazaraNotice("Uninitialized: SDK");

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once #pragma once
@ -40,7 +40,7 @@ namespace Nz
class NAZARA_PHYSICS3D_API Collider3D : public RefCounted class NAZARA_PHYSICS3D_API Collider3D : public RefCounted
{ {
friend Collider3DLibrary; friend Collider3DLibrary;
friend class Physics; friend class Physics3D;
public: public:
Collider3D() = default; Collider3D() = default;

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#include <memory> #include <memory>

View File

@ -1,5 +1,5 @@
/* /*
Nazara Engine - Physics module Nazara Engine - Physics 3D module
Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com)

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once #pragma once

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Physics3D/Config.hpp> #include <Nazara/Physics3D/Config.hpp>

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // 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 // On suppose que Debug.hpp a déjà été inclus, tout comme Config.hpp

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once #pragma once

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once #pragma once

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once #pragma once

View File

@ -1,11 +1,11 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once #pragma once
#ifndef NAZARA_PHYSICS_HPP #ifndef NAZARA_PHYSICS3D_HPP
#define NAZARA_PHYSICS_HPP #define NAZARA_PHYSICS3D_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Initializer.hpp> #include <Nazara/Core/Initializer.hpp>
@ -13,11 +13,11 @@
namespace Nz namespace Nz
{ {
class NAZARA_PHYSICS3D_API Physics class NAZARA_PHYSICS3D_API Physics3D
{ {
public: public:
Physics() = delete; Physics3D() = delete;
~Physics() = delete; ~Physics3D() = delete;
static unsigned int GetMemoryUsed(); static unsigned int GetMemoryUsed();
@ -32,4 +32,4 @@ namespace Nz
}; };
} }
#endif // NAZARA_PHYSICS_HPP #endif // NAZARA_PHYSICS3D_HPP

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Physics3D/Collider3D.hpp> #include <Nazara/Physics3D/Collider3D.hpp>

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Physics3D/Config.hpp> #include <Nazara/Physics3D/Config.hpp>

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Physics3D/PhysObject.hpp> #include <Nazara/Physics3D/PhysObject.hpp>

View File

@ -1,5 +1,5 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Physics3D/PhysWorld.hpp> #include <Nazara/Physics3D/PhysWorld.hpp>

View File

@ -1,8 +1,8 @@
// Copyright (C) 2015 Jérôme Leclercq // 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 // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Physics3D/Physics.hpp> #include <Nazara/Physics3D/Physics3D.hpp>
#include <Nazara/Core/Core.hpp> #include <Nazara/Core/Core.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp> #include <Nazara/Core/Log.hpp>
@ -13,12 +13,12 @@
namespace Nz namespace Nz
{ {
unsigned int Physics::GetMemoryUsed() unsigned int Physics3D::GetMemoryUsed()
{ {
return NewtonGetMemoryUsed(); return NewtonGetMemoryUsed();
} }
bool Physics::Initialize() bool Physics3D::Initialize()
{ {
if (s_moduleReferenceCounter > 0) if (s_moduleReferenceCounter > 0)
{ {
@ -42,16 +42,16 @@ namespace Nz
return false; return false;
} }
NazaraNotice("Initialized: Physics module"); NazaraNotice("Initialized: Physics3D module");
return true; return true;
} }
bool Physics::IsInitialized() bool Physics3D::IsInitialized()
{ {
return s_moduleReferenceCounter != 0; return s_moduleReferenceCounter != 0;
} }
void Physics::Uninitialize() void Physics3D::Uninitialize()
{ {
if (s_moduleReferenceCounter != 1) if (s_moduleReferenceCounter != 1)
{ {
@ -67,11 +67,11 @@ namespace Nz
s_moduleReferenceCounter = 0; s_moduleReferenceCounter = 0;
NazaraNotice("Uninitialized: Physics module"); NazaraNotice("Uninitialized: Physics3D module");
// Libération des dépendances // Libération des dépendances
Core::Uninitialize(); Core::Uninitialize();
} }
unsigned int Physics::s_moduleReferenceCounter = 0; unsigned int Physics3D::s_moduleReferenceCounter = 0;
} }