TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor bugs

Browse Source
This commit is contained in:
David Rose 2007-07-03 19:45:46 +00:00
parent 2088ca584a
commit 2b13b92419
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/chan/Sources.pp
View File

@ -21,7 +21,9 @@
animControl.I animControl.N \
animControl.h animControlCollection.I \
animControlCollection.h animGroup.I animGroup.h auto_bind.h \
config_chan.h movingPartBase.I movingPartBase.h \
config_chan.h \
movingPart.I movingPart.h \
movingPartBase.I movingPartBase.h \
movingPartMatrix.I movingPartMatrix.h movingPartScalar.I \
movingPartScalar.h partBundle.I partBundle.N partBundle.h \
partBundleNode.I partBundleNode.h \

6
panda/src/chan/movingPartBase.I
View File

@ -25,9 +25,11 @@
////////////////////////////////////////////////////////////////////
INLINE MovingPartBase::
MovingPartBase(const MovingPartBase &copy) :
PartGroup(copy)
PartGroup(copy),
_forced_channel(copy._forced_channel)
{
// We don't copy the bound channels.
// We don't copy the bound channels. We do copy the forced_channel,
// though this is just a pointerwise copy.
}
////////////////////////////////////////////////////////////////////

4
panda/src/chan/movingPartBase.cxx
View File

@ -136,7 +136,9 @@ do_update(PartBundle *root, const CycleData *root_cdata, PartGroup *parent,
// See if any of the channel values have changed since last time.
if (_forced_channel != (AnimChannelBase *)NULL) {
needs_update = _forced_channel->has_changed(0.0, 0.0);
if (!needs_update) {
needs_update = _forced_channel->has_changed(0.0, 0.0);
}
} else {
const PartBundle::CData *cdata = (const PartBundle::CData *)root_cdata;

9
panda/src/chan/partBundle.cxx
View File

@ -264,6 +264,9 @@ freeze_joint(const string &joint_name, const TransformState *transform) {
return false;
}
CDWriter cdata(_cycler, false);
cdata->_anim_changed = true;
return child->apply_freeze(transform);
}
@ -287,6 +290,9 @@ control_joint(const string &joint_name, PandaNode *node) {
return false;
}
CDWriter cdata(_cycler, false);
cdata->_anim_changed = true;
return child->apply_control(node);
}
@ -309,6 +315,9 @@ release_joint(const string &joint_name) {
return false;
}
CDWriter cdata(_cycler, false);
cdata->_anim_changed = true;
return child->clear_forced_channel();
}