RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compilation errors

This commit is contained in:
David Rose 2007-03-07 05:02:35 +00:00
parent c09c16735a
commit 104f11e29d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/ode/odeWorld.cxx
View File

@ -49,7 +49,7 @@ destroy() {
}
void OdeWorld::
init_surface_table(uint8 num_surfaces)
init_surface_table(PN_uint8 num_surfaces)
{
_surface_table = new dSurfaceParameters[num_surfaces * num_surfaces];
_num_surfaces = num_surfaces;
@ -72,7 +72,7 @@ set_surface(int pos1, int pos2, dSurfaceParameters& entry)
}
dSurfaceParameters& OdeWorld::
get_surface(uint8 surface1, uint8 surface2)
get_surface(PN_uint8 surface1, PN_uint8 surface2)
{
int true_pos = 0;
if(surface1 >= surface2)
@ -87,7 +87,7 @@ get_surface(uint8 surface1, uint8 surface2)
}
void OdeWorld::
set_surface_entry( uint8 pos1, uint8 pos2,
set_surface_entry( PN_uint8 pos1, PN_uint8 pos2,
dReal mu,
dReal bounce,
dReal bounce_vel,

12
panda/src/ode/odeWorld.h
View File

@ -22,8 +22,10 @@
#include "pandabase.h"
#include "typedObject.h"
#include "luse.h"
#include "ode_includes.h"
#include "pmap.h"
#include "numeric_types.h"
class OdeBody;
class OdeJoint;
@ -78,9 +80,9 @@ PUBLISHED:
INLINE void step_fast1(dReal stepsize, int maxiterations);
INLINE int compare_to(const OdeWorld &other) const;
INLINE void init_surface_table(uint8 num_surfaces);
INLINE void init_surface_table(PN_uint8 num_surfaces);
INLINE void assign_surface_body(OdeBody& body, int surface);
INLINE void set_surface_entry(uint8 pos1, uint8 pos2,
INLINE void set_surface_entry(PN_uint8 pos1, PN_uint8 pos2,
dReal mu,
dReal bounce,
dReal bounce_vel,
@ -91,14 +93,14 @@ PUBLISHED:
public:
INLINE dWorldID get_id() const;
INLINE dSurfaceParameters& get_surface(uint8 surface1, uint8 surface2);
INLINE dSurfaceParameters& get_surface(PN_uint8 surface1, PN_uint8 surface2);
INLINE void set_surface(int pos1, int pos2, dSurfaceParameters& entry);
INLINE int get_surface_body(dBodyID id);
private:
dWorldID _id;
dSurfaceParameters *_surface_table;
uint8 _num_surfaces;
PN_uint8 _num_surfaces;
typedef pmap<dBodyID, int> BodySurfaceMap;
BodySurfaceMap _body_surface_map;