diff --git a/panda/src/chan/animControl.N b/panda/src/chan/animControl.N deleted file mode 100644 index a618fba82c..0000000000 --- a/panda/src/chan/animControl.N +++ /dev/null @@ -1,3 +0,0 @@ -ignoreinvolved Action - -forcetype PointerTo diff --git a/panda/src/chan/partBundle.N b/panda/src/chan/partBundle.N deleted file mode 100644 index ff7d90a5a9..0000000000 --- a/panda/src/chan/partBundle.N +++ /dev/null @@ -1,10 +0,0 @@ -ignoreinvolved BlendType -ignoreinvolved control_iterator -ignoreinvolved control_size_type -ignoreinvolved ChannelBlend -ignoremember control_begin -ignoremember control_end -ignoremember control_size - - - diff --git a/panda/src/chan/partBundle.h b/panda/src/chan/partBundle.h index bb4795ca6a..72a0a93d7d 100644 --- a/panda/src/chan/partBundle.h +++ b/panda/src/chan/partBundle.h @@ -45,6 +45,19 @@ public: // do_update() call to specify the channels that are in effect. typedef pmap ChannelBlend; + typedef first_of_pair_iterator control_iterator; + typedef ChannelBlend::size_type control_size_type; + +protected: + // The copy constructor is protected; use make_copy() or copy_subgraph(). + PartBundle(const PartBundle ©); + +public: + PartBundle(const string &name = ""); + virtual PartGroup *make_copy() const; + +PUBLISHED: + // This is the parameter to set_blend_type() and specifies the kind // of blending operation to be performed when multiple controls are // in effect simultaneously (see set_control_effect()). @@ -71,25 +84,13 @@ public: // BT_normalized_linear is a compromise on BT_linear. The matrix // is blended linearly without the scale component, and the // blended scale component is applied separately. This keeps all - // of character's body parts in the correct size and shape. + // of the character's body parts in the correct size and shape. // However, if the hierarchy is disconnected, body parts can fly // off. It's essential the skeleton hierarchy be completely // connected to use this blend mode successully. BT_normalized_linear, }; - typedef first_of_pair_iterator control_iterator; - typedef ChannelBlend::size_type control_size_type; - -protected: - // The copy constructor is protected; use make_copy() or copy_subgraph(). - PartBundle(const PartBundle ©); - -public: - PartBundle(const string &name = ""); - virtual PartGroup *make_copy() const; - -PUBLISHED: void set_blend_type(BlendType bt); INLINE BlendType get_blend_type() const;