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

fix bounds calculation agani

Browse Source
This commit is contained in:
David Rose 2006-02-15 18:14:06 +00:00
parent 2bb5462a4c
commit e122b6b78c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/pgraph/pandaNode.cxx
View File

@ -2642,8 +2642,16 @@ update_bounds(int pipeline_stage, PandaNode::CDBoundsStageReader &cdata) {
// Start with a clean slate, or at least with the contents of the // Start with a clean slate, or at least with the contents of the
// node itself. // node itself.
CollideMask net_collide_mask = get_into_collide_mask(); CollideMask net_collide_mask;
CPT(RenderAttrib) off_clip_planes = get_state()->get_clip_plane(); {
CDHeavyStageReader cdata(_cycler_heavy, pipeline_stage);
net_collide_mask = cdata->_into_collide_mask;
}
CPT(RenderAttrib) off_clip_planes;
{
CDLightStageReader cdata(_cycler_light, pipeline_stage);
off_clip_planes = cdata->_state->get_clip_plane();
}
if (off_clip_planes == (RenderAttrib *)NULL) { if (off_clip_planes == (RenderAttrib *)NULL) {
off_clip_planes = ClipPlaneAttrib::make(); off_clip_planes = ClipPlaneAttrib::make();
} }
@ -2667,12 +2675,12 @@ update_bounds(int pipeline_stage, PandaNode::CDBoundsStageReader &cdata) {
for (int i = 0; i < num_children; ++i) { for (int i = 0; i < num_children; ++i) {
PandaNode *child = children.get_child(i); PandaNode *child = children.get_child(i);
CPT(ClipPlaneAttrib) orig_cp = DCAST(ClipPlaneAttrib, child->get_off_clip_planes()); const ClipPlaneAttrib *orig_cp = DCAST(ClipPlaneAttrib, off_clip_planes);
CDBoundsStageReader child_cdata(child->_cycler_bounds, pipeline_stage); CDBoundsStageReader child_cdata(child->_cycler_bounds, pipeline_stage);
if (child_cdata->_last_update != child_cdata->_next_update) { if (child_cdata->_last_update != child_cdata->_next_update) {
// Child needs update. // Child needs update.
CDBoundsStageWriter child_cdataw = update_bounds(pipeline_stage, child_cdata); CDBoundsStageWriter child_cdataw = child->update_bounds(pipeline_stage, child_cdata);
net_collide_mask |= child_cdataw->_net_collide_mask; net_collide_mask |= child_cdataw->_net_collide_mask;
off_clip_planes = orig_cp->compose_off(child_cdataw->_off_clip_planes); off_clip_planes = orig_cp->compose_off(child_cdataw->_off_clip_planes);