TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up joint function calls to remove redundancy in names

Browse Source
This commit is contained in:
Josh Wilson 2007-02-11 04:38:56 +00:00
parent 50773cd877
commit 1dddb03b95
18 changed files with 146 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
panda/src/ode/odeAMotorJoint.I
View File

@ -17,66 +17,66 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void OdeAMotorJoint:: INLINE void OdeAMotorJoint::
set_a_motor_num_axes(int num) { set_num_axes(int num) {
dJointSetAMotorNumAxes(_id, num); dJointSetAMotorNumAxes(_id, num);
} }
INLINE void OdeAMotorJoint:: INLINE void OdeAMotorJoint::
set_a_motor_axis(int anum, int rel, dReal x, dReal y, dReal z) { set_axis(int anum, int rel, dReal x, dReal y, dReal z) {
dJointSetAMotorAxis(_id, anum, rel, x, y, z); dJointSetAMotorAxis(_id, anum, rel, x, y, z);
} }
INLINE void OdeAMotorJoint:: INLINE void OdeAMotorJoint::
set_a_motor_angle(int anum, dReal angle) { set_angle(int anum, dReal angle) {
dJointSetAMotorAngle(_id, anum, angle); dJointSetAMotorAngle(_id, anum, angle);
} }
INLINE void OdeAMotorJoint:: INLINE void OdeAMotorJoint::
set_a_motor_param(int parameter, dReal value) { set_param(int parameter, dReal value) {
dJointSetAMotorParam(_id, parameter, value); dJointSetAMotorParam(_id, parameter, value);
} }
INLINE void OdeAMotorJoint:: INLINE void OdeAMotorJoint::
set_a_motor_mode(int mode) { set_mode(int mode) {
dJointSetAMotorMode(_id, mode); dJointSetAMotorMode(_id, mode);
} }
INLINE void OdeAMotorJoint:: INLINE void OdeAMotorJoint::
add_a_motor_torques(dReal torque1, dReal torque2, dReal torque3) { add_torques(dReal torque1, dReal torque2, dReal torque3) {
dJointAddAMotorTorques(_id, torque1, torque2, torque3); dJointAddAMotorTorques(_id, torque1, torque2, torque3);
} }
INLINE int OdeAMotorJoint:: INLINE int OdeAMotorJoint::
get_a_motor_num_axes() const { get_num_axes() const {
return dJointGetAMotorNumAxes(_id); return dJointGetAMotorNumAxes(_id);
} }
INLINE void OdeAMotorJoint:: INLINE void OdeAMotorJoint::
get_a_motor_axis(int anum, dVector3 result) const { get_axis(int anum, dVector3 result) const {
return dJointGetAMotorAxis(_id, anum, result); return dJointGetAMotorAxis(_id, anum, result);
} }
INLINE int OdeAMotorJoint:: INLINE int OdeAMotorJoint::
get_a_motor_axis_rel(int anum) const { get_axis_rel(int anum) const {
return dJointGetAMotorAxisRel(_id, anum); return dJointGetAMotorAxisRel(_id, anum);
} }
INLINE dReal OdeAMotorJoint:: INLINE dReal OdeAMotorJoint::
get_a_motor_angle(int anum) const { get_angle(int anum) const {
return dJointGetAMotorAngle(_id, anum); return dJointGetAMotorAngle(_id, anum);
} }
INLINE dReal OdeAMotorJoint:: INLINE dReal OdeAMotorJoint::
get_a_motor_angle_rate(int anum) const { get_angle_rate(int anum) const {
return dJointGetAMotorAngleRate(_id, anum); return dJointGetAMotorAngleRate(_id, anum);
} }
INLINE dReal OdeAMotorJoint:: INLINE dReal OdeAMotorJoint::
get_a_motor_param(int parameter) const { get_param(int parameter) const {
return dJointGetAMotorParam(_id, parameter); return dJointGetAMotorParam(_id, parameter);
} }
INLINE int OdeAMotorJoint:: INLINE int OdeAMotorJoint::
get_a_motor_mode() const { get_mode() const {
return dJointGetAMotorMode(_id); return dJointGetAMotorMode(_id);
} }

