xrPhysics: Replace 3rd party include directives by adding include directories.

CrossVR · CrossVR · commit d2eb0423c891 · 2015-11-28T11:34:52.000+01:00
diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
@@ -90,7 +90,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>.;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\ode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;XRGAME_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -144,7 +144,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>.;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\ode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;MIXED;WIN32;_WINDOWS;_USRDLL;XRGAME_EXPORTS;dSINGLE;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -193,7 +193,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(SolutionDir);$(SolutionDir)xrServerEntities;$(xrSdkDir)include;$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\CxImage;$(SolutionDir)Externals\ode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XRGAME_EXPORTS;dSINGLE;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling />
diff --git 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 "include/ode/common.h"
+#include "include/ode/collision.h"
 #include "physicscommon.h"
 #include "MathUtils.h"
 #ifdef	DEBUG
diff --git 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 "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
@@ -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 "include/ode/common.h"
+#include "include/ode/odemath.h"
+#include "include/ode/objects.h"
+#include "include/ode/rotation.h"
+#include "include/ode/compatibility.h"
+#include "include/ode/collision.h"
+#include "include/ode/matrix.h"
 
 #include "mathutils.h"
 #include "ode_redefine.h"
diff --git 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 "ode/src/util.h"
 
 #ifdef DEBUG
 #	include "debug_output.h"
diff --git 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 "include/ode/common.h"
 class CPHBaseBodyEffector 
 {
 protected:
diff --git 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 "include/ode/common.h"
 #include "iphcapture.h"
 class	IPhysicsShellHolder;
 class	CPHCharacter;
diff --git 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 "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
@@ -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 "include/ode/contact.h"
 struct SGameMtl;
 class CPHContactBodyEffector : public CPHBaseBodyEffector
 {
diff --git 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 "include/ode/common.h"
 
 struct SDisableVector
 {
diff --git 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 "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 "ode/src/collision_kernel.h"
 
 
 #pragma warning(default:4267)
diff --git 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 "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
@@ -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 "include/ode/common.h"
+#include "include/ode/mass.h"
 class CPHFracture;
 class CPHElement;
 
diff --git 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 "include/ode/common.h"
 
 class CPHInterpolation {
 
diff --git 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 "ode/src/objects.h"
+#include "ode/src/joint.h"
 #pragma warning(default:4995)
 #pragma warning(default:4267)
 
-#include "3rd party/ode/include/ode/objects.h"
+#include "include/ode/objects.h"
 
 #include "PhysicsCommon.h"
 
diff --git 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 "include/ode/common.h"
 #include "physics_scripted.h"
 class CPHJointDestroyInfo;
 class CPHJoint:
diff --git 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 "include/ode/common.h"
 class CPHJointDestroyInfo
 {
 friend class CPHShellSplitterHolder;
diff --git 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 "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
@@ -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 "ode/src/collision_kernel.h"
+#include "ode/src/joint.h"
+#include "ode/src/objects.h"
 #pragma warning(default:4267)
 #pragma warning(default:4995)
 
diff --git a/src/xrPhysics/SpaceUtils.h b/src/xrPhysics/SpaceUtils.h
@@ -2,7 +2,7 @@
 #define SPACE_UTILS_H
 #pragma warning(disable:4995)
 #pragma warning(disable:4267)
-#include "../3rd party/ode/ode/src/collision_kernel.h"
+#include "ode/src/collision_kernel.h"
 #pragma warning(default:4995)
 #pragma warning(default:4267)
 IC void spatialParsFromDGeom(dGeomID d_space,Fvector& center,Fvector& AABB,float& radius)
diff --git 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 "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
@@ -4,7 +4,7 @@
 
 
 
-#include "3rd party/ode/include/ode/common.h"
+#include "include/ode/common.h"
 
 struct dxCylinder;
 extern int dCylinderClassUser;
diff --git 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 "include/ode/ode.h"
 #pragma warning(default:4995)
 #pragma warning(default:4267)
 #include "ode_redefine.h"
diff --git 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 "include/ode/common.h"
+#include "include/ode/mass.h"
+#include "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
@@ -1,6 +1,6 @@
 #ifndef D_TRI_COLLIDER_COMMON
 #define D_TRI_COLLIDER_COMMON
-#include "3rd party/ode/include/ode/common.h"
+#include "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
@@ -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 "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
@@ -1,6 +1,6 @@
 
 
-#include "3rd party/ode/include/ode/common.h"
+#include "include/ode/common.h"
 
 /* Class ID */
 
diff --git 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 "include/ode/common.h"
 
 struct dcVector3{
 
diff --git 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 "include/ode/memory.h"
 
 #pragma comment(lib,"ode.lib")
 #pragma comment(lib,"xrCDB.lib")
diff --git a/src/xrPhysics/xrPhysics.vcxproj b/src/xrPhysics/xrPhysics.vcxproj
@@ -79,7 +79,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)Externals\ode;$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;dSINGLE;_USRDLL;XRPHYSICS_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -119,7 +119,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)Externals\ode;$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;dSINGLE;_USRDLL;XRPHYSICS_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling />
@@ -156,7 +156,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)Externals\ode;$(xrSdkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MIXED;WIN32;DEBUG;_WINDOWS;dSINGLE;_USRDLL;XRPHYSICS_EXPORTS;MSVC;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#define PH_BASE_BODY_EFFECTOR_H`
`3`	`3`
`4`	`4`
`5`		`-#include "3rd party/ode/include/ode/common.h"`
	`5`	`+#include "include/ode/common.h"`
`6`	`6`	`class CPHBaseBodyEffector`
`7`	`7`	`{`
`8`	`8`	`protected:`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#ifndef PH_CONTACT_BODY_EFFECTOR_H`
`2`	`2`	`#define PH_CONTACT_BODY_EFFECTOR_H`
`3`	`3`	`#include "PHBaseBodyEffector.h"`
`4`		`-#include "3rd party/ode/include/ode/contact.h"`
	`4`	`+#include "include/ode/contact.h"`
`5`	`5`	`struct SGameMtl;`
`6`	`6`	`class CPHContactBodyEffector : public CPHBaseBodyEffector`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "DisablingParams.h"`
`5`	`5`
`6`		`-#include "3rd party/ode/include/ode/common.h"`
	`6`	`+#include "include/ode/common.h"`
`7`	`7`
`8`	`8`	`struct SDisableVector`
`9`	`9`	`{`