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

Fixed typo (marging --> margin).

Browse Source
This commit is contained in:
enn0x 2012-01-11 20:35:45 +00:00
parent 5f9e2152da
commit 9eea663587
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/bullet/bulletBoxShape.cxx
View File

@ -43,23 +43,23 @@ ptr() const {
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: BulletBoxShape::get_half_extents_without_marging // Function: BulletBoxShape::get_half_extents_without_margin
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
LVecBase3 BulletBoxShape:: LVecBase3 BulletBoxShape::
get_half_extents_without_marging() const { get_half_extents_without_margin() const {
return btVector3_to_LVecBase3(_shape->getHalfExtentsWithoutMargin()); return btVector3_to_LVecBase3(_shape->getHalfExtentsWithoutMargin());
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: BulletBoxShape::get_half_extents_with_marging // Function: BulletBoxShape::get_half_extents_with_margin
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
LVecBase3 BulletBoxShape:: LVecBase3 BulletBoxShape::
get_half_extents_with_marging() const { get_half_extents_with_margin() const {
return btVector3_to_LVecBase3(_shape->getHalfExtentsWithMargin()); return btVector3_to_LVecBase3(_shape->getHalfExtentsWithMargin());
} }

4
panda/src/bullet/bulletBoxShape.h
View File

@ -34,8 +34,8 @@ PUBLISHED:
BulletBoxShape(const LVecBase3 &halfExtents); BulletBoxShape(const LVecBase3 &halfExtents);
INLINE ~BulletBoxShape(); INLINE ~BulletBoxShape();
LVecBase3 get_half_extents_without_marging() const; LVecBase3 get_half_extents_without_margin() const;
LVecBase3 get_half_extents_with_marging() const; LVecBase3 get_half_extents_with_margin() const;
static BulletBoxShape *make_from_solid(const CollisionBox *solid); static BulletBoxShape *make_from_solid(const CollisionBox *solid);

8
panda/src/bullet/bulletCylinderShape.I
View File

@ -35,23 +35,23 @@ get_radius() const {
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: BulletCylinderShape::get_half_extents_without_marging // Function: BulletCylinderShape::get_half_extents_without_margin
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE LVecBase3 BulletCylinderShape:: INLINE LVecBase3 BulletCylinderShape::
get_half_extents_without_marging() const { get_half_extents_without_margin() const {
return btVector3_to_LVecBase3(_shape->getHalfExtentsWithoutMargin()); return btVector3_to_LVecBase3(_shape->getHalfExtentsWithoutMargin());
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: BulletCylinderShape::get_half_extents_with_marging // Function: BulletCylinderShape::get_half_extents_with_margin
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE LVecBase3 BulletCylinderShape:: INLINE LVecBase3 BulletCylinderShape::
get_half_extents_with_marging() const { get_half_extents_with_margin() const {
return btVector3_to_LVecBase3(_shape->getHalfExtentsWithMargin()); return btVector3_to_LVecBase3(_shape->getHalfExtentsWithMargin());
} }

4
panda/src/bullet/bulletCylinderShape.h
View File

@ -33,8 +33,8 @@ PUBLISHED:
INLINE ~BulletCylinderShape(); INLINE ~BulletCylinderShape();
INLINE PN_stdfloat get_radius() const; INLINE PN_stdfloat get_radius() const;
INLINE LVecBase3 get_half_extents_without_marging() const; INLINE LVecBase3 get_half_extents_without_margin() const;
INLINE LVecBase3 get_half_extents_with_marging() const; INLINE LVecBase3 get_half_extents_with_margin() const;
public: public:
virtual btCollisionShape *ptr() const; virtual btCollisionShape *ptr() const;