From 15da50ac84bf3ec347e2eb8bcfe7d83bd2d08ec2 Mon Sep 17 00:00:00 2001 From: nitrocaster Date: Tue, 24 Nov 2015 01:36:54 +0300 Subject: [PATCH] xrPhysics: fix ODE include paths. --- src/xrPhysics/ExtendedGeom.h | 4 ++-- src/xrPhysics/MathUtils.cpp | 2 +- src/xrPhysics/MathUtilsOde.h | 14 +++++++------- src/xrPhysics/PHActivationShape.cpp | 2 +- src/xrPhysics/PHBaseBodyEffector.h | 2 +- src/xrPhysics/PHCapture.h | 2 +- src/xrPhysics/PHCharacter.cpp | 2 +- src/xrPhysics/PHContactBodyEffector.h | 2 +- src/xrPhysics/PHDisabling.h | 2 +- src/xrPhysics/PHElement.cpp | 4 ++-- src/xrPhysics/PHFracture.cpp | 2 +- src/xrPhysics/PHFracture.h | 4 ++-- src/xrPhysics/PHInterpolation.h | 2 +- src/xrPhysics/PHIsland.h | 6 +++--- src/xrPhysics/PHJoint.h | 2 +- src/xrPhysics/PHJointDestroyInfo.h | 2 +- src/xrPhysics/PHMoveStorage.cpp | 2 +- src/xrPhysics/Physics.cpp | 6 +++--- src/xrPhysics/dRayMotions.cpp | 2 +- src/xrPhysics/dcylinder/dCylinder.h | 2 +- src/xrPhysics/ode_include.h | 2 +- src/xrPhysics/ph_valid_ode.h | 6 +++--- .../tri-colliderknoopc/dTriColliderCommon.h | 2 +- .../tri-colliderknoopc/dTriColliderMath.h | 2 +- src/xrPhysics/tri-colliderknoopc/dTriList.h | 2 +- src/xrPhysics/tri-colliderknoopc/dxTriList.h | 2 +- src/xrPhysics/xrPhysics.cpp | 2 +- 27 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/xrPhysics/ExtendedGeom.h b/src/xrPhysics/ExtendedGeom.h index cda85294907..8fa65f3b968 100644 --- a/src/xrPhysics/ExtendedGeom.h +++ b/src/xrPhysics/ExtendedGeom.h @@ -6,8 +6,8 @@ #endif #include "PHObject.h" -#include "3rd party/ode/include/ode/common.h" -#include "3rd party/ode/include/ode/collision.h" +#include "Externals/ode/include/ode/common.h" +#include "Externals/ode/include/ode/collision.h" #include "physicscommon.h" #include "MathUtils.h" #ifdef DEBUG diff --git a/src/xrPhysics/MathUtils.cpp b/src/xrPhysics/MathUtils.cpp index 887aeea1985..3d7d3fb3ec6 100644 --- a/src/xrPhysics/MathUtils.cpp +++ b/src/xrPhysics/MathUtils.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "mathutils.h" -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" XRPHYSICS_API const float phInfinity = dInfinity; /* #include "MathUtils.h" diff --git a/src/xrPhysics/MathUtilsOde.h b/src/xrPhysics/MathUtilsOde.h index 29e7320dbc8..7768e7b069e 100644 --- a/src/xrPhysics/MathUtilsOde.h +++ b/src/xrPhysics/MathUtilsOde.h @@ -2,13 +2,13 @@ #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/include/ode/common.h" -#include "3rd party/ode/include/ode/odemath.h" -#include "3rd party/ode/include/ode/objects.h" -#include "3rd party/ode/include/ode/rotation.h" -#include "3rd party/ode/include/ode/compatibility.h" -#include "3rd party/ode/include/ode/collision.h" -#include "3rd party/ode/include/ode/matrix.h" +#include "Externals/ode/include/ode/common.h" +#include "Externals/ode/include/ode/odemath.h" +#include "Externals/ode/include/ode/objects.h" +#include "Externals/ode/include/ode/rotation.h" +#include "Externals/ode/include/ode/compatibility.h" +#include "Externals/ode/include/ode/collision.h" +#include "Externals/ode/include/ode/matrix.h" #include "mathutils.h" #include "ode_redefine.h" diff --git a/src/xrPhysics/PHActivationShape.cpp b/src/xrPhysics/PHActivationShape.cpp index d0245b4ff14..b98b2bbe67e 100644 --- a/src/xrPhysics/PHActivationShape.cpp +++ b/src/xrPhysics/PHActivationShape.cpp @@ -11,7 +11,7 @@ #include "xrEngine/GameMtlLib.h" #include "PHWorld.h" -#include "3rd party/ode/ode/src/util.h" +#include "Externals/ode/ode/src/util.h" #ifdef DEBUG # include "debug_output.h" diff --git a/src/xrPhysics/PHBaseBodyEffector.h b/src/xrPhysics/PHBaseBodyEffector.h index bfde1b9304e..6a5329802a1 100644 --- a/src/xrPhysics/PHBaseBodyEffector.h +++ b/src/xrPhysics/PHBaseBodyEffector.h @@ -2,7 +2,7 @@ #define PH_BASE_BODY_EFFECTOR_H -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" class CPHBaseBodyEffector { protected: diff --git a/src/xrPhysics/PHCapture.h b/src/xrPhysics/PHCapture.h index 1339c83f1c7..9a9db4260b0 100644 --- a/src/xrPhysics/PHCapture.h +++ b/src/xrPhysics/PHCapture.h @@ -7,7 +7,7 @@ #include "phisland.h" -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" #include "iphcapture.h" class IPhysicsShellHolder; class CPHCharacter; diff --git a/src/xrPhysics/PHCharacter.cpp b/src/xrPhysics/PHCharacter.cpp index 3d03a506424..f895bfb41e1 100644 --- a/src/xrPhysics/PHCharacter.cpp +++ b/src/xrPhysics/PHCharacter.cpp @@ -10,7 +10,7 @@ #include "xrEngine/GameMtlLib.h" #include "tri-colliderKNoOPC\__aabb_tri.h" -#include "3rd party/ode/ode/src/util.h" +#include "Externals/ode/ode/src/util.h" #include "ph_valid_ode.h" #include "Phaicharacter.h" #include "phactorcharacter.h" diff --git a/src/xrPhysics/PHContactBodyEffector.h b/src/xrPhysics/PHContactBodyEffector.h index 043645a599f..1d236fb479c 100644 --- a/src/xrPhysics/PHContactBodyEffector.h +++ b/src/xrPhysics/PHContactBodyEffector.h @@ -1,7 +1,7 @@ #ifndef PH_CONTACT_BODY_EFFECTOR_H #define PH_CONTACT_BODY_EFFECTOR_H #include "PHBaseBodyEffector.h" -#include "3rd party/ode/include/ode/contact.h" +#include "Externals/ode/include/ode/contact.h" struct SGameMtl; class CPHContactBodyEffector : public CPHBaseBodyEffector { diff --git a/src/xrPhysics/PHDisabling.h b/src/xrPhysics/PHDisabling.h index 79ecfdfa1f4..bfc856547f6 100644 --- a/src/xrPhysics/PHDisabling.h +++ b/src/xrPhysics/PHDisabling.h @@ -3,7 +3,7 @@ #include "DisablingParams.h" -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" struct SDisableVector { diff --git a/src/xrPhysics/PHElement.cpp b/src/xrPhysics/PHElement.cpp index 37c53d8bb0b..38aef34e0a7 100644 --- a/src/xrPhysics/PHElement.cpp +++ b/src/xrPhysics/PHElement.cpp @@ -12,7 +12,7 @@ #include "Include/xrRender/Kinematics.h" #include "Include/xrRender/KinematicsAnimated.h" -#include "3rd party/ode/ode/src/util.h" +#include "Externals/ode/ode/src/util.h" #ifdef DEBUG # include "debug_output.h" @@ -23,7 +23,7 @@ #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/ode/src/collision_kernel.h" +#include "Externals/ode/ode/src/collision_kernel.h" #pragma warning(default:4267) diff --git a/src/xrPhysics/PHFracture.cpp b/src/xrPhysics/PHFracture.cpp index 2fb19e98afd..e0e39391c19 100644 --- a/src/xrPhysics/PHFracture.cpp +++ b/src/xrPhysics/PHFracture.cpp @@ -11,7 +11,7 @@ #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/ode/src/joint.h" +#include "Externals/ode/ode/src/joint.h" #pragma warning(default:4995) #pragma warning(default:4267) extern class CPHWorld *ph_world; diff --git a/src/xrPhysics/PHFracture.h b/src/xrPhysics/PHFracture.h index 322ca964499..cbe64d0d4f9 100644 --- a/src/xrPhysics/PHFracture.h +++ b/src/xrPhysics/PHFracture.h @@ -6,8 +6,8 @@ #include "PHDefs.h" #include "PHImpact.h" -#include "3rd party/ode/include/ode/common.h" -#include "3rd party/ode/include/ode/mass.h" +#include "Externals/ode/include/ode/common.h" +#include "Externals/ode/include/ode/mass.h" class CPHFracture; class CPHElement; diff --git a/src/xrPhysics/PHInterpolation.h b/src/xrPhysics/PHInterpolation.h index 212e76255f6..008c3685e5e 100644 --- a/src/xrPhysics/PHInterpolation.h +++ b/src/xrPhysics/PHInterpolation.h @@ -3,7 +3,7 @@ #define PHINTERPOLATON_H -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" class CPHInterpolation { diff --git a/src/xrPhysics/PHIsland.h b/src/xrPhysics/PHIsland.h index 80815b47f4a..7db2c6957e7 100644 --- a/src/xrPhysics/PHIsland.h +++ b/src/xrPhysics/PHIsland.h @@ -3,12 +3,12 @@ #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/ode/src/objects.h" -#include "3rd party/ode/ode/src/joint.h" +#include "Externals/ode/ode/src/objects.h" +#include "Externals/ode/ode/src/joint.h" #pragma warning(default:4995) #pragma warning(default:4267) -#include "3rd party/ode/include/ode/objects.h" +#include "Externals/ode/include/ode/objects.h" #include "PhysicsCommon.h" diff --git a/src/xrPhysics/PHJoint.h b/src/xrPhysics/PHJoint.h index f77ef196199..bc95fa71cf1 100644 --- a/src/xrPhysics/PHJoint.h +++ b/src/xrPhysics/PHJoint.h @@ -3,7 +3,7 @@ #ifndef PH_JOINT #define PH_JOINT #include "PhysicsShell.h" -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" #include "physics_scripted.h" class CPHJointDestroyInfo; class CPHJoint: diff --git a/src/xrPhysics/PHJointDestroyInfo.h b/src/xrPhysics/PHJointDestroyInfo.h index c7aaed2ab55..00706b63595 100644 --- a/src/xrPhysics/PHJointDestroyInfo.h +++ b/src/xrPhysics/PHJointDestroyInfo.h @@ -2,7 +2,7 @@ #define PHJOINT_DESTROY_INFO_H -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" class CPHJointDestroyInfo { friend class CPHShellSplitterHolder; diff --git a/src/xrPhysics/PHMoveStorage.cpp b/src/xrPhysics/PHMoveStorage.cpp index 2166370da97..762271fc2a2 100644 --- a/src/xrPhysics/PHMoveStorage.cpp +++ b/src/xrPhysics/PHMoveStorage.cpp @@ -2,7 +2,7 @@ #include "phmovestorage.h" #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/ode/src/collision_kernel.h" +#include "Externals/ode/ode/src/collision_kernel.h" #pragma warning(default:4995) #pragma warning(default:4267) struct dxGeomTransform : public dxGeom { diff --git a/src/xrPhysics/Physics.cpp b/src/xrPhysics/Physics.cpp index b369b4e4b16..dfb0cfd21b7 100644 --- a/src/xrPhysics/Physics.cpp +++ b/src/xrPhysics/Physics.cpp @@ -13,9 +13,9 @@ /////////////////////////////////////////////////////////////// #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/ode/src/collision_kernel.h" -#include "3rd party/ode/ode/src/joint.h" -#include "3rd party/ode/ode/src/objects.h" +#include "Externals/ode/ode/src/collision_kernel.h" +#include "Externals/ode/ode/src/joint.h" +#include "Externals/ode/ode/src/objects.h" #pragma warning(default:4267) #pragma warning(default:4995) diff --git a/src/xrPhysics/dRayMotions.cpp b/src/xrPhysics/dRayMotions.cpp index 06e77562065..c98b8e1abd5 100644 --- a/src/xrPhysics/dRayMotions.cpp +++ b/src/xrPhysics/dRayMotions.cpp @@ -10,7 +10,7 @@ int dCollideCylRay(dxGeom *o1, dxGeom *o2, int flags,dContactGeom *contact, int #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/ode/src/collision_std.h" +#include "Externals/ode/ode/src/collision_std.h" #pragma warning(default:4995) #pragma warning(default:4267) struct dxRayMotions diff --git a/src/xrPhysics/dcylinder/dCylinder.h b/src/xrPhysics/dcylinder/dCylinder.h index e228e57a053..4764e7bd7e4 100644 --- a/src/xrPhysics/dcylinder/dCylinder.h +++ b/src/xrPhysics/dcylinder/dCylinder.h @@ -4,7 +4,7 @@ -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" struct dxCylinder; extern int dCylinderClassUser; diff --git a/src/xrPhysics/ode_include.h b/src/xrPhysics/ode_include.h index fa341aac65b..9273d731968 100644 --- a/src/xrPhysics/ode_include.h +++ b/src/xrPhysics/ode_include.h @@ -3,7 +3,7 @@ #endif #pragma warning(disable:4995) #pragma warning(disable:4267) -#include "3rd party/ode/include/ode/ode.h" +#include "Externals/ode/include/ode/ode.h" #pragma warning(default:4995) #pragma warning(default:4267) #include "ode_redefine.h" \ No newline at end of file diff --git a/src/xrPhysics/ph_valid_ode.h b/src/xrPhysics/ph_valid_ode.h index 7e739be435e..f713756febf 100644 --- a/src/xrPhysics/ph_valid_ode.h +++ b/src/xrPhysics/ph_valid_ode.h @@ -1,9 +1,9 @@ #pragma once -#include "3rd party/ode/include/ode/common.h" -#include "3rd party/ode/include/ode/mass.h" -#include "3rd party/ode/include/ode/objects.h" +#include "Externals/ode/include/ode/common.h" +#include "Externals/ode/include/ode/mass.h" +#include "Externals/ode/include/ode/objects.h" IC BOOL dV_valid (const dReal * v) { return _valid(v[0])&&_valid(v[1])&&_valid(v[2]); diff --git a/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h b/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h index 98805ea4a5d..9e134a26d43 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h +++ b/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h @@ -1,6 +1,6 @@ #ifndef D_TRI_COLLIDER_COMMON #define D_TRI_COLLIDER_COMMON -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" #include "xrPhysics/ExtendedGeom.h" #include "dTriColliderMath.h" diff --git a/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h b/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h index c5a0ec1e9df..c395535dc6e 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h +++ b/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h @@ -1,7 +1,7 @@ #ifndef D_TRI_COLLIDER_MATH_H #define D_TRI_COLLIDER_MATH_H #include "__aabb_tri.h" -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" #include "xrPhysics/MathUtilsOde.h" #include "dcTriangle.h" diff --git a/src/xrPhysics/tri-colliderknoopc/dTriList.h b/src/xrPhysics/tri-colliderknoopc/dTriList.h index 489a4b3ac67..f7712420f9e 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriList.h +++ b/src/xrPhysics/tri-colliderknoopc/dTriList.h @@ -1,6 +1,6 @@ -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" /* Class ID */ diff --git a/src/xrPhysics/tri-colliderknoopc/dxTriList.h b/src/xrPhysics/tri-colliderknoopc/dxTriList.h index 4af81a72033..ca7baa9c736 100644 --- a/src/xrPhysics/tri-colliderknoopc/dxTriList.h +++ b/src/xrPhysics/tri-colliderknoopc/dxTriList.h @@ -1,6 +1,6 @@ #ifndef __DXTRILIST_INCLUDED__ #define __DXTRILIST_INCLUDED__ -#include "3rd party/ode/include/ode/common.h" +#include "Externals/ode/include/ode/common.h" struct dcVector3{ diff --git a/src/xrPhysics/xrPhysics.cpp b/src/xrPhysics/xrPhysics.cpp index 0d8cffda7c1..e8bcb7dfc63 100644 --- a/src/xrPhysics/xrPhysics.cpp +++ b/src/xrPhysics/xrPhysics.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "xrPhysics.h" -#include "3rd party/ode/include/ode/memory.h" +#include "Externals/ode/include/ode/memory.h" #pragma comment(lib,"ode.lib") #pragma comment(lib,"xrCDB.lib")