sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Physics: Change includes to Physics3D

This commit is contained in:
Lynix 2016-10-13 06:03:22 +02:00
parent eae8847bd1
commit 24f1859ec2
20 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/include/NDK/Components/CollisionComponent.hpp
View File

@ -7,7 +7,7 @@
#ifndef NDK_COMPONENTS_COLLISIONCOMPONENT_HPP #ifndef NDK_COMPONENTS_COLLISIONCOMPONENT_HPP
#define NDK_COMPONENTS_COLLISIONCOMPONENT_HPP #define NDK_COMPONENTS_COLLISIONCOMPONENT_HPP
#include <Nazara/Physics/Geom.hpp> #include <Nazara/Physics3D/Geom.hpp>
#include <NDK/Component.hpp> #include <NDK/Component.hpp>
#include <memory> #include <memory>

2
SDK/include/NDK/Components/PhysicsComponent.hpp
View File

@ -7,7 +7,7 @@
#ifndef NDK_COMPONENTS_PHYSICSCOMPONENT_HPP #ifndef NDK_COMPONENTS_PHYSICSCOMPONENT_HPP
#define NDK_COMPONENTS_PHYSICSCOMPONENT_HPP #define NDK_COMPONENTS_PHYSICSCOMPONENT_HPP
#include <Nazara/Physics/PhysObject.hpp> #include <Nazara/Physics3D/PhysObject.hpp>
#include <NDK/Component.hpp> #include <NDK/Component.hpp>
#include <memory> #include <memory>

2
SDK/include/NDK/Systems/PhysicsSystem.hpp
View File

@ -7,7 +7,7 @@
#ifndef NDK_SYSTEMS_PHYSICSSYSTEM_HPP #ifndef NDK_SYSTEMS_PHYSICSSYSTEM_HPP
#define NDK_SYSTEMS_PHYSICSSYSTEM_HPP #define NDK_SYSTEMS_PHYSICSSYSTEM_HPP
#include <Nazara/Physics/PhysWorld.hpp> #include <Nazara/Physics3D/PhysWorld.hpp>
#include <NDK/EntityList.hpp> #include <NDK/EntityList.hpp>
#include <NDK/System.hpp> #include <NDK/System.hpp>
#include <memory> #include <memory>

2
SDK/src/NDK/Components/CollisionComponent.cpp
View File

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
#include <NDK/Components/CollisionComponent.hpp> #include <NDK/Components/CollisionComponent.hpp>
#include <Nazara/Physics/PhysObject.hpp> #include <Nazara/Physics3D/PhysObject.hpp>
#include <NDK/Algorithm.hpp> #include <NDK/Algorithm.hpp>
#include <NDK/World.hpp> #include <NDK/World.hpp>
#include <NDK/Components/PhysicsComponent.hpp> #include <NDK/Components/PhysicsComponent.hpp>

2
SDK/src/NDK/Components/PhysicsComponent.cpp
View File

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
#include <NDK/Components/PhysicsComponent.hpp> #include <NDK/Components/PhysicsComponent.hpp>
#include <Nazara/Physics/PhysObject.hpp> #include <Nazara/Physics3D/PhysObject.hpp>
#include <NDK/Algorithm.hpp> #include <NDK/Algorithm.hpp>
#include <NDK/World.hpp> #include <NDK/World.hpp>
#include <NDK/Components/CollisionComponent.hpp> #include <NDK/Components/CollisionComponent.hpp>

2
SDK/src/NDK/Sdk.cpp
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/Physics/Physics.hpp> #include <Nazara/Physics3D/Physics.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>

2
SDK/src/NDK/Systems/PhysicsSystem.cpp
View File

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in Prerequesites.hpp // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
#include <NDK/Systems/PhysicsSystem.hpp> #include <NDK/Systems/PhysicsSystem.hpp>
#include <Nazara/Physics/PhysObject.hpp> #include <Nazara/Physics3D/PhysObject.hpp>
#include <NDK/Components/CollisionComponent.hpp> #include <NDK/Components/CollisionComponent.hpp>
#include <NDK/Components/NodeComponent.hpp> #include <NDK/Components/NodeComponent.hpp>
#include <NDK/Components/PhysicsComponent.hpp> #include <NDK/Components/PhysicsComponent.hpp>

18
include/Nazara/Physics3D/Config.hpp
View File

@ -24,28 +24,28 @@
#pragma once #pragma once
#ifndef NAZARA_CONFIG_PHYSICS_HPP #ifndef NAZARA_CONFIG_PHYSICS3D_HPP
#define NAZARA_CONFIG_PHYSICS_HPP #define NAZARA_CONFIG_PHYSICS3D_HPP
/// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci /// Chaque modification d'un paramètre du module nécessite une recompilation de celui-ci
// Utilise un manager de mémoire pour gérer les allocations dynamiques (détecte les leaks au prix d'allocations/libérations dynamiques plus lentes) // Utilise un manager de mémoire pour gérer les allocations dynamiques (détecte les leaks au prix d'allocations/libérations dynamiques plus lentes)
#define NAZARA_PHYSICS_MANAGE_MEMORY 0 #define NAZARA_PHYSICS3D_MANAGE_MEMORY 0
// Active les tests de sécurité basés sur le code (Conseillé pour le développement) // Active les tests de sécurité basés sur le code (Conseillé pour le développement)
#define NAZARA_PHYSICS_SAFE 1 #define NAZARA_PHYSICS3D_SAFE 1
/// Vérification des valeurs et types de certaines constantes /// Vérification des valeurs et types de certaines constantes
#include <Nazara/Physics/ConfigCheck.hpp> #include <Nazara/Physics3D/ConfigCheck.hpp>
#if defined(NAZARA_STATIC) #if defined(NAZARA_STATIC)
#define NAZARA_PHYSICS_API #define NAZARA_PHYSICS3D_API
#else #else
#ifdef NAZARA_PHYSICS_BUILD #ifdef NAZARA_PHYSICS_BUILD
#define NAZARA_PHYSICS_API NAZARA_EXPORT #define NAZARA_PHYSICS3D_API NAZARA_EXPORT
#else #else
#define NAZARA_PHYSICS_API NAZARA_IMPORT #define NAZARA_PHYSICS3D_API NAZARA_IMPORT
#endif #endif
#endif #endif
#endif // NAZARA_CONFIG_PHYSICS_HPP #endif // NAZARA_CONFIG_PHYSICS3D_HPP

2
include/Nazara/Physics3D/ConfigCheck.hpp
View File

@ -12,7 +12,7 @@
// On force la valeur de MANAGE_MEMORY en mode debug // On force la valeur de MANAGE_MEMORY en mode debug
#if defined(NAZARA_DEBUG) && !NAZARA_PHYSICS_MANAGE_MEMORY #if defined(NAZARA_DEBUG) && !NAZARA_PHYSICS_MANAGE_MEMORY
#undef NAZARA_PHYSICS_MANAGE_MEMORY #undef NAZARA_PHYSICS_MANAGE_MEMORY
#define NAZARA_PHYSICS_MANAGE_MEMORY 0 #define NAZARA_PHYSICS3D_MANAGE_MEMORY 0
#endif #endif
#endif // NAZARA_CONFIG_CHECK_PHYSICS_HPP #endif // NAZARA_CONFIG_CHECK_PHYSICS_HPP

2
include/Nazara/Physics3D/Debug.hpp
View File

@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - Physics module" // This file is part of the "Nazara Engine - Physics 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/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
#if NAZARA_PHYSICS_MANAGE_MEMORY #if NAZARA_PHYSICS_MANAGE_MEMORY
#include <Nazara/Core/Debug/NewRedefinition.hpp> #include <Nazara/Core/Debug/NewRedefinition.hpp>
#endif #endif

24
include/Nazara/Physics3D/Geom.hpp
View File

@ -16,8 +16,8 @@
#include <Nazara/Math/Box.hpp> #include <Nazara/Math/Box.hpp>
#include <Nazara/Math/Quaternion.hpp> #include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
#include <Nazara/Physics/Enums.hpp> #include <Nazara/Physics3D/Enums.hpp>
#include <unordered_map> #include <unordered_map>
class NewtonCollision; class NewtonCollision;
@ -37,7 +37,7 @@ namespace Nz
using PhysGeomLibrary = ObjectLibrary<PhysGeom>; using PhysGeomLibrary = ObjectLibrary<PhysGeom>;
using PhysGeomRef = ObjectRef<PhysGeom>; using PhysGeomRef = ObjectRef<PhysGeom>;
class NAZARA_PHYSICS_API PhysGeom : public RefCounted class NAZARA_PHYSICS3D_API PhysGeom : public RefCounted
{ {
friend PhysGeomLibrary; friend PhysGeomLibrary;
friend class Physics; friend class Physics;
@ -80,7 +80,7 @@ namespace Nz
using BoxGeomConstRef = ObjectRef<const BoxGeom>; using BoxGeomConstRef = ObjectRef<const BoxGeom>;
using BoxGeomRef = ObjectRef<BoxGeom>; using BoxGeomRef = ObjectRef<BoxGeom>;
class NAZARA_PHYSICS_API BoxGeom : public PhysGeom class NAZARA_PHYSICS3D_API BoxGeom : public PhysGeom
{ {
public: public:
BoxGeom(const Vector3f& lengths, const Matrix4f& transformMatrix = Matrix4f::Identity()); BoxGeom(const Vector3f& lengths, const Matrix4f& transformMatrix = Matrix4f::Identity());
@ -106,7 +106,7 @@ namespace Nz
using CapsuleGeomConstRef = ObjectRef<const CapsuleGeom>; using CapsuleGeomConstRef = ObjectRef<const CapsuleGeom>;
using CapsuleGeomRef = ObjectRef<CapsuleGeom>; using CapsuleGeomRef = ObjectRef<CapsuleGeom>;
class NAZARA_PHYSICS_API CapsuleGeom : public PhysGeom class NAZARA_PHYSICS3D_API CapsuleGeom : public PhysGeom
{ {
public: public:
CapsuleGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity()); CapsuleGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@ -131,7 +131,7 @@ namespace Nz
using CompoundGeomConstRef = ObjectRef<const CompoundGeom>; using CompoundGeomConstRef = ObjectRef<const CompoundGeom>;
using CompoundGeomRef = ObjectRef<CompoundGeom>; using CompoundGeomRef = ObjectRef<CompoundGeom>;
class NAZARA_PHYSICS_API CompoundGeom : public PhysGeom class NAZARA_PHYSICS3D_API CompoundGeom : public PhysGeom
{ {
public: public:
CompoundGeom(PhysGeom** geoms, std::size_t geomCount); CompoundGeom(PhysGeom** geoms, std::size_t geomCount);
@ -152,7 +152,7 @@ namespace Nz
using ConeGeomConstRef = ObjectRef<const ConeGeom>; using ConeGeomConstRef = ObjectRef<const ConeGeom>;
using ConeGeomRef = ObjectRef<ConeGeom>; using ConeGeomRef = ObjectRef<ConeGeom>;
class NAZARA_PHYSICS_API ConeGeom : public PhysGeom class NAZARA_PHYSICS3D_API ConeGeom : public PhysGeom
{ {
public: public:
ConeGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity()); ConeGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@ -177,7 +177,7 @@ namespace Nz
using ConvexHullGeomConstRef = ObjectRef<const ConvexHullGeom>; using ConvexHullGeomConstRef = ObjectRef<const ConvexHullGeom>;
using ConvexHullGeomRef = ObjectRef<ConvexHullGeom>; using ConvexHullGeomRef = ObjectRef<ConvexHullGeom>;
class NAZARA_PHYSICS_API ConvexHullGeom : public PhysGeom class NAZARA_PHYSICS3D_API ConvexHullGeom : public PhysGeom
{ {
public: public:
ConvexHullGeom(const void* vertices, unsigned int vertexCount, unsigned int stride = sizeof(Vector3f), float tolerance = 0.002f, const Matrix4f& transformMatrix = Matrix4f::Identity()); ConvexHullGeom(const void* vertices, unsigned int vertexCount, unsigned int stride = sizeof(Vector3f), float tolerance = 0.002f, const Matrix4f& transformMatrix = Matrix4f::Identity());
@ -201,7 +201,7 @@ namespace Nz
using CylinderGeomConstRef = ObjectRef<const CylinderGeom>; using CylinderGeomConstRef = ObjectRef<const CylinderGeom>;
using CylinderGeomRef = ObjectRef<CylinderGeom>; using CylinderGeomRef = ObjectRef<CylinderGeom>;
class NAZARA_PHYSICS_API CylinderGeom : public PhysGeom class NAZARA_PHYSICS3D_API CylinderGeom : public PhysGeom
{ {
public: public:
CylinderGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity()); CylinderGeom(float length, float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@ -226,7 +226,7 @@ namespace Nz
using NullGeomConstRef = ObjectRef<const NullGeom>; using NullGeomConstRef = ObjectRef<const NullGeom>;
using NullGeomRef = ObjectRef<NullGeom>; using NullGeomRef = ObjectRef<NullGeom>;
class NAZARA_PHYSICS_API NullGeom : public PhysGeom class NAZARA_PHYSICS3D_API NullGeom : public PhysGeom
{ {
public: public:
NullGeom(); NullGeom();
@ -246,7 +246,7 @@ namespace Nz
using SphereGeomConstRef = ObjectRef<const SphereGeom>; using SphereGeomConstRef = ObjectRef<const SphereGeom>;
using SphereGeomRef = ObjectRef<SphereGeom>; using SphereGeomRef = ObjectRef<SphereGeom>;
class NAZARA_PHYSICS_API SphereGeom : public PhysGeom class NAZARA_PHYSICS3D_API SphereGeom : public PhysGeom
{ {
public: public:
SphereGeom(float radius, const Matrix4f& transformMatrix = Matrix4f::Identity()); SphereGeom(float radius, const Matrix4f& transformMatrix = Matrix4f::Identity());
@ -268,6 +268,6 @@ namespace Nz
}; };
} }
#include <Nazara/Physics/Geom.inl> #include <Nazara/Physics3D/Geom.inl>
#endif // NAZARA_PHYSWORLD_HPP #endif // NAZARA_PHYSWORLD_HPP

4
include/Nazara/Physics3D/Geom.inl
View File

@ -3,7 +3,7 @@
// 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>
#include <Nazara/Physics/Debug.hpp> #include <Nazara/Physics3D/Debug.hpp>
namespace Nz namespace Nz
{ {
@ -80,4 +80,4 @@ namespace Nz
} }
} }
#include <Nazara/Physics/DebugOff.hpp> #include <Nazara/Physics3D/DebugOff.hpp>

6
include/Nazara/Physics3D/PhysObject.hpp
View File

@ -12,8 +12,8 @@
#include <Nazara/Math/Matrix4.hpp> #include <Nazara/Math/Matrix4.hpp>
#include <Nazara/Math/Quaternion.hpp> #include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
#include <Nazara/Physics/Geom.hpp> #include <Nazara/Physics3D/Geom.hpp>
class NewtonBody; class NewtonBody;
@ -21,7 +21,7 @@ namespace Nz
{ {
class PhysWorld; class PhysWorld;
class NAZARA_PHYSICS_API PhysObject class NAZARA_PHYSICS3D_API PhysObject
{ {
public: public:
PhysObject(PhysWorld* world, const Matrix4f& mat = Matrix4f::Identity()); PhysObject(PhysWorld* world, const Matrix4f& mat = Matrix4f::Identity());

4
include/Nazara/Physics3D/PhysWorld.hpp
View File

@ -10,13 +10,13 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Math/Box.hpp> #include <Nazara/Math/Box.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
class NewtonWorld; class NewtonWorld;
namespace Nz namespace Nz
{ {
class NAZARA_PHYSICS_API PhysWorld class NAZARA_PHYSICS3D_API PhysWorld
{ {
public: public:
PhysWorld(); PhysWorld();

4
include/Nazara/Physics3D/Physics.hpp
View File

@ -9,11 +9,11 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Initializer.hpp> #include <Nazara/Core/Initializer.hpp>
#include <Nazara/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
namespace Nz namespace Nz
{ {
class NAZARA_PHYSICS_API Physics class NAZARA_PHYSICS3D_API Physics
{ {
public: public:
Physics() = delete; Physics() = delete;

2
src/Nazara/Physics3D/Debug/NewOverload.cpp
View File

@ -2,7 +2,7 @@
// This file is part of the "Nazara Engine - Physics module" // This file is part of the "Nazara Engine - Physics 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/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
#if NAZARA_PHYSICS_MANAGE_MEMORY #if NAZARA_PHYSICS_MANAGE_MEMORY
#include <Nazara/Core/MemoryManager.hpp> #include <Nazara/Core/MemoryManager.hpp>

6
src/Nazara/Physics3D/Geom.cpp
View File

@ -2,11 +2,11 @@
// This file is part of the "Nazara Engine - Physics module" // This file is part of the "Nazara Engine - Physics 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/Physics/Geom.hpp> #include <Nazara/Physics3D/Geom.hpp>
#include <Nazara/Physics/PhysWorld.hpp> #include <Nazara/Physics3D/PhysWorld.hpp>
#include <Newton/Newton.h> #include <Newton/Newton.h>
#include <memory> #include <memory>
#include <Nazara/Physics/Debug.hpp> #include <Nazara/Physics3D/Debug.hpp>
namespace Nz namespace Nz
{ {

8
src/Nazara/Physics3D/PhysObject.cpp
View File

@ -2,13 +2,13 @@
// This file is part of the "Nazara Engine - Physics module" // This file is part of the "Nazara Engine - Physics 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/Physics/PhysObject.hpp> #include <Nazara/Physics3D/PhysObject.hpp>
#include <Nazara/Math/Algorithm.hpp> #include <Nazara/Math/Algorithm.hpp>
#include <Nazara/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
#include <Nazara/Physics/PhysWorld.hpp> #include <Nazara/Physics3D/PhysWorld.hpp>
#include <Newton/Newton.h> #include <Newton/Newton.h>
#include <algorithm> #include <algorithm>
#include <Nazara/Physics/Debug.hpp> #include <Nazara/Physics3D/Debug.hpp>
namespace Nz namespace Nz
{ {

4
src/Nazara/Physics3D/PhysWorld.cpp
View File

@ -2,9 +2,9 @@
// This file is part of the "Nazara Engine - Physics module" // This file is part of the "Nazara Engine - Physics 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/Physics/PhysWorld.hpp> #include <Nazara/Physics3D/PhysWorld.hpp>
#include <Newton/Newton.h> #include <Newton/Newton.h>
#include <Nazara/Physics/Debug.hpp> #include <Nazara/Physics3D/Debug.hpp>
namespace Nz namespace Nz
{ {

8
src/Nazara/Physics3D/Physics.cpp
View File

@ -2,14 +2,14 @@
// This file is part of the "Nazara Engine - Physics module" // This file is part of the "Nazara Engine - Physics 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/Physics/Physics.hpp> #include <Nazara/Physics3D/Physics.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>
#include <Nazara/Physics/Config.hpp> #include <Nazara/Physics3D/Config.hpp>
#include <Nazara/Physics/Geom.hpp> #include <Nazara/Physics3D/Geom.hpp>
#include <Newton/Newton.h> #include <Newton/Newton.h>
#include <Nazara/Physics/Debug.hpp> #include <Nazara/Physics3D/Debug.hpp>
namespace Nz namespace Nz
{ {