Skip to content
Permalink
Browse files

char/chan: clean up MovingPartScalar/CharacterSlider constructors

These changes are a follow-up to 8b6f822 but could not be made on that branch due to ABI compatibility reasons.
  • Loading branch information
rdb committed Jan 21, 2020
1 parent 05d5bac commit 876cb6022074601a94f9a3c65e1b0c5cb45a91cb
@@ -25,7 +25,7 @@ MovingPartScalar(const MovingPartScalar &copy) :
*/
INLINE MovingPartScalar::
MovingPartScalar(PartGroup *parent, const std::string &name,
const PN_stdfloat &default_value)
PN_stdfloat default_value)
: MovingPart<ACScalarSwitchType>(parent, name, default_value) {
}

@@ -31,7 +31,7 @@ class EXPCL_PANDA_CHAN MovingPartScalar : public MovingPart<ACScalarSwitchType>

public:
INLINE MovingPartScalar(PartGroup *parent, const std::string &name,
const PN_stdfloat &default_value = 0);
PN_stdfloat default_value = 0);
virtual ~MovingPartScalar();

virtual void get_blend_value(const PartBundle *root);
@@ -40,15 +40,8 @@ CharacterSlider(const CharacterSlider &copy) :
*
*/
CharacterSlider::
CharacterSlider(PartGroup *parent, const std::string &name)
: MovingPartScalar(parent, name) {
}

/**
*
*/
CharacterSlider::
CharacterSlider(PartGroup *parent, const std::string &name, const PN_stdfloat &default_value)
CharacterSlider(PartGroup *parent, const std::string &name,
PN_stdfloat default_value)
: MovingPartScalar(parent, name, default_value) {
}

@@ -31,8 +31,8 @@ class EXPCL_PANDA_CHAR CharacterSlider : public MovingPartScalar {
CharacterSlider(const CharacterSlider &copy);

PUBLISHED:
explicit CharacterSlider(PartGroup *parent, const std::string &name);
explicit CharacterSlider(PartGroup *parent, const std::string &name, const PN_stdfloat &default_value);
explicit CharacterSlider(PartGroup *parent, const std::string &name,
PN_stdfloat default_value = 0);
virtual ~CharacterSlider();

public:

0 comments on commit 876cb60

Please sign in to comment.
You can’t perform that action at this time.