RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix interplay with set_color() and animate_vertices()

This commit is contained in:
David Rose 2005-05-04 16:07:16 +00:00
parent 203e69dae3
commit b76d29c0a6
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/gobj/qpgeomVertexData.cxx
View File

@ -92,6 +92,10 @@ qpGeomVertexData(const qpGeomVertexData &copy) :
_skinning_pcollector(copy._skinning_pcollector),
_morphs_pcollector(copy._morphs_pcollector)
{
CDWriter cdata(_cycler);
// It's important that we *not* copy the animated_vertices pointer.
cdata->_animated_vertices = NULL;
cdata->_animated_vertices_modified = UpdateSeq();
}
////////////////////////////////////////////////////////////////////
@ -126,6 +130,10 @@ qpGeomVertexData(const qpGeomVertexData &copy,
(_format->get_array(i), usage_hint);
cdata->_arrays.push_back(array);
}
// It's important that we *not* copy the animated_vertices pointer.
cdata->_animated_vertices = NULL;
cdata->_animated_vertices_modified = UpdateSeq();
}
////////////////////////////////////////////////////////////////////
@ -1351,11 +1359,11 @@ update_animated_vertices(qpGeomVertexData::CDWriter &cdata) {
}
PT(qpGeomVertexData) new_data = cdata->_animated_vertices;
// We have to make a complete copy of data first so we can modify
// it. If we were clever, we could maybe just figure out the subset
// of the data that might have changed since last frame, but that's
// too much trouble (and isn't obviously faster than just copying
// the whole thing).
// We have to make a complete copy of the data first so we can
// modify it. If we were clever, we could maybe just figure out the
// subset of the data that might have changed since last frame, but
// that's too much trouble (and isn't obviously faster than just
// copying the whole thing).
new_data->copy_from(this, true);
// First, apply all of the morphs.

2
panda/src/gobj/qpgeomVertexFormat.cxx
View File

@ -117,6 +117,8 @@ get_post_animated_format() const {
new_format->remove_column(delta_name);
}
new_format->_animation.set_none();
CPT(qpGeomVertexFormat) registered =
qpGeomVertexFormat::register_format(new_format);
((qpGeomVertexFormat *)this)->_post_animated_format = registered;