diff --git a/Externals/ode/include/ode/collision.h b/Externals/ode/include/ode/collision.h index 47414313459..250cdeac1d2 100644 --- a/Externals/ode/include/ode/collision.h +++ b/Externals/ode/include/ode/collision.h @@ -23,9 +23,9 @@ #ifndef _ODE_COLLISION_H_ #define _ODE_COLLISION_H_ -#include "../../include/ode/common.h" -#include "../../include/ode/collision_space.h" -#include "../../include/ode/contact.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/include/ode/collision_space.h b/Externals/ode/include/ode/collision_space.h index 2827d81aa78..0ab3d132c9d 100644 --- a/Externals/ode/include/ode/collision_space.h +++ b/Externals/ode/include/ode/collision_space.h @@ -23,7 +23,7 @@ #ifndef _ODE_COLLISION_SPACE_H_ #define _ODE_COLLISION_SPACE_H_ -#include "../../include/ode/common.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/include/ode/common.h b/Externals/ode/include/ode/common.h index cdee849b4f5..6edeade763e 100644 --- a/Externals/ode/include/ode/common.h +++ b/Externals/ode/include/ode/common.h @@ -23,8 +23,8 @@ #ifndef _ODE_COMMON_H_ #define _ODE_COMMON_H_ -#include "config.h" -#include "error.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/include/ode/contact.h b/Externals/ode/include/ode/contact.h index c05d7f82772..926d77f6c43 100644 --- a/Externals/ode/include/ode/contact.h +++ b/Externals/ode/include/ode/contact.h @@ -23,7 +23,7 @@ #ifndef _ODE_CONTACT_H_ #define _ODE_CONTACT_H_ -#include "common.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/include/ode/error.h b/Externals/ode/include/ode/error.h index 0b85b081bef..646bb456600 100644 --- a/Externals/ode/include/ode/error.h +++ b/Externals/ode/include/ode/error.h @@ -25,7 +25,7 @@ #ifndef _ODE_ERROR_H_ #define _ODE_ERROR_H_ -#include "config.h" +#include #ifdef __cplusplus extern "C" { @@ -54,9 +54,7 @@ dMessageFunction *dGetMessageHandler(); void _cdecl dError (int num, const char *msg, ...); void _cdecl dDebug (int num, const char *msg, ...); void _cdecl dMessage (int num, const char *msg, ...); -//#define dError(a,b) -//#define dDebug(a,b) -//#define dMessage(a,b) + #ifdef __cplusplus } diff --git a/Externals/ode/include/ode/export-dif.h b/Externals/ode/include/ode/export-dif.h index 3f031387ce6..d89317ff910 100644 --- a/Externals/ode/include/ode/export-dif.h +++ b/Externals/ode/include/ode/export-dif.h @@ -23,7 +23,7 @@ #ifndef _ODE_EXPORT_DIF_ #define _ODE_EXPORT_DIF_ -#include "common.h" +#include void dWorldExportDIF (dWorldID w, FILE *file, const char *world_name); diff --git a/Externals/ode/include/ode/mass.h b/Externals/ode/include/ode/mass.h index 2dad746ef58..f94fa565066 100644 --- a/Externals/ode/include/ode/mass.h +++ b/Externals/ode/include/ode/mass.h @@ -23,7 +23,7 @@ #ifndef _ODE_MASS_H_ #define _ODE_MASS_H_ -#include "common.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/include/ode/matrix.h b/Externals/ode/include/ode/matrix.h index 49a5028d393..75218fd3ee9 100644 --- a/Externals/ode/include/ode/matrix.h +++ b/Externals/ode/include/ode/matrix.h @@ -25,7 +25,7 @@ #ifndef _ODE_MATRIX_H_ #define _ODE_MATRIX_H_ -#include "common.h" +#include #ifdef __cplusplus diff --git a/Externals/ode/include/ode/memory.h b/Externals/ode/include/ode/memory.h index a793e409cb4..ff57f5fe782 100644 --- a/Externals/ode/include/ode/memory.h +++ b/Externals/ode/include/ode/memory.h @@ -25,7 +25,7 @@ #ifndef _ODE_MEMORY_H_ #define _ODE_MEMORY_H_ -#include "config.h" +#include "ode/config.h" #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/include/ode/misc.h b/Externals/ode/include/ode/misc.h index 378579a39a8..bc0270c37a8 100644 --- a/Externals/ode/include/ode/misc.h +++ b/Externals/ode/include/ode/misc.h @@ -25,7 +25,7 @@ #ifndef _ODE_MISC_H_ #define _ODE_MISC_H_ -#include "common.h" +#include #ifdef __cplusplus diff --git a/Externals/ode/include/ode/objects.h b/Externals/ode/include/ode/objects.h index ec2a8991575..64cf4cdf8b3 100644 --- a/Externals/ode/include/ode/objects.h +++ b/Externals/ode/include/ode/objects.h @@ -23,9 +23,9 @@ #ifndef _ODE_OBJECTS_H_ #define _ODE_OBJECTS_H_ -#include "common.h" -#include "mass.h" -#include "contact.h" +#include +#include +#include #ifdef __cplusplus extern "C" { @@ -94,12 +94,12 @@ void dBodySetAutoDisableDefaults (dBodyID); /* bodies */ -dBodyID dBodyCreate (dWorldID); -void dBodyDestroy (dBodyID); -void dWorldAddBody (dWorldID,dBodyID); -void dWorldAddJoint (dWorldID,dJointID); -void dWorldRemoveBody (dWorldID,dBodyID); -void dWorldRemoveJoint (dWorldID,dJointID); +dBodyID dBodyCreate (dWorldID); +void dBodyDestroy (dBodyID); +void dWorldAddBody (dWorldID,dBodyID); +void dWorldAddJoint (dWorldID,dJointID); +void dWorldRemoveBody (dWorldID,dBodyID); +void dWorldRemoveJoint (dWorldID,dJointID); void dBodySetData (dBodyID, void *data); void *dBodyGetData (dBodyID); @@ -213,7 +213,7 @@ void dJointSetUniversalAxis2 (dJointID, dReal x, dReal y, dReal z); void dJointSetUniversalParam (dJointID, int parameter, dReal value); void dJointAddUniversalTorques(dJointID joint, dReal torque1, dReal torque2); void dJointSetFixed (dJointID); -void dJointSetFixedQuaternionPos (dJointID joint,dQuaternion quaternion,dReal* pos); +void dJointSetFixedQuaternionPos (dJointID joint, dQuaternion quaternion, dReal* pos); void dJointSetAMotorNumAxes (dJointID, int num); void dJointSetAMotorAxis (dJointID, int anum, int rel, dReal x, dReal y, dReal z); diff --git a/Externals/ode/include/ode/ode.h b/Externals/ode/include/ode/ode.h index 3e1c26d828f..00cd500b3a1 100644 --- a/Externals/ode/include/ode/ode.h +++ b/Externals/ode/include/ode/ode.h @@ -25,23 +25,23 @@ /* include *everything* here */ -#include "config.h" -#include "compatibility.h" -#include "common.h" -#include "contact.h" -#include "error.h" -#include "memory.h" -#include "odemath.h" -#include "matrix.h" -#include "timer.h" -#include "rotation.h" -#include "mass.h" -#include "misc.h" -#include "objects.h" -#include "odecpp.h" -#include "collision_space.h" -#include "collision.h" -#include "odecpp_collision.h" -#include "export-dif.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/Externals/ode/include/ode/odecpp.h b/Externals/ode/include/ode/odecpp.h index e540e886a78..01a06e4298f 100644 --- a/Externals/ode/include/ode/odecpp.h +++ b/Externals/ode/include/ode/odecpp.h @@ -27,7 +27,7 @@ #define _ODE_ODECPP_H_ #ifdef __cplusplus -#include "error.h" +#include class dWorld { diff --git a/Externals/ode/include/ode/odecpp_collision.h b/Externals/ode/include/ode/odecpp_collision.h index 80106ce02a7..6d69d212983 100644 --- a/Externals/ode/include/ode/odecpp_collision.h +++ b/Externals/ode/include/ode/odecpp_collision.h @@ -27,7 +27,7 @@ #define _ODE_ODECPP_COLLISION_H_ #ifdef __cplusplus -#include "../../include/ode/error.h" +#include class dGeom { diff --git a/Externals/ode/include/ode/odemath.h b/Externals/ode/include/ode/odemath.h index d63b313d5fa..05e045cd014 100644 --- a/Externals/ode/include/ode/odemath.h +++ b/Externals/ode/include/ode/odemath.h @@ -23,7 +23,7 @@ #ifndef _ODE_ODEMATH_H_ #define _ODE_ODEMATH_H_ -#include "common.h" +#include #ifdef __GNUC__ #define PURE_INLINE extern inline @@ -219,8 +219,8 @@ extern "C" { /* * normalize 3x1 and 4x1 vectors (i.e. scale them to unit length) */ -void dNormalize3_slow (dVector3 a); -void dNormalize4 (dVector4 a); +void dNormalize3_slow (dVector3 a); +void dNormalize4 (dVector4 a); __forceinline void dNormalize3 (dVector3 a) { diff --git a/Externals/ode/include/ode/rotation.h b/Externals/ode/include/ode/rotation.h index d0e64754fbd..951547d98f2 100644 --- a/Externals/ode/include/ode/rotation.h +++ b/Externals/ode/include/ode/rotation.h @@ -23,8 +23,8 @@ #ifndef _ODE_ROTATION_H_ #define _ODE_ROTATION_H_ -#include "common.h" -#include "compatibility.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/include/ode/timer.h b/Externals/ode/include/ode/timer.h index b51a961e788..dcae5b5141c 100644 --- a/Externals/ode/include/ode/timer.h +++ b/Externals/ode/include/ode/timer.h @@ -23,7 +23,7 @@ #ifndef _ODE_TIMER_H_ #define _ODE_TIMER_H_ -#include "config.h" +#include #ifdef __cplusplus extern "C" { diff --git a/Externals/ode/ode/src/array.h b/Externals/ode/ode/src/array.h index 0a92293f606..307206c379f 100644 --- a/Externals/ode/ode/src/array.h +++ b/Externals/ode/ode/src/array.h @@ -39,7 +39,7 @@ #ifndef _ODE_ARRAY_H_ #define _ODE_ARRAY_H_ -#include "../../include/ode/config.h" +#include // this base class has no constructors or destructor, for your convenience. diff --git a/Externals/ode/ode/src/collision_kernel.h b/Externals/ode/ode/src/collision_kernel.h index 779abe04a2a..e5f2fb0bf90 100644 --- a/Externals/ode/ode/src/collision_kernel.h +++ b/Externals/ode/ode/src/collision_kernel.h @@ -29,9 +29,9 @@ internal data structures and functions for collision detection. #ifndef _ODE_COLLISION_KERNEL_H_ #define _ODE_COLLISION_KERNEL_H_ -#include "../../include/ode/common.h" -#include "../../include/ode/contact.h" -#include "../../include/ode/collision.h" +#include +#include +#include #include "objects.h" //**************************************************************************** diff --git a/Externals/ode/ode/src/collision_std.h b/Externals/ode/ode/src/collision_std.h index 59208995234..3c0a7ec0be6 100644 --- a/Externals/ode/ode/src/collision_std.h +++ b/Externals/ode/ode/src/collision_std.h @@ -29,7 +29,7 @@ the standard ODE geometry primitives. #ifndef _ODE_COLLISION_STD_H_ #define _ODE_COLLISION_STD_H_ -#include "../../include/ode/common.h" +#include #include "collision_kernel.h" diff --git a/Externals/ode/ode/src/error.cpp b/Externals/ode/ode/src/error.cpp index ffc5e4e5a93..7250d21126f 100644 --- a/Externals/ode/ode/src/error.cpp +++ b/Externals/ode/ode/src/error.cpp @@ -66,7 +66,6 @@ extern "C" dMessageFunction *dGetMessageHandler() } - static void printMessage (int num, const char *msg1, const char *msg2, va_list ap) { diff --git a/Externals/ode/ode/src/joint.h b/Externals/ode/ode/src/joint.h index a973d5257ac..5f2da06c966 100644 --- a/Externals/ode/ode/src/joint.h +++ b/Externals/ode/ode/src/joint.h @@ -27,7 +27,7 @@ #include "objects.h" -#include "../../include/ode/contact.h" +#include #include "obstack.h" diff --git a/Externals/ode/ode/src/memory.cpp b/Externals/ode/ode/src/memory.cpp index 5e38c4fb886..60bb5b6b875 100644 --- a/Externals/ode/ode/src/memory.cpp +++ b/Externals/ode/ode/src/memory.cpp @@ -23,7 +23,7 @@ #include #include #include - + static dAllocFunction *allocfn = 0; static dReallocFunction *reallocfn = 0; diff --git a/Externals/ode/ode/src/objects.h b/Externals/ode/ode/src/objects.h index 7472caf54f6..21c353bb74a 100644 --- a/Externals/ode/ode/src/objects.h +++ b/Externals/ode/ode/src/objects.h @@ -26,9 +26,9 @@ #ifndef _ODE_OBJECT_H_ #define _ODE_OBJECT_H_ -#include "../../include/ode/common.h" -#include "../../include/ode/memory.h" -#include "../../include/ode/mass.h" +#include +#include +#include #include "array.h" @@ -76,7 +76,7 @@ struct dxAutoDisable { // quick-step parameters struct dxQuickStepParameters { int num_iterations; // number of SOR iterations to perform - dReal w; // the SOR over-relaxation parameter + dReal w; // the SOR over-relaxation parameter }; @@ -98,7 +98,7 @@ struct dxBody : public dObject { dQuaternion q; // orientation quaternion dMatrix3 R; // rotation matrix, always corresponds to q dVector3 lvel,avel; // linear and angular velocity of POR - dVector3 facc,tacc; // force and torque accululators + dVector3 facc,tacc; // force and torque accumulators dVector3 finite_rot_axis; // finite rotation axis, unit length or 0=none // auto-disable information diff --git a/Externals/ode/ode/src/obstack.cpp b/Externals/ode/ode/src/obstack.cpp index 7b3ba5044e5..084039633a1 100644 --- a/Externals/ode/ode/src/obstack.cpp +++ b/Externals/ode/ode/src/obstack.cpp @@ -29,7 +29,7 @@ // macros and constants #define ROUND_UP_OFFSET_TO_EFFICIENT_SIZE(arena,ofs) \ - ofs = (unsigned int) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) ); + ofs = (size_t) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) ); #define MAX_ALLOC_SIZE \ ((size_t)(dOBSTACK_ARENA_SIZE - sizeof (Arena) - EFFICIENT_ALIGNMENT + 1)) diff --git a/Externals/ode/ode/src/step.cpp b/Externals/ode/ode/src/step.cpp index 14f14884c71..84ab6c69614 100644 --- a/Externals/ode/ode/src/step.cpp +++ b/Externals/ode/ode/src/step.cpp @@ -31,7 +31,6 @@ #include "lcp.h" #include "util.h" - //**************************************************************************** // misc defines diff --git a/Externals/ode/ode/src/stepfast.cpp b/Externals/ode/ode/src/stepfast.cpp index 19bcb387ec2..1818aa03cde 100644 --- a/Externals/ode/ode/src/stepfast.cpp +++ b/Externals/ode/ode/src/stepfast.cpp @@ -1,26 +1,26 @@ /************************************************************************* -* * -* Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith. * -* All rights reserved. Email: russ@q12.org Web: www.q12.org * -* * -* Fast iterative solver, David Whittaker. Email: david@csworkbench.com * -* * -* This library is free software; you can redistribute it and/or * -* modify it under the terms of EITHER: * -* (1) The GNU Lesser General Public License as published by the Free * -* Software Foundation; either version 2.1 of the License, or (at * -* your option) any later version. The text of the GNU Lesser * -* General Public License is included with this library in the * -* file LICENSE.TXT. * -* (2) The BSD-style license that is included with this library in * -* the file LICENSE-BSD.TXT. * -* * -* This library is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files * -* LICENSE.TXT and LICENSE-BSD.TXT for more details. * -* * -*************************************************************************/ + * * + * Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith. * + * All rights reserved. Email: russ@q12.org Web: www.q12.org * + * * + * Fast iterative solver, David Whittaker. Email: david@csworkbench.com * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of EITHER: * + * (1) The GNU Lesser General Public License as published by the Free * + * Software Foundation; either version 2.1 of the License, or (at * + * your option) any later version. The text of the GNU Lesser * + * General Public License is included with this library in the * + * file LICENSE.TXT. * + * (2) The BSD-style license that is included with this library in * + * the file LICENSE-BSD.TXT. * + * * + * This library is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files * + * LICENSE.TXT and LICENSE-BSD.TXT for more details. * + * * + *************************************************************************/ // This is the StepFast code by David Whittaker. This code is faster, but // sometimes less stable than, the original "big matrix" code. @@ -68,7 +68,6 @@ int dWorldGetAutoEnableDepthSF1 (dxWorld *world) return autoEnableDepth; } - //little bit of math.... the _sym_ functions assume the return matrix will be symmetric static void Multiply2_sym_p8p (dReal * A, dReal * B, dReal * C, int p, int Askip) diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj index db59e1aba70..6d05390d664 100644 --- a/src/xrGame/xrGame.vcxproj +++ b/src/xrGame/xrGame.vcxproj @@ -97,42 +97,42 @@ - $(SolutionDir)xrServerEntities;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(xrExternals)ode/include;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) _USRDLL;XRGAME_EXPORTS;%(PreprocessorDefinitions) 4237;4250;%(DisableSpecificWarnings) - $(SolutionDir)xrServerEntities;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(xrExternals)ode/include;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) _USRDLL;XRGAME_EXPORTS;%(PreprocessorDefinitions) 4237;4250;%(DisableSpecificWarnings) - $(SolutionDir)xrServerEntities;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(xrExternals)ode/include;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) _USRDLL;XRGAME_EXPORTS;%(PreprocessorDefinitions) 4237;4250;%(DisableSpecificWarnings) - $(SolutionDir)xrServerEntities;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(xrExternals)ode/include;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) _USRDLL;XRGAME_EXPORTS;%(PreprocessorDefinitions) 4237;4250;%(DisableSpecificWarnings) - $(SolutionDir)xrServerEntities;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(xrExternals)ode/include;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) _USRDLL;XRGAME_EXPORTS;%(PreprocessorDefinitions) 4237;4250;%(DisableSpecificWarnings) - $(SolutionDir)xrServerEntities;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) + $(SolutionDir)xrServerEntities;$(xrExternals)ode/include;$(xrExternals)OpenAutomate\inc;$(xrExternals)CxImage;$(xrExternals)pugixml\src;%(AdditionalIncludeDirectories) _USRDLL;XRGAME_EXPORTS;%(PreprocessorDefinitions) 4237;4250;%(DisableSpecificWarnings) diff --git a/src/xrPhysics/ExtendedGeom.h b/src/xrPhysics/ExtendedGeom.h index ab068f8183c..564974bc4f9 100644 --- a/src/xrPhysics/ExtendedGeom.h +++ b/src/xrPhysics/ExtendedGeom.h @@ -6,8 +6,8 @@ #endif #include "PHObject.h" -#include "ode/include/ode/common.h" -#include "ode/include/ode/collision.h" +#include +#include #include "physicscommon.h" #include "MathUtils.h" #ifdef DEBUG diff --git a/src/xrPhysics/MathUtils.cpp b/src/xrPhysics/MathUtils.cpp index 51462ec811d..bfdb27b28ff 100644 --- a/src/xrPhysics/MathUtils.cpp +++ b/src/xrPhysics/MathUtils.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "MathUtils.h" #include "xrCore/_cylinder.h" -#include "ode/include/ode/common.h" +#include XRPHYSICS_API const float phInfinity = dInfinity; /* diff --git a/src/xrPhysics/MathUtilsOde.h b/src/xrPhysics/MathUtilsOde.h index 2bf9c912b23..f7e114ca793 100644 --- a/src/xrPhysics/MathUtilsOde.h +++ b/src/xrPhysics/MathUtilsOde.h @@ -3,13 +3,13 @@ #pragma warning(push) #pragma warning(disable : 4995) #pragma warning(disable : 4267) -#include "ode/include/ode/common.h" -#include "ode/include/ode/odemath.h" -#include "ode/include/ode/objects.h" -#include "ode/include/ode/rotation.h" -#include "ode/include/ode/compatibility.h" -#include "ode/include/ode/collision.h" -#include "ode/include/ode/matrix.h" +#include +#include +#include +#include +#include +#include +#include #include "MathUtils.h" #include "ode_redefine.h" diff --git a/src/xrPhysics/PHBaseBodyEffector.h b/src/xrPhysics/PHBaseBodyEffector.h index 5d95629f991..0667dd4134a 100644 --- a/src/xrPhysics/PHBaseBodyEffector.h +++ b/src/xrPhysics/PHBaseBodyEffector.h @@ -1,7 +1,7 @@ #ifndef PH_BASE_BODY_EFFECTOR_H #define PH_BASE_BODY_EFFECTOR_H -#include "ode/include/ode/common.h" +#include class CPHBaseBodyEffector { diff --git a/src/xrPhysics/PHCapture.h b/src/xrPhysics/PHCapture.h index 410328763f9..4e4ae781c22 100644 --- a/src/xrPhysics/PHCapture.h +++ b/src/xrPhysics/PHCapture.h @@ -2,11 +2,11 @@ #ifndef PH_CAPTURE_H #define PH_CAPTURE_H -#include "phupdateobject.h" +#include "PHUpdateObject.h" -#include "phisland.h" -#include "ode/include/ode/common.h" -#include "iphcapture.h" +#include "PHIsland.h" +#include +#include "IPHCapture.h" class IPhysicsShellHolder; class CPHCharacter; class CPhysicsElement; diff --git a/src/xrPhysics/PHContactBodyEffector.h b/src/xrPhysics/PHContactBodyEffector.h index 48e7a5c85cc..05a54de7944 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 "ode/include/ode/contact.h" +#include struct SGameMtl; class CPHContactBodyEffector : public CPHBaseBodyEffector diff --git a/src/xrPhysics/PHDisabling.h b/src/xrPhysics/PHDisabling.h index a3bf2de52a9..0102aa8b150 100644 --- a/src/xrPhysics/PHDisabling.h +++ b/src/xrPhysics/PHDisabling.h @@ -2,7 +2,7 @@ #define PHDISABLING_H #include "DisablingParams.h" -#include "ode/include/ode/common.h" +#include struct SDisableVector { diff --git a/src/xrPhysics/PHFracture.h b/src/xrPhysics/PHFracture.h index 95c4a8886da..1dba709e234 100644 --- a/src/xrPhysics/PHFracture.h +++ b/src/xrPhysics/PHFracture.h @@ -5,8 +5,8 @@ #include "PHDefs.h" #include "PHImpact.h" -#include "ode/include/ode/common.h" -#include "ode/include/ode/mass.h" +#include +#include class CPHFracture; class CPHElement; diff --git a/src/xrPhysics/PHInterpolation.h b/src/xrPhysics/PHInterpolation.h index 6f9a5592b70..aed164f6051 100644 --- a/src/xrPhysics/PHInterpolation.h +++ b/src/xrPhysics/PHInterpolation.h @@ -2,7 +2,7 @@ #ifndef PHINTERPOLATON_H #define PHINTERPOLATON_H #include "CycleConstStorage.h" -#include "ode/include/ode/common.h" +#include #include "xrCore/_vector3d.h" #include "xrCore/_quaternion.h" diff --git a/src/xrPhysics/PHIsland.h b/src/xrPhysics/PHIsland.h index 814eac47c37..fa032192ea8 100644 --- a/src/xrPhysics/PHIsland.h +++ b/src/xrPhysics/PHIsland.h @@ -7,7 +7,7 @@ #include "ode/ode/src/objects.h" #include "ode/ode/src/joint.h" #pragma warning(pop) -#include "ode/include/ode/objects.h" +#include #include "PhysicsCommon.h" class CPHIslandFlags diff --git a/src/xrPhysics/PHJoint.h b/src/xrPhysics/PHJoint.h index 14efe4952d2..b8a16866174 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 "ode/include/ode/common.h" +#include #include "physics_scripted.h" class CPHJointDestroyInfo; class CPHJoint : public CPhysicsJoint, public cphysics_scripted diff --git a/src/xrPhysics/PHJointDestroyInfo.h b/src/xrPhysics/PHJointDestroyInfo.h index c3f0770ff78..cdd3ed196f1 100644 --- a/src/xrPhysics/PHJointDestroyInfo.h +++ b/src/xrPhysics/PHJointDestroyInfo.h @@ -1,7 +1,7 @@ #ifndef PHJOINT_DESTROY_INFO_H #define PHJOINT_DESTROY_INFO_H -#include "ode/include/ode/common.h" +#include class CPHJointDestroyInfo { diff --git a/src/xrPhysics/dcylinder/dCylinder.h b/src/xrPhysics/dcylinder/dCylinder.h index 0e34f81201e..b98758bca54 100644 --- a/src/xrPhysics/dcylinder/dCylinder.h +++ b/src/xrPhysics/dcylinder/dCylinder.h @@ -1,8 +1,5 @@ - -#ifndef dCylinder_h -#define dCylinder_h - -#include "ode/include/ode/common.h" +#pragma once +#include struct dxCylinder; extern int dCylinderClassUser; @@ -11,4 +8,3 @@ dxGeom* dCreateCylinder(dSpaceID space, dReal r, dReal lz); void dGeomCylinderSetParams(dGeomID g, dReal radius, dReal length); void dGeomCylinderGetParams(dGeomID g, dReal* radius, dReal* length); -#endif // dCylinder_h diff --git a/src/xrPhysics/ode_include.h b/src/xrPhysics/ode_include.h index b057e0224e7..c1769ec3424 100644 --- a/src/xrPhysics/ode_include.h +++ b/src/xrPhysics/ode_include.h @@ -5,7 +5,7 @@ #pragma warning(push) #pragma warning(disable : 4995) #pragma warning(disable : 4267) -#include "ode/include/ode/ode.h" +#include #pragma warning(pop) #include "ode_redefine.h" diff --git a/src/xrPhysics/ph_valid_ode.h b/src/xrPhysics/ph_valid_ode.h index 60b6edb1520..f674317af3e 100644 --- a/src/xrPhysics/ph_valid_ode.h +++ b/src/xrPhysics/ph_valid_ode.h @@ -1,8 +1,8 @@ #pragma once -#include "ode/include/ode/common.h" -#include "ode/include/ode/mass.h" -#include "ode/include/ode/objects.h" +#include +#include +#include IC BOOL dV_valid(const dReal* v) { return _valid(v[0]) && _valid(v[1]) && _valid(v[2]); } IC BOOL dM_valid(const dReal* m) diff --git a/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h b/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h index 127dd7b6a80..402a60dfd93 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h +++ b/src/xrPhysics/tri-colliderknoopc/dTriColliderCommon.h @@ -2,7 +2,7 @@ #ifndef D_TRI_COLLIDER_COMMON #define D_TRI_COLLIDER_COMMON -#include "ode/include/ode/common.h" +#include #include "xrPhysics/ExtendedGeom.h" #include "dTriColliderMath.h" diff --git a/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h b/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h index 547cfee1a78..3ab0dd68c9c 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 "ode/include/ode/common.h" +#include #include "xrPhysics/MathUtilsOde.h" #include "dcTriangle.h" diff --git a/src/xrPhysics/tri-colliderknoopc/dTriList.h b/src/xrPhysics/tri-colliderknoopc/dTriList.h index f4247d6fb60..ad6bfc83e16 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriList.h +++ b/src/xrPhysics/tri-colliderknoopc/dTriList.h @@ -1,5 +1,5 @@ - -#include "ode/include/ode/common.h" +#pragma once +#include /* Class ID */ diff --git a/src/xrPhysics/tri-colliderknoopc/dxTriList.h b/src/xrPhysics/tri-colliderknoopc/dxTriList.h index 246a48413e3..54938a0989f 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 "ode/include/ode/common.h" +#include struct dcVector3 { diff --git a/src/xrPhysics/xrPhysics.cpp b/src/xrPhysics/xrPhysics.cpp index 664fc7e83fb..61d9f2c815d 100644 --- a/src/xrPhysics/xrPhysics.cpp +++ b/src/xrPhysics/xrPhysics.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "xrPhysics.h" -#include "ode/include/ode/memory.h" +#include #ifdef _MANAGED #pragma managed(push, off) diff --git a/src/xrPhysics/xrPhysics.vcxproj b/src/xrPhysics/xrPhysics.vcxproj index e5efad664fc..5e70a5170cf 100644 --- a/src/xrPhysics/xrPhysics.vcxproj +++ b/src/xrPhysics/xrPhysics.vcxproj @@ -97,33 +97,39 @@ _USRDLL;XRPHYSICS_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)ode/include;%(AdditionalIncludeDirectories) _USRDLL;XRPHYSICS_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)ode/include;%(AdditionalIncludeDirectories) _USRDLL;XRPHYSICS_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)ode/include;%(AdditionalIncludeDirectories) _USRDLL;XRPHYSICS_EXPORTS;%(PreprocessorDefinitions) + $(xrExternals)ode/include;%(AdditionalIncludeDirectories) _USRDLL;XRPHYSICS_EXPORTS;%(PreprocessorDefinitions) ProgramDatabase + $(xrExternals)ode/include;%(AdditionalIncludeDirectories) _USRDLL;XRPHYSICS_EXPORTS;%(PreprocessorDefinitions) ProgramDatabase + $(xrExternals)ode/include;%(AdditionalIncludeDirectories)