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 state attribs at primitive level in bam2egg; also prevent duplication of state attribs at primitive level if possible

This commit is contained in:
rdb 2016-09-18 11:31:04 +02:00
parent 7c79a999a5
commit c9ea02445e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/egg/eggPrimitive.I
View File

@ -27,6 +27,7 @@ INLINE EggPrimitive::
EggPrimitive(const EggPrimitive &copy) :
EggNode(copy),
EggAttributes(copy),
EggRenderMode(copy),
_textures(copy._textures),
_material(copy._material),
_bface(copy._bface)
@ -42,6 +43,7 @@ INLINE EggPrimitive &EggPrimitive::
operator = (const EggPrimitive &copy) {
EggNode::operator = (copy);
EggAttributes::operator = (copy);
EggRenderMode::operator = (copy);
copy_vertices(copy);
_textures = copy._textures;
_material = copy._material;

9
panda/src/egg2pg/eggSaver.cxx
View File

@ -640,6 +640,15 @@ convert_geom_node(GeomNode *node, const WorkingNodePath &node_path,
CPT(RenderState) geom_state = node->get_geom_state(i);
CPT(RenderState) geom_net_state = net_state->compose(geom_state);
// If there is only one Geom, and the node has no state, apply the state
// attributes from the Geom to the group instead, so that we don't end up
// duplicating it for a lot of primitives.
if (num_geoms == 1 && node->get_num_children() == 0 && egg_parent == egg_group &&
!geom_state->is_empty() && node->get_state()->is_empty()) {
apply_state_properties(egg_group, geom_state);
geom_state = RenderState::make_empty();
}
const Geom *geom = node->get_geom(i);
int num_primitives = geom->get_num_primitives();
for (int j = 0; j < num_primitives; ++j) {