Browse Source

chan: remove unused MovingPartBase::_num_effective_channels member

rdb 6 years ago
parent
commit
4322523400

+ 0 - 1
panda/src/chan/movingPartBase.I

@@ -17,7 +17,6 @@
 INLINE MovingPartBase::
 INLINE MovingPartBase::
 MovingPartBase(const MovingPartBase &copy) :
 MovingPartBase(const MovingPartBase &copy) :
   PartGroup(copy),
   PartGroup(copy),
-  _num_effective_channels(0),
   _effective_control(nullptr),
   _effective_control(nullptr),
   _forced_channel(copy._forced_channel)
   _forced_channel(copy._forced_channel)
 {
 {

+ 0 - 4
panda/src/chan/movingPartBase.cxx

@@ -28,7 +28,6 @@ TypeHandle MovingPartBase::_type_handle;
 MovingPartBase::
 MovingPartBase::
 MovingPartBase(PartGroup *parent, const std::string &name) :
 MovingPartBase(PartGroup *parent, const std::string &name) :
   PartGroup(parent, name),
   PartGroup(parent, name),
-  _num_effective_channels(0),
   _effective_control(nullptr)
   _effective_control(nullptr)
 {
 {
 }
 }
@@ -38,7 +37,6 @@ MovingPartBase(PartGroup *parent, const std::string &name) :
  */
  */
 MovingPartBase::
 MovingPartBase::
 MovingPartBase() :
 MovingPartBase() :
-  _num_effective_channels(0),
   _effective_control(nullptr)
   _effective_control(nullptr)
 {
 {
 }
 }
@@ -305,7 +303,6 @@ void MovingPartBase::
 determine_effective_channels(const CycleData *root_cdata) {
 determine_effective_channels(const CycleData *root_cdata) {
   _effective_control = nullptr;
   _effective_control = nullptr;
   _effective_channel = nullptr;
   _effective_channel = nullptr;
-  _num_effective_channels = 0;
 
 
   AnimControl *effective_control = nullptr;
   AnimControl *effective_control = nullptr;
   AnimChannelBase *effective_channel = nullptr;
   AnimChannelBase *effective_channel = nullptr;
@@ -327,7 +324,6 @@ determine_effective_channels(const CycleData *root_cdata) {
     }
     }
   }
   }
 
 
-  _num_effective_channels = num_effective_channels;
   if (num_effective_channels == 1) {
   if (num_effective_channels == 1) {
     _effective_control = effective_control;
     _effective_control = effective_control;
     _effective_channel = effective_channel;
     _effective_channel = effective_channel;

+ 1 - 5
panda/src/chan/movingPartBase.h

@@ -78,13 +78,9 @@ protected:
   typedef pvector< PT(AnimChannelBase) > Channels;
   typedef pvector< PT(AnimChannelBase) > Channels;
   Channels _channels;
   Channels _channels;
 
 
-  // This is the number of channels in the above _channels vector that
-  // actually have an effect on this part.
-  int _num_effective_channels;
-
   // This is the single channel that has an effect on this part, as determined
   // This is the single channel that has an effect on this part, as determined
   // by determine_effective_channels().  It is only set if there is exactly
   // by determine_effective_channels().  It is only set if there is exactly
-  // one channel that affects this part (i.e.  _num_effective_channels is 1).
+  // one channel that affects this part (i.e. num_effective_channels is 1).
   // If there are multiple channels, or no channels at all, it is NULL.
   // If there are multiple channels, or no channels at all, it is NULL.
   AnimControl *_effective_control;
   AnimControl *_effective_control;
   PT(AnimChannelBase) _effective_channel;
   PT(AnimChannelBase) _effective_channel;