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

chan: remove net blend calculation, nothing is actually using it

Browse Source
This commit is contained in:
rdb 2019-07-25 20:34:25 +02:00
parent 53648ed841
commit d3e61e1abe
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,7 +201,6 @@ clear_control_effects() {
if (!cdata->_blend.empty()) { if (!cdata->_blend.empty()) {
CDWriter cdataw(_cycler, cdata); CDWriter cdataw(_cycler, cdata);
cdataw->_blend.clear(); cdataw->_blend.clear();
cdataw->_net_blend = 0.0f;
cdataw->_anim_changed = true; cdataw->_anim_changed = true;
determine_effective_channels(cdataw); determine_effective_channels(cdataw);
} }
@ -556,7 +555,6 @@ control_removed(AnimControl *control) {
CDStageWriter cdata(_cycler, pipeline_stage); CDStageWriter cdata(_cycler, pipeline_stage);
ChannelBlend::iterator cbi = cdata->_blend.find(control); ChannelBlend::iterator cbi = cdata->_blend.find(control);
if (cbi != cdata->_blend.end()) { if (cbi != cdata->_blend.end()) {
cdata->_net_blend -= cbi->second;
cdata->_blend.erase(cbi); cdata->_blend.erase(cbi);
cdata->_anim_changed = true; cdata->_anim_changed = true;
@ -678,7 +676,7 @@ do_set_control_effect(AnimControl *control, PN_stdfloat effect, CData *cdata) {
cdata->_last_control_set = control; cdata->_last_control_set = control;
} }
recompute_net_blend(cdata); determine_effective_channels(cdata);
} }
/** /**
@ -697,23 +695,6 @@ do_get_control_effect(AnimControl *control, const CData *cdata) const {
} }
} }
/**
* Recomputes the total blending amount after a control effect has been
* adjusted. This value must be kept up-to-date so we can normalize the
* blending amounts.
*/
void PartBundle::
recompute_net_blend(CData *cdata) {
cdata->_net_blend = 0.0f;
ChannelBlend::const_iterator bti;
for (bti = cdata->_blend.begin(); bti != cdata->_blend.end(); ++bti) {
cdata->_net_blend += (*bti).second;
}
determine_effective_channels(cdata);
}
/** /**
* Removes and stops all the currently activated AnimControls that animate * Removes and stops all the currently activated AnimControls that animate
* some joints also animated by the indicated AnimControl. This is a special * some joints also animated by the indicated AnimControl. This is a special
@ -722,7 +703,6 @@ recompute_net_blend(CData *cdata) {
*/ */
void PartBundle:: void PartBundle::
clear_and_stop_intersecting(AnimControl *control, CData *cdata) { clear_and_stop_intersecting(AnimControl *control, CData *cdata) {
double new_net_blend = 0.0f;
ChannelBlend new_blend; ChannelBlend new_blend;
bool any_changed = false; bool any_changed = false;
@ -734,7 +714,6 @@ clear_and_stop_intersecting(AnimControl *control, CData *cdata) {
// Save this control--it's either the target control, or it has no // Save this control--it's either the target control, or it has no
// joints in common with the target control. // joints in common with the target control.
new_blend.insert(new_blend.end(), (*cbi)); new_blend.insert(new_blend.end(), (*cbi));
new_net_blend += (*cbi).second;
} else { } else {
// Remove and stop this control. // Remove and stop this control.
ac->stop(); ac->stop();
@ -743,7 +722,6 @@ clear_and_stop_intersecting(AnimControl *control, CData *cdata) {
} }
if (any_changed) { if (any_changed) {
cdata->_net_blend = new_net_blend;
cdata->_blend.swap(new_blend); cdata->_blend.swap(new_blend);
cdata->_anim_changed = true; cdata->_anim_changed = true;
determine_effective_channels(cdata); determine_effective_channels(cdata);
@ -840,7 +818,6 @@ CData() {
_frame_blend_flag = interpolate_frames; _frame_blend_flag = interpolate_frames;
_root_xform = LMatrix4::ident_mat(); _root_xform = LMatrix4::ident_mat();
_last_control_set = nullptr; _last_control_set = nullptr;
_net_blend = 0.0f;
_anim_changed = false; _anim_changed = false;
_last_update = 0.0; _last_update = 0.0;
} }
@ -856,7 +833,6 @@ CData(const PartBundle::CData &copy) :
_root_xform(copy._root_xform), _root_xform(copy._root_xform),
_last_control_set(copy._last_control_set), _last_control_set(copy._last_control_set),
_blend(copy._blend), _blend(copy._blend),
_net_blend(copy._net_blend),
_anim_changed(copy._anim_changed), _anim_changed(copy._anim_changed),
_last_update(copy._last_update) _last_update(copy._last_update)
{ {

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

@ -164,7 +164,6 @@ private:
void do_set_control_effect(AnimControl *control, PN_stdfloat effect, CData *cdata); void do_set_control_effect(AnimControl *control, PN_stdfloat effect, CData *cdata);
PN_stdfloat do_get_control_effect(AnimControl *control, const CData *cdata) const; PN_stdfloat do_get_control_effect(AnimControl *control, const CData *cdata) const;
void recompute_net_blend(CData *cdata);
void clear_and_stop_intersecting(AnimControl *control, CData *cdata); void clear_and_stop_intersecting(AnimControl *control, CData *cdata);
COWPT(AnimPreloadTable) _anim_preload; COWPT(AnimPreloadTable) _anim_preload;
@ -196,7 +195,6 @@ private:
LMatrix4 _root_xform; LMatrix4 _root_xform;
AnimControl *_last_control_set; AnimControl *_last_control_set;
ChannelBlend _blend; ChannelBlend _blend;
PN_stdfloat _net_blend;
bool _anim_changed; bool _anim_changed;
double _last_update; double _last_update;
}; };