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

fix incorrect flattening across draw mask

Browse Source
This commit is contained in:
David Rose 2002-03-20 16:59:46 +00:00
parent ddd3f7048b
commit 623e6d8733
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/pgraph/qpsceneGraphReducer.cxx
View File

@ -527,7 +527,14 @@ operator () (const PandaNode *node1, const PandaNode *node2) const {
if (node1->get_state() != node2->get_state()) {
return node1->get_state() < node2->get_state();
}
return node1->get_effects() < node2->get_effects();
if (node1->get_effects() != node2->get_effects()) {
return node1->get_effects() < node2->get_effects();
}
if (node1->get_draw_mask() != node2->get_draw_mask()) {
return node1->get_draw_mask() < node2->get_draw_mask();
}
return 0;
}
@ -624,7 +631,8 @@ consider_child(PandaNode *grandparent_node, PandaNode *parent_node,
if (parent_node->get_transform() != child_node->get_transform() ||
parent_node->get_state() != child_node->get_state() ||
parent_node->get_effects() != child_node->get_effects()) {
parent_node->get_effects() != child_node->get_effects() ||
parent_node->get_draw_mask() != child_node->get_draw_mask()) {
// The two nodes have a different state; too bad.
return false;
}
@ -648,6 +656,9 @@ consider_child(PandaNode *grandparent_node, PandaNode *parent_node,
bool qpSceneGraphReducer::
consider_siblings(PandaNode *parent_node, PandaNode *child1,
PandaNode *child2) {
// We don't have to worry about the states being different betweeen
// child1 and child2, since the SortByState object already
// guaranteed we only consider children that have the same state.
return true;
}