TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

char/chan: clean up MovingPartScalar/CharacterSlider constructors

Browse Source 
These changes are a follow-up to 8b6f82256e31e7840c60775c8f2f9e1084aae972 but could not be made on that branch due to ABI compatibility reasons.
This commit is contained in:
rdb 2020-01-21 15:12:05 +01:00
parent 05d5bac598
commit 876cb60220
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/chan/movingPartScalar.I
View File

@ -25,7 +25,7 @@ MovingPartScalar(const MovingPartScalar &copy) :
*/ */
INLINE MovingPartScalar:: INLINE MovingPartScalar::
MovingPartScalar(PartGroup *parent, const std::string &name, MovingPartScalar(PartGroup *parent, const std::string &name,
const PN_stdfloat &default_value) PN_stdfloat default_value)
: MovingPart<ACScalarSwitchType>(parent, name, default_value) { : MovingPart<ACScalarSwitchType>(parent, name, default_value) {
} }

2
panda/src/chan/movingPartScalar.h
View File

@ -31,7 +31,7 @@ protected:
public: public:
INLINE MovingPartScalar(PartGroup *parent, const std::string &name, INLINE MovingPartScalar(PartGroup *parent, const std::string &name,
const PN_stdfloat &default_value = 0); PN_stdfloat default_value = 0);
virtual ~MovingPartScalar(); virtual ~MovingPartScalar();
virtual void get_blend_value(const PartBundle *root); virtual void get_blend_value(const PartBundle *root);

11
panda/src/char/characterSlider.cxx
View File

@ -40,15 +40,8 @@ CharacterSlider(const CharacterSlider &copy) :
* *
*/ */
CharacterSlider:: CharacterSlider::
CharacterSlider(PartGroup *parent, const std::string &name) CharacterSlider(PartGroup *parent, const std::string &name,
: MovingPartScalar(parent, name) { PN_stdfloat default_value)
}
/**
*
*/
CharacterSlider::
CharacterSlider(PartGroup *parent, const std::string &name, const PN_stdfloat &default_value)
: MovingPartScalar(parent, name, default_value) { : MovingPartScalar(parent, name, default_value) {
} }

4
panda/src/char/characterSlider.h
View File

@ -31,8 +31,8 @@ protected:
CharacterSlider(const CharacterSlider &copy); CharacterSlider(const CharacterSlider &copy);
PUBLISHED: PUBLISHED:
explicit CharacterSlider(PartGroup *parent, const std::string &name); explicit CharacterSlider(PartGroup *parent, const std::string &name,
explicit CharacterSlider(PartGroup *parent, const std::string &name, const PN_stdfloat &default_value); PN_stdfloat default_value = 0);
virtual ~CharacterSlider(); virtual ~CharacterSlider();
public: public: