Reformat ODE includes

OpenXRay · Jan 22, 2018 · b1dd5c4 · b1dd5c4
1 parent eb8de3a
commit b1dd5c4
Show file tree

Hide file tree

Showing 49 changed files with 132 additions and 135 deletions.
diff --git 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 <ode/common.h>
+#include <ode/collision_space.h>
+#include <ode/contact.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git 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 <ode/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git 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 <ode/config.h>
+#include <ode/error.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git 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 <ode/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git 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 <ode/config.h>
 
 #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
@@ -23,7 +23,7 @@
 #ifndef _ODE_EXPORT_DIF_
 #define _ODE_EXPORT_DIF_
 
-#include "common.h"
+#include <ode/common.h>
 
 
 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
@@ -23,7 +23,7 @@
 #ifndef _ODE_MASS_H_
 #define _ODE_MASS_H_
 
-#include "common.h"
+#include <ode/common.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git 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 <ode/common.h>
 
 
 #ifdef __cplusplus

diff --git 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
@@ -25,7 +25,7 @@
 #ifndef _ODE_MISC_H_
 #define _ODE_MISC_H_
 
-#include "common.h"
+#include <ode/common.h>
 
 
 #ifdef __cplusplus

diff --git 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 <ode/common.h>
+#include <ode/mass.h>
+#include <ode/contact.h>
 
 #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
@@ -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 <ode/config.h>
+#include <ode/compatibility.h>
+#include <ode/common.h>
+#include <ode/contact.h>
+#include <ode/error.h>
+#include <ode/memory.h>
+#include <ode/odemath.h>
+#include <ode/matrix.h>
+#include <ode/timer.h>
+#include <ode/rotation.h>
+#include <ode/mass.h>
+#include <ode/misc.h>
+#include <ode/objects.h>
+#include <ode/odecpp.h>
+#include <ode/collision_space.h>
+#include <ode/collision.h>
+#include <ode/odecpp_collision.h>
+#include <ode/export-dif.h>
 
 #endif
diff --git 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 <ode/error.h>
 
 
 class dWorld {

diff --git 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 <ode/error.h>
 
 
 class dGeom {

diff --git 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 <ode/common.h>
 
 #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
@@ -23,8 +23,8 @@
 #ifndef _ODE_ROTATION_H_
 #define _ODE_ROTATION_H_
 
-#include "common.h"
-#include "compatibility.h"
+#include <ode/common.h>
+#include <ode/compatibility.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git 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 <ode/config.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git 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 <ode/config.h>
 
 
 // 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
@@ -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 <ode/common.h>
+#include <ode/contact.h>
+#include <ode/collision.h>
 #include "objects.h"
 
 //****************************************************************************

diff --git 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 <ode/common.h>
 #include "collision_kernel.h"
 
 

diff --git 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
@@ -27,7 +27,7 @@
 
 
 #include "objects.h"
-#include "../../include/ode/contact.h"
+#include <ode/contact.h>
 #include "obstack.h"
 
 

diff --git a/Externals/ode/ode/src/memory.cpp b/Externals/ode/ode/src/memory.cpp
@@ -23,7 +23,7 @@
 #include <ode/config.h>
 #include <ode/memory.h>
 #include <ode/error.h>
- 
+
 
 static dAllocFunction *allocfn = 0;
 static dReallocFunction *reallocfn = 0;

diff --git 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 <ode/common.h>
+#include <ode/memory.h>
+#include <ode/mass.h>
 #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
@@ -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
@@ -31,7 +31,6 @@
 #include "lcp.h"
 #include "util.h"
 
-
 //****************************************************************************
 // misc defines