From 96061636a2cd53aa885d6c5b0264e0cd19a6e576 Mon Sep 17 00:00:00 2001 From: enn0x Date: Sat, 20 Aug 2011 20:40:02 +0000 Subject: [PATCH] Minor renaming for upper/lower limits. --- panda/src/bullet/bulletGenericConstraint.cxx | 16 ++++++++-------- panda/src/bullet/bulletGenericConstraint.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/panda/src/bullet/bulletGenericConstraint.cxx b/panda/src/bullet/bulletGenericConstraint.cxx index fd99327e61..01c6a4b5c9 100644 --- a/panda/src/bullet/bulletGenericConstraint.cxx +++ b/panda/src/bullet/bulletGenericConstraint.cxx @@ -66,48 +66,48 @@ ptr() const { } //////////////////////////////////////////////////////////////////// -// Function: BulletGenericConstraint::set_linear_lower_limit +// Function: BulletGenericConstraint::set_lower_linear_limit // Access: Published // Description: //////////////////////////////////////////////////////////////////// void BulletGenericConstraint:: -set_linear_lower_limit(const LPoint3f &limit) { +set_lower_linear_limit(const LPoint3f &limit) { nassertv(!limit.is_nan()); _constraint->setLinearLowerLimit(LVecBase3f_to_btVector3(limit)); } //////////////////////////////////////////////////////////////////// -// Function: BulletGenericConstraint::set_linear_upper_limit +// Function: BulletGenericConstraint::set_upper_linear_limit // Access: Published // Description: //////////////////////////////////////////////////////////////////// void BulletGenericConstraint:: -set_linear_upper_limit(const LPoint3f &limit) { +set_upper_linear_limit(const LPoint3f &limit) { nassertv(!limit.is_nan()); _constraint->setLinearUpperLimit(LVecBase3f_to_btVector3(limit)); } //////////////////////////////////////////////////////////////////// -// Function: BulletGenericConstraint::set_angular_lower_limit +// Function: BulletGenericConstraint::set_lower_angular_limit // Access: Published // Description: //////////////////////////////////////////////////////////////////// void BulletGenericConstraint:: -set_angular_lower_limit(const LVector3f &limit) { +set_lower_angular_limit(const LVector3f &limit) { nassertv(!limit.is_nan()); _constraint->setAngularLowerLimit(LVecBase3f_to_btVector3(limit)); } //////////////////////////////////////////////////////////////////// -// Function: BulletGenericConstraint::set_angular_upper_limit +// Function: BulletGenericConstraint::set_upper_angular_limit // Access: Published // Description: //////////////////////////////////////////////////////////////////// void BulletGenericConstraint:: -set_angular_upper_limit(const LVector3f &limit) { +set_upper_angular_limit(const LVector3f &limit) { nassertv(!limit.is_nan()); _constraint->setAngularUpperLimit(LVecBase3f_to_btVector3(limit)); diff --git a/panda/src/bullet/bulletGenericConstraint.h b/panda/src/bullet/bulletGenericConstraint.h index 8d9b1933cf..6d72f42cca 100644 --- a/panda/src/bullet/bulletGenericConstraint.h +++ b/panda/src/bullet/bulletGenericConstraint.h @@ -44,10 +44,10 @@ PUBLISHED: bool use_frame_a); INLINE ~BulletGenericConstraint(); - void set_linear_lower_limit(const LPoint3f &limit); - void set_linear_upper_limit(const LPoint3f &limit); - void set_angular_lower_limit(const LVector3f &limit); - void set_angular_upper_limit(const LVector3f &limit); + void set_lower_linear_limit(const LPoint3f &limit); + void set_upper_linear_limit(const LPoint3f &limit); + void set_lower_angular_limit(const LVector3f &limit); + void set_upper_angular_limit(const LVector3f &limit); public: virtual btTypedConstraint *ptr() const;