26
panda/src/ode/odeAMotorJoint.h
View File

@ -24,20 +24,20 @@ PUBLISHED:
OdeAMotorJoint(OdeWorld &world, OdeJointGroup &joint_group); OdeAMotorJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdeAMotorJoint(); virtual ~OdeAMotorJoint();
INLINE void set_a_motor_num_axes(int num); INLINE void set_num_axes(int num);
INLINE void set_a_motor_axis(int anum, int rel, dReal x, dReal y, dReal z); INLINE void set_axis(int anum, int rel, dReal x, dReal y, dReal z);
INLINE void set_a_motor_angle(int anum, dReal angle); INLINE void set_angle(int anum, dReal angle);
INLINE void set_a_motor_param(int parameter, dReal value); INLINE void set_param(int parameter, dReal value);
INLINE void set_a_motor_mode(int mode); INLINE void set_mode(int mode);
INLINE void add_a_motor_torques(dReal torque1, dReal torque2, dReal torque3); INLINE void add_torques(dReal torque1, dReal torque2, dReal torque3);
INLINE int get_a_motor_num_axes() const; INLINE int get_num_axes() const;
INLINE void get_a_motor_axis(int anum, dVector3 result) const; INLINE void get_axis(int anum, dVector3 result) const;
INLINE int get_a_motor_axis_rel(int anum) const; INLINE int get_axis_rel(int anum) const;
INLINE dReal get_a_motor_angle(int anum) const; INLINE dReal get_angle(int anum) const;
INLINE dReal get_a_motor_angle_rate(int anum) const; INLINE dReal get_angle_rate(int anum) const;
INLINE dReal get_a_motor_param(int parameter) const; INLINE dReal get_param(int parameter) const;
INLINE int get_a_motor_mode() const; INLINE int get_mode() const;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

8
panda/src/ode/odeBallJoint.I
View File

@ -17,21 +17,21 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void OdeBallJoint:: INLINE void OdeBallJoint::
set_ball_anchor(dReal x, dReal y, dReal z) { set_anchor(dReal x, dReal y, dReal z) {
dJointSetBallAnchor(_id, x, y, z); dJointSetBallAnchor(_id, x, y, z);
} }
INLINE void OdeBallJoint:: INLINE void OdeBallJoint::
set_ball_anchor2(dReal x, dReal y, dReal z) { set_anchor2(dReal x, dReal y, dReal z) {
dJointSetBallAnchor2(_id, x, y, z); dJointSetBallAnchor2(_id, x, y, z);
} }
INLINE void OdeBallJoint:: INLINE void OdeBallJoint::
get_ball_anchor(dVector3 result) const { get_anchor(dVector3 result) const {
return dJointGetBallAnchor(_id, result); return dJointGetBallAnchor(_id, result);
} }
INLINE void OdeBallJoint:: INLINE void OdeBallJoint::
get_ball_anchor2(dVector3 result) const { get_anchor2(dVector3 result) const {
return dJointGetBallAnchor2(_id, result); return dJointGetBallAnchor2(_id, result);
} }

8
panda/src/ode/odeBallJoint.h
View File

@ -24,11 +24,11 @@ PUBLISHED:
OdeBallJoint(OdeWorld &world, OdeJointGroup &joint_group); OdeBallJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdeBallJoint(); virtual ~OdeBallJoint();
INLINE void set_ball_anchor(dReal x, dReal y, dReal z); INLINE void set_anchor(dReal x, dReal y, dReal z);
INLINE void set_ball_anchor2(dReal x, dReal y, dReal z); INLINE void set_anchor2(dReal x, dReal y, dReal z);
INLINE void get_ball_anchor(dVector3 result) const; INLINE void get_anchor(dVector3 result) const;
INLINE void get_ball_anchor2(dVector3 result) const; INLINE void get_anchor2(dVector3 result) const;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

