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

unconst the consty constipation

This commit is contained in:
rdb 2010-10-11 19:29:54 +00:00
parent 14e029135c
commit 66f1acc32f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ OdeCollisionEntry() {
// Access: Published
// Description: Returns the first geom in the collision.
////////////////////////////////////////////////////////////////////
INLINE const OdeGeom OdeCollisionEntry::
INLINE OdeGeom OdeCollisionEntry::
get_geom1() const {
return OdeGeom(_geom1);
}
@ -36,7 +36,7 @@ get_geom1() const {
// Access: Published
// Description: Returns the second geom in the collision.
////////////////////////////////////////////////////////////////////
INLINE const OdeGeom OdeCollisionEntry::
INLINE OdeGeom OdeCollisionEntry::
get_geom2() const {
return OdeGeom(_geom2);
}
@ -46,7 +46,7 @@ get_geom2() const {
// Access: Published
// Description: Returns the first body in the collision.
////////////////////////////////////////////////////////////////////
INLINE const OdeBody OdeCollisionEntry::
INLINE OdeBody OdeCollisionEntry::
get_body1() const {
return OdeBody(_body1);
}
@ -56,7 +56,7 @@ get_body1() const {
// Access: Published
// Description: Returns the second body in the collision.
////////////////////////////////////////////////////////////////////
INLINE const OdeBody OdeCollisionEntry::
INLINE OdeBody OdeCollisionEntry::
get_body2() const {
return OdeBody(_body2);
}
@ -66,7 +66,7 @@ get_body2() const {
// Access: Published
// Description: Returns the number of contacts in the collision.
////////////////////////////////////////////////////////////////////
INLINE const size_t OdeCollisionEntry::
INLINE size_t OdeCollisionEntry::
get_num_contacts() const {
return _num_contacts;
}
@ -76,7 +76,7 @@ get_num_contacts() const {
// Access: Published
// Description: Returns the nth contact geom in the collision.
////////////////////////////////////////////////////////////////////
INLINE const OdeContactGeom OdeCollisionEntry::
INLINE OdeContactGeom OdeCollisionEntry::
get_contact_geom(size_t n) const {
nassertr(n >= 0 && n < _num_contacts, OdeContactGeom());
return _contact_geoms[n];
@ -87,7 +87,7 @@ get_contact_geom(size_t n) const {
// Access: Published
// Description: Returns the nth contact geom in the collision.
////////////////////////////////////////////////////////////////////
INLINE const OdeContactGeom OdeCollisionEntry::
INLINE OdeContactGeom OdeCollisionEntry::
operator [] (size_t n) const {
nassertr(n >= 0 && n < _num_contacts, OdeContactGeom());
return _contact_geoms[n];
@ -100,7 +100,7 @@ operator [] (size_t n) const {
// This does exactly the same as
// get_contact_geom(n).get_pos().
////////////////////////////////////////////////////////////////////
INLINE const LPoint3f OdeCollisionEntry::
INLINE LPoint3f OdeCollisionEntry::
get_contact_point(size_t n) const {
nassertr(n >= 0 && n < _num_contacts, LPoint3f::zero());
return _contact_geoms[n].get_pos();

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

@ -31,15 +31,15 @@ class EXPCL_PANDAODE OdeCollisionEntry : public TypedReferenceCount {
PUBLISHED:
virtual ~OdeCollisionEntry();
INLINE const OdeGeom get_geom1() const;
INLINE const OdeGeom get_geom2() const;
INLINE const OdeBody get_body1() const;
INLINE const OdeBody get_body2() const;
INLINE OdeGeom get_geom1() const;
INLINE OdeGeom get_geom2() const;
INLINE OdeBody get_body1() const;
INLINE OdeBody get_body2() const;
INLINE const size_t get_num_contacts() const;
INLINE const LPoint3f get_contact_point(size_t n) const;
INLINE const OdeContactGeom get_contact_geom(size_t n) const;
INLINE const OdeContactGeom operator [] (size_t n) const;
INLINE size_t get_num_contacts() const;
INLINE LPoint3f get_contact_point(size_t n) const;
INLINE OdeContactGeom get_contact_geom(size_t n) const;
INLINE OdeContactGeom operator [] (size_t n) const;
MAKE_SEQ(get_contact_points, get_num_contacts, get_contact_point);
MAKE_SEQ(get_contact_geoms, get_num_contacts, get_contact_geom);