From 33e4c89b73b35378766a6b6b61e7d4e8f5a1f4c3 Mon Sep 17 00:00:00 2001 From: Ardakaniz Date: Fri, 14 Oct 2016 19:34:49 +0200 Subject: [PATCH 1/2] Rename 'Physics 3D' to 'Physics 2D' in files head --- include/Nazara/Physics2D/Collider2D.inl | 2 +- include/Nazara/Physics2D/Config.hpp | 2 +- include/Nazara/Physics2D/ConfigCheck.hpp | 2 +- include/Nazara/Physics2D/Debug.hpp | 2 +- include/Nazara/Physics2D/DebugOff.hpp | 2 +- include/Nazara/Physics2D/PhysWorld2D.hpp | 2 +- include/Nazara/Physics2D/Physics2D.hpp | 2 +- include/Nazara/Physics2D/RigidBody2D.hpp | 2 +- src/Nazara/Physics2D/Collider2D.cpp | 2 +- src/Nazara/Physics2D/Debug/NewOverload.cpp | 2 +- src/Nazara/Physics2D/PhysWorld2D.cpp | 2 +- src/Nazara/Physics2D/Physics2D.cpp | 2 +- src/Nazara/Physics2D/RigidBody2D.cpp | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/Nazara/Physics2D/Collider2D.inl b/include/Nazara/Physics2D/Collider2D.inl index c5503fdf2..5b384abb1 100644 --- a/include/Nazara/Physics2D/Collider2D.inl +++ b/include/Nazara/Physics2D/Collider2D.inl @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Physics2D/Config.hpp b/include/Nazara/Physics2D/Config.hpp index 59951806e..e356e1009 100644 --- a/include/Nazara/Physics2D/Config.hpp +++ b/include/Nazara/Physics2D/Config.hpp @@ -1,5 +1,5 @@ /* - Nazara Engine - Physics 3D module + Nazara Engine - Physics 2D module Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) diff --git a/include/Nazara/Physics2D/ConfigCheck.hpp b/include/Nazara/Physics2D/ConfigCheck.hpp index 6b1c82073..4689d6e68 100644 --- a/include/Nazara/Physics2D/ConfigCheck.hpp +++ b/include/Nazara/Physics2D/ConfigCheck.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Physics2D/Debug.hpp b/include/Nazara/Physics2D/Debug.hpp index f70a8b570..f9cebc624 100644 --- a/include/Nazara/Physics2D/Debug.hpp +++ b/include/Nazara/Physics2D/Debug.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/include/Nazara/Physics2D/DebugOff.hpp b/include/Nazara/Physics2D/DebugOff.hpp index 595f0ad94..dd95ffe34 100644 --- a/include/Nazara/Physics2D/DebugOff.hpp +++ b/include/Nazara/Physics2D/DebugOff.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D 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/Physics2D/PhysWorld2D.hpp b/include/Nazara/Physics2D/PhysWorld2D.hpp index e2705187c..e194f89d2 100644 --- a/include/Nazara/Physics2D/PhysWorld2D.hpp +++ b/include/Nazara/Physics2D/PhysWorld2D.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Physics2D/Physics2D.hpp b/include/Nazara/Physics2D/Physics2D.hpp index 4789d4f50..27fdf3128 100644 --- a/include/Nazara/Physics2D/Physics2D.hpp +++ b/include/Nazara/Physics2D/Physics2D.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/include/Nazara/Physics2D/RigidBody2D.hpp b/include/Nazara/Physics2D/RigidBody2D.hpp index 51860b9c7..436127f6b 100644 --- a/include/Nazara/Physics2D/RigidBody2D.hpp +++ b/include/Nazara/Physics2D/RigidBody2D.hpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #pragma once diff --git a/src/Nazara/Physics2D/Collider2D.cpp b/src/Nazara/Physics2D/Collider2D.cpp index 265c939bf..976695639 100644 --- a/src/Nazara/Physics2D/Collider2D.cpp +++ b/src/Nazara/Physics2D/Collider2D.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics2D/Debug/NewOverload.cpp b/src/Nazara/Physics2D/Debug/NewOverload.cpp index 18092514c..bd3153d1d 100644 --- a/src/Nazara/Physics2D/Debug/NewOverload.cpp +++ b/src/Nazara/Physics2D/Debug/NewOverload.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics2D/PhysWorld2D.cpp b/src/Nazara/Physics2D/PhysWorld2D.cpp index b133fa03e..5290abfcd 100644 --- a/src/Nazara/Physics2D/PhysWorld2D.cpp +++ b/src/Nazara/Physics2D/PhysWorld2D.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics2D/Physics2D.cpp b/src/Nazara/Physics2D/Physics2D.cpp index 3b380a71f..840b14755 100644 --- a/src/Nazara/Physics2D/Physics2D.cpp +++ b/src/Nazara/Physics2D/Physics2D.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include diff --git a/src/Nazara/Physics2D/RigidBody2D.cpp b/src/Nazara/Physics2D/RigidBody2D.cpp index 78ed42afd..44ad0d933 100644 --- a/src/Nazara/Physics2D/RigidBody2D.cpp +++ b/src/Nazara/Physics2D/RigidBody2D.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2015 Jérôme Leclercq -// This file is part of the "Nazara Engine - Physics 3D module" +// This file is part of the "Nazara Engine - Physics 2D module" // For conditions of distribution and use, see copyright notice in Config.hpp #include From 9391e213330c6964bd7427b6698ca4e5bdfbb865 Mon Sep 17 00:00:00 2001 From: Ardakaniz Date: Fri, 14 Oct 2016 19:35:27 +0200 Subject: [PATCH 2/2] Remove Physics.hpp and generate Physics 2D and 3D global headers --- include/Nazara/{Physics.hpp => Physics2D.hpp} | 22 +++++------ include/Nazara/Physics3D.hpp | 39 +++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) rename include/Nazara/{Physics.hpp => Physics2D.hpp} (70%) create mode 100644 include/Nazara/Physics3D.hpp diff --git a/include/Nazara/Physics.hpp b/include/Nazara/Physics2D.hpp similarity index 70% rename from include/Nazara/Physics.hpp rename to include/Nazara/Physics2D.hpp index a4fcfc768..9b4ce41f4 100644 --- a/include/Nazara/Physics.hpp +++ b/include/Nazara/Physics2D.hpp @@ -1,7 +1,7 @@ -// This file was automatically generated on 24 Jun 2015 at 13:55:50 +// This file was automatically generated on 14 Oct 2016 at 18:58:18 /* - Nazara Engine - Physics module + Nazara Engine - Physics 2D module Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) @@ -26,14 +26,14 @@ #pragma once -#ifndef NAZARA_GLOBAL_PHYSICS_HPP -#define NAZARA_GLOBAL_PHYSICS_HPP +#ifndef NAZARA_GLOBAL_PHYSICS2D_HPP +#define NAZARA_GLOBAL_PHYSICS2D_HPP -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#endif // NAZARA_GLOBAL_PHYSICS_HPP +#endif // NAZARA_GLOBAL_PHYSICS2D_HPP diff --git a/include/Nazara/Physics3D.hpp b/include/Nazara/Physics3D.hpp new file mode 100644 index 000000000..e9c84e757 --- /dev/null +++ b/include/Nazara/Physics3D.hpp @@ -0,0 +1,39 @@ +// This file was automatically generated on 14 Oct 2016 at 18:58:18 + +/* + Nazara Engine - Physics 3D module + + Copyright (C) 2015 Jérôme "Lynix" Leclercq (Lynix680@gmail.com) + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#pragma once + +#ifndef NAZARA_GLOBAL_PHYSICS3D_HPP +#define NAZARA_GLOBAL_PHYSICS3D_HPP + +#include +#include +#include +#include +#include +#include + +#endif // NAZARA_GLOBAL_PHYSICS3D_HPP