2
panda/src/ode/odeFixedJoint.I
View File

@ -17,6 +17,6 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void OdeFixedJoint:: INLINE void OdeFixedJoint::
set_fixed() { set() {
dJointSetFixed(_id); dJointSetFixed(_id);
} }

2
panda/src/ode/odeFixedJoint.h
View File

@ -24,7 +24,7 @@ PUBLISHED:
OdeFixedJoint(OdeWorld &world, OdeJointGroup &joint_group); OdeFixedJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdeFixedJoint(); virtual ~OdeFixedJoint();
INLINE void set_fixed(); INLINE void set();
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

26
panda/src/ode/odeHinge2Joint.I
View File

@ -18,66 +18,66 @@
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
set_hinge2_anchor(dReal x, dReal y, dReal z) { set_anchor(dReal x, dReal y, dReal z) {
dJointSetHinge2Anchor(_id, x, y, z); dJointSetHinge2Anchor(_id, x, y, z);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
set_hinge2_axis1(dReal x, dReal y, dReal z) { set_axis1(dReal x, dReal y, dReal z) {
dJointSetHinge2Axis1(_id, x, y, z); dJointSetHinge2Axis1(_id, x, y, z);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
set_hinge2_axis2(dReal x, dReal y, dReal z) { set_axis2(dReal x, dReal y, dReal z) {
dJointSetHinge2Axis2(_id, x, y, z); dJointSetHinge2Axis2(_id, x, y, z);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
set_hinge2_param(int parameter, dReal value) { set_param(int parameter, dReal value) {
dJointSetHinge2Param(_id, parameter, value); dJointSetHinge2Param(_id, parameter, value);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
add_hinge2_torques(dReal torque1, dReal torque2) { add_torques(dReal torque1, dReal torque2) {
dJointAddHinge2Torques(_id, torque1, torque2); dJointAddHinge2Torques(_id, torque1, torque2);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
get_hinge2_anchor(dVector3 result) const { get_anchor(dVector3 result) const {
return dJointGetHinge2Anchor(_id, result); return dJointGetHinge2Anchor(_id, result);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
get_hinge2_anchor2(dVector3 result) const { get_anchor2(dVector3 result) const {
return dJointGetHinge2Anchor2(_id, result); return dJointGetHinge2Anchor2(_id, result);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
get_hinge2_axis1(dVector3 result) const { get_axis1(dVector3 result) const {
return dJointGetHinge2Axis1(_id, result); return dJointGetHinge2Axis1(_id, result);
} }
INLINE void OdeHinge2Joint:: INLINE void OdeHinge2Joint::
get_hinge2_axis2(dVector3 result) const { get_axis2(dVector3 result) const {
return dJointGetHinge2Axis2(_id, result); return dJointGetHinge2Axis2(_id, result);
} }
INLINE dReal OdeHinge2Joint:: INLINE dReal OdeHinge2Joint::
get_hinge2_param(int parameter) const { get_param(int parameter) const {
return dJointGetHinge2Param(_id, parameter); return dJointGetHinge2Param(_id, parameter);
} }
INLINE dReal OdeHinge2Joint:: INLINE dReal OdeHinge2Joint::
get_hinge2_angle1() const { get_angle1() const {
return dJointGetHinge2Angle1(_id); return dJointGetHinge2Angle1(_id);
} }
INLINE dReal OdeHinge2Joint:: INLINE dReal OdeHinge2Joint::
get_hinge2_angle1_rate() const { get_angle1_rate() const {
return dJointGetHinge2Angle1Rate(_id); return dJointGetHinge2Angle1Rate(_id);
} }
INLINE dReal OdeHinge2Joint:: INLINE dReal OdeHinge2Joint::
get_hinge2_angle2_rate() const { get_angle2_rate() const {
return dJointGetHinge2Angle2Rate(_id); return dJointGetHinge2Angle2Rate(_id);
} }

26
panda/src/ode/odeHinge2Joint.h
View File

@ -24,20 +24,20 @@ PUBLISHED:
OdeHinge2Joint(OdeWorld &world); OdeHinge2Joint(OdeWorld &world);
virtual ~OdeHinge2Joint(); virtual ~OdeHinge2Joint();
INLINE void set_hinge2_anchor(dReal x, dReal y, dReal z); INLINE void set_anchor(dReal x, dReal y, dReal z);
INLINE void set_hinge2_axis1(dReal x, dReal y, dReal z); INLINE void set_axis1(dReal x, dReal y, dReal z);
INLINE void set_hinge2_axis2(dReal x, dReal y, dReal z); INLINE void set_axis2(dReal x, dReal y, dReal z);
INLINE void set_hinge2_param(int parameter, dReal value); INLINE void set_param(int parameter, dReal value);
INLINE void add_hinge2_torques(dReal torque1, dReal torque2); INLINE void add_torques(dReal torque1, dReal torque2);
INLINE void get_hinge2_anchor(dVector3 result) const; INLINE void get_anchor(dVector3 result) const;
INLINE void get_hinge2_anchor2(dVector3 result) const; INLINE void get_anchor2(dVector3 result) const;
INLINE void get_hinge2_axis1(dVector3 result) const; INLINE void get_axis1(dVector3 result) const;
INLINE void get_hinge2_axis2(dVector3 result) const; INLINE void get_axis2(dVector3 result) const;
INLINE dReal get_hinge2_param(int parameter) const; INLINE dReal get_param(int parameter) const;
INLINE dReal get_hinge2_angle1() const; INLINE dReal get_angle1() const;
INLINE dReal get_hinge2_angle1_rate() const; INLINE dReal get_angle1_rate() const;
INLINE dReal get_hinge2_angle2_rate() const; INLINE dReal get_angle2_rate() const;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

22
panda/src/ode/odeHingeJoint.I
View File

@ -17,57 +17,57 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
set_hinge_anchor(dReal x, dReal y, dReal z) { set_anchor(dReal x, dReal y, dReal z) {
dJointSetHingeAnchor(_id, x, y, z); dJointSetHingeAnchor(_id, x, y, z);
} }
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
set_hinge_anchor_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) { set_anchor_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) {
dJointSetHingeAnchorDelta(_id, x, y, z, ax, ay, az); dJointSetHingeAnchorDelta(_id, x, y, z, ax, ay, az);
} }
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
set_hinge_axis(dReal x, dReal y, dReal z) { set_axis(dReal x, dReal y, dReal z) {
dJointSetHingeAxis(_id, x, y, z); dJointSetHingeAxis(_id, x, y, z);
} }
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
set_hinge_param(int parameter, dReal value) { set_param(int parameter, dReal value) {
dJointSetHingeParam(_id, parameter, value); dJointSetHingeParam(_id, parameter, value);
} }
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
add_hinge_torque(dReal torque) { add_torque(dReal torque) {
dJointAddHingeTorque(_id, torque); dJointAddHingeTorque(_id, torque);
} }
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
get_hinge_anchor(dVector3 result) const { get_anchor(dVector3 result) const {
return dJointGetHingeAnchor(_id, result); return dJointGetHingeAnchor(_id, result);
} }
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
get_hinge_anchor2(dVector3 result) const { get_anchor2(dVector3 result) const {
return dJointGetHingeAnchor2(_id, result); return dJointGetHingeAnchor2(_id, result);
} }
INLINE void OdeHingeJoint:: INLINE void OdeHingeJoint::
get_hinge_axis(dVector3 result) const { get_axis(dVector3 result) const {
return dJointGetHingeAxis(_id, result); return dJointGetHingeAxis(_id, result);
} }
INLINE dReal OdeHingeJoint:: INLINE dReal OdeHingeJoint::
get_hinge_param(int parameter) const { get_param(int parameter) const {
return dJointGetHingeParam(_id, parameter); return dJointGetHingeParam(_id, parameter);
} }
INLINE dReal OdeHingeJoint:: INLINE dReal OdeHingeJoint::
get_hinge_angle() const { get_angle() const {
return dJointGetHingeAngle(_id); return dJointGetHingeAngle(_id);
} }
INLINE dReal OdeHingeJoint:: INLINE dReal OdeHingeJoint::
get_hinge_angle_rate() const { get_angle_rate() const {
return dJointGetHingeAngleRate(_id); return dJointGetHingeAngleRate(_id);
} }

22
panda/src/ode/odeHingeJoint.h
View File

@ -23,18 +23,18 @@ PUBLISHED:
OdeHingeJoint(OdeWorld &world, OdeJointGroup &joint_group); OdeHingeJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdeHingeJoint(); virtual ~OdeHingeJoint();
INLINE void set_hinge_anchor(dReal x, dReal y, dReal z); INLINE void set_anchor(dReal x, dReal y, dReal z);
INLINE void set_hinge_anchor_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az); INLINE void set_anchor_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
INLINE void set_hinge_axis(dReal x, dReal y, dReal z); INLINE void set_axis(dReal x, dReal y, dReal z);
INLINE void set_hinge_param(int parameter, dReal value); INLINE void set_param(int parameter, dReal value);
INLINE void add_hinge_torque(dReal torque); INLINE void add_torque(dReal torque);
INLINE void get_hinge_anchor(dVector3 result) const; INLINE void get_anchor(dVector3 result) const;
INLINE void get_hinge_anchor2(dVector3 result) const; INLINE void get_anchor2(dVector3 result) const;
INLINE void get_hinge_axis(dVector3 result) const; INLINE void get_axis(dVector3 result) const;
INLINE dReal get_hinge_param(int parameter) const; INLINE dReal get_param(int parameter) const;
INLINE dReal get_hinge_angle() const; INLINE dReal get_angle() const;
INLINE dReal get_hinge_angle_rate() const; INLINE dReal get_angle_rate() const;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

12
panda/src/ode/odeLMotorJoint.I
View File

@ -18,32 +18,32 @@
INLINE void OdeLMotorJoint:: INLINE void OdeLMotorJoint::
set_l_motor_num_axes(int num) { set_num_axes(int num) {
dJointSetLMotorNumAxes(_id, num); dJointSetLMotorNumAxes(_id, num);
} }
INLINE void OdeLMotorJoint:: INLINE void OdeLMotorJoint::
set_l_motor_axis(int anum, int rel, dReal x, dReal y, dReal z) { set_axis(int anum, int rel, dReal x, dReal y, dReal z) {
dJointSetLMotorAxis(_id, anum, rel, x, y, z); dJointSetLMotorAxis(_id, anum, rel, x, y, z);
} }
INLINE void OdeLMotorJoint:: INLINE void OdeLMotorJoint::
set_l_motor_param(int parameter, dReal value) { set_param(int parameter, dReal value) {
dJointSetLMotorParam(_id, parameter, value); dJointSetLMotorParam(_id, parameter, value);
} }
INLINE int OdeLMotorJoint:: INLINE int OdeLMotorJoint::
get_l_motor_num_axes() const { get_num_axes() const {
return dJointGetLMotorNumAxes(_id); return dJointGetLMotorNumAxes(_id);
} }
INLINE void OdeLMotorJoint:: INLINE void OdeLMotorJoint::
get_l_motor_axis(int anum, dVector3 result) const { get_axis(int anum, dVector3 result) const {
return dJointGetLMotorAxis(_id, anum, result); return dJointGetLMotorAxis(_id, anum, result);
} }
INLINE dReal OdeLMotorJoint:: INLINE dReal OdeLMotorJoint::
get_l_motor_param(int parameter) const { get_param(int parameter) const {
return dJointGetLMotorParam(_id, parameter); return dJointGetLMotorParam(_id, parameter);
} }

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

@ -23,13 +23,13 @@ PUBLISHED:
OdeLMotorJoint(OdeWorld &world, OdeJointGroup &joint_group); OdeLMotorJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdeLMotorJoint(); virtual ~OdeLMotorJoint();
INLINE void set_l_motor_num_axes(int num); INLINE void set_num_axes(int num);
INLINE void set_l_motor_axis(int anum, int rel, dReal x, dReal y, dReal z); INLINE void set_axis(int anum, int rel, dReal x, dReal y, dReal z);
INLINE void set_l_motor_param(int parameter, dReal value); INLINE void set_param(int parameter, dReal value);
INLINE int get_l_motor_num_axes() const; INLINE int get_num_axes() const;
INLINE void get_l_motor_axis(int anum, dVector3 result) const; INLINE void get_axis(int anum, dVector3 result) const;
INLINE dReal get_l_motor_param(int parameter) const; INLINE dReal get_param(int parameter) const;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

6
panda/src/ode/odePlane2dJoint.I
View File

@ -17,16 +17,16 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void OdePlane2dJoint:: INLINE void OdePlane2dJoint::
set_plane2_dxparam(int parameter, dReal value) { set_x_param(int parameter, dReal value) {
dJointSetPlane2DXParam(_id, parameter, value); dJointSetPlane2DXParam(_id, parameter, value);
} }
INLINE void OdePlane2dJoint:: INLINE void OdePlane2dJoint::
set_plane2_dyparam(int parameter, dReal value) { set_y_param(int parameter, dReal value) {
dJointSetPlane2DYParam(_id, parameter, value); dJointSetPlane2DYParam(_id, parameter, value);
} }
INLINE void OdePlane2dJoint:: INLINE void OdePlane2dJoint::
set_plane2_dangle_param(int parameter, dReal value) { set_angle_param(int parameter, dReal value) {
dJointSetPlane2DAngleParam(_id, parameter, value); dJointSetPlane2DAngleParam(_id, parameter, value);
} }

6
panda/src/ode/odePlane2dJoint.h
View File

@ -23,9 +23,9 @@ PUBLISHED:
OdePlane2dJoint(OdeWorld &world, OdeJointGroup &joint_group); OdePlane2dJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdePlane2dJoint(); virtual ~OdePlane2dJoint();
INLINE void set_plane2_dxparam(int parameter, dReal value); INLINE void set_x_param(int parameter, dReal value);
INLINE void set_plane2_dyparam(int parameter, dReal value); INLINE void set_y_param(int parameter, dReal value);
INLINE void set_plane2_dangle_param(int parameter, dReal value); INLINE void set_angle_param(int parameter, dReal value);
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

16
panda/src/ode/odeSliderJoint.I
View File

@ -17,41 +17,41 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void OdeSliderJoint:: INLINE void OdeSliderJoint::
set_slider_axis(dReal x, dReal y, dReal z) { set_axis(dReal x, dReal y, dReal z) {
dJointSetSliderAxis(_id, x, y, z); dJointSetSliderAxis(_id, x, y, z);
} }
INLINE void OdeSliderJoint:: INLINE void OdeSliderJoint::
set_slider_axis_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) { set_axis_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az) {
dJointSetSliderAxisDelta(_id, x, y, z, ax, ay, az); dJointSetSliderAxisDelta(_id, x, y, z, ax, ay, az);
} }
INLINE void OdeSliderJoint:: INLINE void OdeSliderJoint::
set_slider_param(int parameter, dReal value) { set_param(int parameter, dReal value) {
dJointSetSliderParam(_id, parameter, value); dJointSetSliderParam(_id, parameter, value);
} }
INLINE void OdeSliderJoint:: INLINE void OdeSliderJoint::
add_slider_force(dReal force) { add_force(dReal force) {
dJointAddSliderForce(_id, force); dJointAddSliderForce(_id, force);
} }
INLINE dReal OdeSliderJoint:: INLINE dReal OdeSliderJoint::
get_slider_position() const { get_position() const {
return dJointGetSliderPosition(_id); return dJointGetSliderPosition(_id);
} }
INLINE dReal OdeSliderJoint:: INLINE dReal OdeSliderJoint::
get_slider_position_rate() const { get_position_rate() const {
return dJointGetSliderPositionRate(_id); return dJointGetSliderPositionRate(_id);
} }
INLINE void OdeSliderJoint:: INLINE void OdeSliderJoint::
get_slider_axis(dVector3 result) const { get_axis(dVector3 result) const {
return dJointGetSliderAxis(_id, result); return dJointGetSliderAxis(_id, result);
} }
INLINE dReal OdeSliderJoint:: INLINE dReal OdeSliderJoint::
get_slider_param(int parameter) const { get_param(int parameter) const {
return dJointGetSliderParam(_id, parameter); return dJointGetSliderParam(_id, parameter);
} }

16
panda/src/ode/odeSliderJoint.h
View File

@ -23,15 +23,15 @@ PUBLISHED:
OdeSliderJoint(OdeWorld &world, OdeJointGroup &joint_group); OdeSliderJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdeSliderJoint(); virtual ~OdeSliderJoint();
INLINE void set_slider_axis(dReal x, dReal y, dReal z); INLINE void set_axis(dReal x, dReal y, dReal z);
INLINE void set_slider_axis_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az); INLINE void set_axis_delta(dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
INLINE void set_slider_param(int parameter, dReal value); INLINE void set_param(int parameter, dReal value);
INLINE void add_slider_force(dReal force); INLINE void add_force(dReal force);
INLINE dReal get_slider_position() const; INLINE dReal get_position() const;
INLINE dReal get_slider_position_rate() const; INLINE dReal get_position_rate() const;
INLINE void get_slider_axis(dVector3 result) const; INLINE void get_axis(dVector3 result) const;
INLINE dReal get_slider_param(int parameter) const; INLINE dReal get_param(int parameter) const;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {

28
panda/src/ode/odeUniversalJoint.I
View File

@ -17,71 +17,71 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
set_universal_anchor(dReal x, dReal y, dReal z) { set_anchor(dReal x, dReal y, dReal z) {
dJointSetUniversalAnchor(_id, x, y, z); dJointSetUniversalAnchor(_id, x, y, z);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
set_universal_axis1(dReal x, dReal y, dReal z) { set_axis1(dReal x, dReal y, dReal z) {
dJointSetUniversalAxis1(_id, x, y, z); dJointSetUniversalAxis1(_id, x, y, z);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
set_universal_axis2(dReal x, dReal y, dReal z) { set_axis2(dReal x, dReal y, dReal z) {
dJointSetUniversalAxis2(_id, x, y, z); dJointSetUniversalAxis2(_id, x, y, z);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
set_universal_param(int parameter, dReal value) { set_param(int parameter, dReal value) {
dJointSetUniversalParam(_id, parameter, value); dJointSetUniversalParam(_id, parameter, value);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
add_universal_torques(dReal torque1, dReal torque2) { add_torques(dReal torque1, dReal torque2) {
dJointAddUniversalTorques(_id, torque1, torque2); dJointAddUniversalTorques(_id, torque1, torque2);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
get_universal_anchor(dVector3 result) const { get_anchor(dVector3 result) const {
return dJointGetUniversalAnchor(_id, result); return dJointGetUniversalAnchor(_id, result);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
get_universal_anchor2(dVector3 result) const { get_anchor2(dVector3 result) const {
return dJointGetUniversalAnchor2(_id, result); return dJointGetUniversalAnchor2(_id, result);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
get_universal_axis1(dVector3 result) const { get_axis1(dVector3 result) const {
return dJointGetUniversalAxis1(_id, result); return dJointGetUniversalAxis1(_id, result);
} }
INLINE void OdeUniversalJoint:: INLINE void OdeUniversalJoint::
get_universal_axis2(dVector3 result) const { get_axis2(dVector3 result) const {
return dJointGetUniversalAxis2(_id, result); return dJointGetUniversalAxis2(_id, result);
} }
INLINE dReal OdeUniversalJoint:: INLINE dReal OdeUniversalJoint::
get_universal_param(int parameter) const { get_param(int parameter) const {
return dJointGetUniversalParam(_id, parameter); return dJointGetUniversalParam(_id, parameter);
} }
INLINE dReal OdeUniversalJoint:: INLINE dReal OdeUniversalJoint::
get_universal_angle1() const { get_angle1() const {
return dJointGetUniversalAngle1(_id); return dJointGetUniversalAngle1(_id);
} }
INLINE dReal OdeUniversalJoint:: INLINE dReal OdeUniversalJoint::
get_universal_angle2() const { get_angle2() const {
return dJointGetUniversalAngle2(_id); return dJointGetUniversalAngle2(_id);
} }
INLINE dReal OdeUniversalJoint:: INLINE dReal OdeUniversalJoint::
get_universal_angle1_rate() const { get_angle1_rate() const {
return dJointGetUniversalAngle1Rate(_id); return dJointGetUniversalAngle1Rate(_id);
} }
INLINE dReal OdeUniversalJoint:: INLINE dReal OdeUniversalJoint::
get_universal_angle2_rate() const { get_angle2_rate() const {
return dJointGetUniversalAngle2Rate(_id); return dJointGetUniversalAngle2Rate(_id);
} }

28
panda/src/ode/odeUniversalJoint.h
View File

@ -24,21 +24,21 @@ PUBLISHED:
OdeUniversalJoint(OdeWorld &world, OdeJointGroup &joint_group); OdeUniversalJoint(OdeWorld &world, OdeJointGroup &joint_group);
virtual ~OdeUniversalJoint(); virtual ~OdeUniversalJoint();
INLINE void set_universal_anchor(dReal x, dReal y, dReal z); INLINE void set_anchor(dReal x, dReal y, dReal z);
INLINE void set_universal_axis1(dReal x, dReal y, dReal z); INLINE void set_axis1(dReal x, dReal y, dReal z);
INLINE void set_universal_axis2(dReal x, dReal y, dReal z); INLINE void set_axis2(dReal x, dReal y, dReal z);
INLINE void set_universal_param(int parameter, dReal value); INLINE void set_param(int parameter, dReal value);
INLINE void add_universal_torques(dReal torque1, dReal torque2); INLINE void add_torques(dReal torque1, dReal torque2);
INLINE void get_universal_anchor(dVector3 result) const; INLINE void get_anchor(dVector3 result) const;
INLINE void get_universal_anchor2(dVector3 result) const; INLINE void get_anchor2(dVector3 result) const;
INLINE void get_universal_axis1(dVector3 result) const; INLINE void get_axis1(dVector3 result) const;
INLINE void get_universal_axis2(dVector3 result) const; INLINE void get_axis2(dVector3 result) const;
INLINE dReal get_universal_param(int parameter) const; INLINE dReal get_param(int parameter) const;
INLINE dReal get_universal_angle1() const; INLINE dReal get_angle1() const;
INLINE dReal get_universal_angle2() const; INLINE dReal get_angle2() const;
INLINE dReal get_universal_angle1_rate() const; INLINE dReal get_angle1_rate() const;
INLINE dReal get_universal_angle2_rate() const; INLINE dReal get_angle2_rate() const;
public: public:
static TypeHandle get_class_type() { static TypeHandle get_class_type() {