diff --git a/panda/src/bullet/bulletSoftBodyMaterial.I b/panda/src/bullet/bulletSoftBodyMaterial.I index f0da7e10ce..ff8182f6ed 100644 --- a/panda/src/bullet/bulletSoftBodyMaterial.I +++ b/panda/src/bullet/bulletSoftBodyMaterial.I @@ -20,7 +20,7 @@ INLINE BulletSoftBodyMaterial:: } /** - * Named constructor intended to be used for asserts with have to return a + * Named constructor intended to be used for asserts which have to return a * concrete value. */ INLINE BulletSoftBodyMaterial BulletSoftBodyMaterial:: @@ -44,7 +44,7 @@ get_material() const { * Getter for the property m_kLST. */ INLINE PN_stdfloat BulletSoftBodyMaterial:: -getLinearStiffness() const { +get_linear_stiffness() const { return (PN_stdfloat)_material.m_kLST; } @@ -53,7 +53,7 @@ getLinearStiffness() const { * Setter for the property m_kLST. */ INLINE void BulletSoftBodyMaterial:: -setLinearStiffness(PN_stdfloat value) { +set_linear_stiffness(PN_stdfloat value) { _material.m_kLST = (btScalar)value; } @@ -62,7 +62,7 @@ setLinearStiffness(PN_stdfloat value) { * Getter for the property m_kAST. */ INLINE PN_stdfloat BulletSoftBodyMaterial:: -getAngularStiffness() const { +get_angular_stiffness() const { return (PN_stdfloat)_material.m_kAST; } @@ -71,7 +71,7 @@ getAngularStiffness() const { * Setter for the property m_kAST. */ INLINE void BulletSoftBodyMaterial:: -setAngularStiffness(PN_stdfloat value) { +set_angular_stiffness(PN_stdfloat value) { _material.m_kAST = (btScalar)value; } @@ -80,7 +80,7 @@ setAngularStiffness(PN_stdfloat value) { * Getter for the property m_kVST. */ INLINE PN_stdfloat BulletSoftBodyMaterial:: -getVolumePreservation() const { +get_volume_preservation() const { return (PN_stdfloat)_material.m_kVST; } @@ -89,7 +89,7 @@ getVolumePreservation() const { * Setter for the property m_kVST. */ INLINE void BulletSoftBodyMaterial:: -setVolumePreservation(PN_stdfloat value) { +set_volume_preservation(PN_stdfloat value) { _material.m_kVST = (btScalar)value; } diff --git a/panda/src/bullet/bulletSoftBodyMaterial.h b/panda/src/bullet/bulletSoftBodyMaterial.h index fdcd453f4d..b2a70c1d9d 100644 --- a/panda/src/bullet/bulletSoftBodyMaterial.h +++ b/panda/src/bullet/bulletSoftBodyMaterial.h @@ -27,13 +27,17 @@ PUBLISHED: INLINE ~BulletSoftBodyMaterial(); INLINE static BulletSoftBodyMaterial empty(); - INLINE void setLinearStiffness(PN_stdfloat value); - INLINE void setAngularStiffness(PN_stdfloat value); - INLINE void setVolumePreservation(PN_stdfloat value); - - INLINE PN_stdfloat getLinearStiffness() const; - INLINE PN_stdfloat getAngularStiffness() const; - INLINE PN_stdfloat getVolumePreservation() const; + INLINE void set_linear_stiffness(PN_stdfloat value); + INLINE PN_stdfloat get_linear_stiffness() const; + MAKE_PROPERTY(linear_stiffness, get_linear_stiffness, set_linear_stiffness); + + INLINE void set_angular_stiffness(PN_stdfloat value); + INLINE PN_stdfloat get_angular_stiffness() const; + MAKE_PROPERTY(angular_stiffness, get_angular_stiffness, set_angular_stiffness); + + INLINE void set_volume_preservation(PN_stdfloat value); + INLINE PN_stdfloat get_volume_preservation() const; + MAKE_PROPERTY(volume_preservation, get_volume_preservation, set_volume_preservation); public: BulletSoftBodyMaterial(btSoftBody::Material &material);