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 bounding volume bug after flatten

This commit is contained in:
David Rose 2007-03-12 18:15:48 +00:00
parent f790a11254
commit 700051ff5f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/gobj/geom.cxx
View File

@ -342,6 +342,7 @@ set_primitive(int i, const GeomPrimitive *primitive) {
cdata->_got_usage_hint = false;
cdata->_modified = Geom::get_next_modified();
clear_cache_stage(current_thread);
mark_internal_bounds_stale(cdata);
}
////////////////////////////////////////////////////////////////////
@ -387,6 +388,7 @@ add_primitive(const GeomPrimitive *primitive) {
cdata->_got_usage_hint = false;
cdata->_modified = Geom::get_next_modified();
clear_cache_stage(current_thread);
mark_internal_bounds_stale(cdata);
}
////////////////////////////////////////////////////////////////////
@ -412,6 +414,7 @@ remove_primitive(int i) {
cdata->_got_usage_hint = false;
cdata->_modified = Geom::get_next_modified();
clear_cache_stage(current_thread);
mark_internal_bounds_stale(cdata);
}
////////////////////////////////////////////////////////////////////
@ -435,6 +438,7 @@ clear_primitives() {
cdata->_shade_model = SM_uniform;
reset_geom_rendering(cdata);
clear_cache_stage(current_thread);
mark_internal_bounds_stale(cdata);
}
////////////////////////////////////////////////////////////////////

7
panda/src/pgraph/geomNode.cxx
View File

@ -484,6 +484,8 @@ check_valid() const {
////////////////////////////////////////////////////////////////////
void GeomNode::
unify(int max_indices) {
bool any_changed = false;
Thread *current_thread = Thread::get_current_thread();
OPEN_ITERATE_CURRENT_AND_UPSTREAM(_cycler, current_thread) {
CDStageWriter cdata(_cycler, pipeline_stage, current_thread);
@ -507,6 +509,7 @@ unify(int max_indices) {
if (new_entry._geom->copy_primitives_from(entry._geom)) {
// Successfully combined!
unified = true;
any_changed = true;
}
}
}
@ -528,6 +531,10 @@ unify(int max_indices) {
}
}
CLOSE_ITERATE_CURRENT_AND_UPSTREAM(_cycler);
if (any_changed) {
mark_internal_bounds_stale();
}
}
////////////////////////////////////////////////////////////////////