Skip to content

Commit b1dd5c4

Browse files
Xottab-DUTYXottab-DUTY
committed
Reformat ODE includes
1 parent eb8de3a commit b1dd5c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+132
-135
lines changed

‎Externals/ode/include/ode/collision.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#ifndef _ODE_COLLISION_H_
2424
#define _ODE_COLLISION_H_
2525

26-
#include "../../include/ode/common.h"
27-
#include "../../include/ode/collision_space.h"
28-
#include "../../include/ode/contact.h"
26+
#include <ode/common.h>
27+
#include <ode/collision_space.h>
28+
#include <ode/contact.h>
2929

3030
#ifdef __cplusplus
3131
extern "C" {

‎Externals/ode/include/ode/collision_space.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef _ODE_COLLISION_SPACE_H_
2424
#define _ODE_COLLISION_SPACE_H_
2525

26-
#include "../../include/ode/common.h"
26+
#include <ode/common.h>
2727

2828
#ifdef __cplusplus
2929
extern "C" {

‎Externals/ode/include/ode/common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#ifndef _ODE_COMMON_H_
2424
#define _ODE_COMMON_H_
2525

26-
#include "config.h"
27-
#include "error.h"
26+
#include <ode/config.h>
27+
#include <ode/error.h>
2828

2929
#ifdef __cplusplus
3030
extern "C" {

‎Externals/ode/include/ode/contact.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef _ODE_CONTACT_H_
2424
#define _ODE_CONTACT_H_
2525

26-
#include "common.h"
26+
#include <ode/common.h>
2727

2828
#ifdef __cplusplus
2929
extern "C" {

‎Externals/ode/include/ode/error.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#ifndef _ODE_ERROR_H_
2626
#define _ODE_ERROR_H_
2727

28-
#include "config.h"
28+
#include <ode/config.h>
2929

3030
#ifdef __cplusplus
3131
extern "C" {
@@ -54,9 +54,7 @@ dMessageFunction *dGetMessageHandler();
5454
void _cdecl dError (int num, const char *msg, ...);
5555
void _cdecl dDebug (int num, const char *msg, ...);
5656
void _cdecl dMessage (int num, const char *msg, ...);
57-
//#define dError(a,b)
58-
//#define dDebug(a,b)
59-
//#define dMessage(a,b)
57+
6058

6159
#ifdef __cplusplus
6260
}

‎Externals/ode/include/ode/export-dif.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef _ODE_EXPORT_DIF_
2424
#define _ODE_EXPORT_DIF_
2525

26-
#include "common.h"
26+
#include <ode/common.h>
2727

2828

2929
void dWorldExportDIF (dWorldID w, FILE *file, const char *world_name);

‎Externals/ode/include/ode/mass.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef _ODE_MASS_H_
2424
#define _ODE_MASS_H_
2525

26-
#include "common.h"
26+
#include <ode/common.h>
2727

2828
#ifdef __cplusplus
2929
extern "C" {

‎Externals/ode/include/ode/matrix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#ifndef _ODE_MATRIX_H_
2626
#define _ODE_MATRIX_H_
2727

28-
#include "common.h"
28+
#include <ode/common.h>
2929

3030

3131
#ifdef __cplusplus

‎Externals/ode/include/ode/memory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#ifndef _ODE_MEMORY_H_
2626
#define _ODE_MEMORY_H_
2727

28-
#include "config.h"
28+
#include "ode/config.h"
2929

3030
#ifdef __cplusplus
3131
extern "C" {

‎Externals/ode/include/ode/misc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#ifndef _ODE_MISC_H_
2626
#define _ODE_MISC_H_
2727

28-
#include "common.h"
28+
#include <ode/common.h>
2929

3030

3131
#ifdef __cplusplus

‎Externals/ode/include/ode/objects.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#ifndef _ODE_OBJECTS_H_
2424
#define _ODE_OBJECTS_H_
2525

26-
#include "common.h"
27-
#include "mass.h"
28-
#include "contact.h"
26+
#include <ode/common.h>
27+
#include <ode/mass.h>
28+
#include <ode/contact.h>
2929

3030
#ifdef __cplusplus
3131
extern "C" {
@@ -94,12 +94,12 @@ void dBodySetAutoDisableDefaults (dBodyID);
9494

9595
/* bodies */
9696

97-
dBodyID dBodyCreate (dWorldID);
98-
void dBodyDestroy (dBodyID);
99-
void dWorldAddBody (dWorldID,dBodyID);
100-
void dWorldAddJoint (dWorldID,dJointID);
101-
void dWorldRemoveBody (dWorldID,dBodyID);
102-
void dWorldRemoveJoint (dWorldID,dJointID);
97+
dBodyID dBodyCreate (dWorldID);
98+
void dBodyDestroy (dBodyID);
99+
void dWorldAddBody (dWorldID,dBodyID);
100+
void dWorldAddJoint (dWorldID,dJointID);
101+
void dWorldRemoveBody (dWorldID,dBodyID);
102+
void dWorldRemoveJoint (dWorldID,dJointID);
103103

104104
void dBodySetData (dBodyID, void *data);
105105
void *dBodyGetData (dBodyID);
@@ -213,7 +213,7 @@ void dJointSetUniversalAxis2 (dJointID, dReal x, dReal y, dReal z);
213213
void dJointSetUniversalParam (dJointID, int parameter, dReal value);
214214
void dJointAddUniversalTorques(dJointID joint, dReal torque1, dReal torque2);
215215
void dJointSetFixed (dJointID);
216-
void dJointSetFixedQuaternionPos (dJointID joint,dQuaternion quaternion,dReal* pos);
216+
void dJointSetFixedQuaternionPos (dJointID joint, dQuaternion quaternion, dReal* pos);
217217
void dJointSetAMotorNumAxes (dJointID, int num);
218218
void dJointSetAMotorAxis (dJointID, int anum, int rel,
219219
dReal x, dReal y, dReal z);

‎Externals/ode/include/ode/ode.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@
2525

2626
/* include *everything* here */
2727

28-
#include "config.h"
29-
#include "compatibility.h"
30-
#include "common.h"
31-
#include "contact.h"
32-
#include "error.h"
33-
#include "memory.h"
34-
#include "odemath.h"
35-
#include "matrix.h"
36-
#include "timer.h"
37-
#include "rotation.h"
38-
#include "mass.h"
39-
#include "misc.h"
40-
#include "objects.h"
41-
#include "odecpp.h"
42-
#include "collision_space.h"
43-
#include "collision.h"
44-
#include "odecpp_collision.h"
45-
#include "export-dif.h"
28+
#include <ode/config.h>
29+
#include <ode/compatibility.h>
30+
#include <ode/common.h>
31+
#include <ode/contact.h>
32+
#include <ode/error.h>
33+
#include <ode/memory.h>
34+
#include <ode/odemath.h>
35+
#include <ode/matrix.h>
36+
#include <ode/timer.h>
37+
#include <ode/rotation.h>
38+
#include <ode/mass.h>
39+
#include <ode/misc.h>
40+
#include <ode/objects.h>
41+
#include <ode/odecpp.h>
42+
#include <ode/collision_space.h>
43+
#include <ode/collision.h>
44+
#include <ode/odecpp_collision.h>
45+
#include <ode/export-dif.h>
4646

4747
#endif

‎Externals/ode/include/ode/odecpp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define _ODE_ODECPP_H_
2828
#ifdef __cplusplus
2929

30-
#include "error.h"
30+
#include <ode/error.h>
3131

3232

3333
class dWorld {

‎Externals/ode/include/ode/odecpp_collision.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define _ODE_ODECPP_COLLISION_H_
2828
#ifdef __cplusplus
2929

30-
#include "../../include/ode/error.h"
30+
#include <ode/error.h>
3131

3232

3333
class dGeom {

‎Externals/ode/include/ode/odemath.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef _ODE_ODEMATH_H_
2424
#define _ODE_ODEMATH_H_
2525

26-
#include "common.h"
26+
#include <ode/common.h>
2727

2828
#ifdef __GNUC__
2929
#define PURE_INLINE extern inline
@@ -219,8 +219,8 @@ extern "C" {
219219
/*
220220
* normalize 3x1 and 4x1 vectors (i.e. scale them to unit length)
221221
*/
222-
void dNormalize3_slow (dVector3 a);
223-
void dNormalize4 (dVector4 a);
222+
void dNormalize3_slow (dVector3 a);
223+
void dNormalize4 (dVector4 a);
224224

225225
__forceinline void dNormalize3 (dVector3 a)
226226
{

‎Externals/ode/include/ode/rotation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#ifndef _ODE_ROTATION_H_
2424
#define _ODE_ROTATION_H_
2525

26-
#include "common.h"
27-
#include "compatibility.h"
26+
#include <ode/common.h>
27+
#include <ode/compatibility.h>
2828

2929
#ifdef __cplusplus
3030
extern "C" {

‎Externals/ode/include/ode/timer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#ifndef _ODE_TIMER_H_
2424
#define _ODE_TIMER_H_
2525

26-
#include "config.h"
26+
#include <ode/config.h>
2727

2828
#ifdef __cplusplus
2929
extern "C" {

‎Externals/ode/ode/src/array.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#ifndef _ODE_ARRAY_H_
4040
#define _ODE_ARRAY_H_
4141

42-
#include "../../include/ode/config.h"
42+
#include <ode/config.h>
4343

4444

4545
// this base class has no constructors or destructor, for your convenience.

‎Externals/ode/ode/src/collision_kernel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ internal data structures and functions for collision detection.
2929
#ifndef _ODE_COLLISION_KERNEL_H_
3030
#define _ODE_COLLISION_KERNEL_H_
3131

32-
#include "../../include/ode/common.h"
33-
#include "../../include/ode/contact.h"
34-
#include "../../include/ode/collision.h"
32+
#include <ode/common.h>
33+
#include <ode/contact.h>
34+
#include <ode/collision.h>
3535
#include "objects.h"
3636

3737
//****************************************************************************

‎Externals/ode/ode/src/collision_std.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ the standard ODE geometry primitives.
2929
#ifndef _ODE_COLLISION_STD_H_
3030
#define _ODE_COLLISION_STD_H_
3131

32-
#include "../../include/ode/common.h"
32+
#include <ode/common.h>
3333
#include "collision_kernel.h"
3434

3535

‎Externals/ode/ode/src/error.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ extern "C" dMessageFunction *dGetMessageHandler()
6666
}
6767

6868

69-
7069
static void printMessage (int num, const char *msg1, const char *msg2,
7170
va_list ap)
7271
{

‎Externals/ode/ode/src/joint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828

2929
#include "objects.h"
30-
#include "../../include/ode/contact.h"
30+
#include <ode/contact.h>
3131
#include "obstack.h"
3232

3333

‎Externals/ode/ode/src/memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <ode/config.h>
2424
#include <ode/memory.h>
2525
#include <ode/error.h>
26-
26+
2727

2828
static dAllocFunction *allocfn = 0;
2929
static dReallocFunction *reallocfn = 0;

‎Externals/ode/ode/src/objects.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#ifndef _ODE_OBJECT_H_
2727
#define _ODE_OBJECT_H_
2828

29-
#include "../../include/ode/common.h"
30-
#include "../../include/ode/memory.h"
31-
#include "../../include/ode/mass.h"
29+
#include <ode/common.h>
30+
#include <ode/memory.h>
31+
#include <ode/mass.h>
3232
#include "array.h"
3333

3434

@@ -76,7 +76,7 @@ struct dxAutoDisable {
7676
// quick-step parameters
7777
struct dxQuickStepParameters {
7878
int num_iterations; // number of SOR iterations to perform
79-
dReal w; // the SOR over-relaxation parameter
79+
dReal w; // the SOR over-relaxation parameter
8080
};
8181

8282

@@ -98,7 +98,7 @@ struct dxBody : public dObject {
9898
dQuaternion q; // orientation quaternion
9999
dMatrix3 R; // rotation matrix, always corresponds to q
100100
dVector3 lvel,avel; // linear and angular velocity of POR
101-
dVector3 facc,tacc; // force and torque accululators
101+
dVector3 facc,tacc; // force and torque accumulators
102102
dVector3 finite_rot_axis; // finite rotation axis, unit length or 0=none
103103

104104
// auto-disable information

‎Externals/ode/ode/src/obstack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// macros and constants
3030

3131
#define ROUND_UP_OFFSET_TO_EFFICIENT_SIZE(arena,ofs) \
32-
ofs = (unsigned int) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) );
32+
ofs = (size_t) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) );
3333

3434
#define MAX_ALLOC_SIZE \
3535
((size_t)(dOBSTACK_ARENA_SIZE - sizeof (Arena) - EFFICIENT_ALIGNMENT + 1))

‎Externals/ode/ode/src/step.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "lcp.h"
3232
#include "util.h"
3333

34-
3534
//****************************************************************************
3635
// misc defines
3736

0 commit comments

Comments
 (0)