TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

pgraph: Fix issues with flattening TexMatrixAttrib

Browse Source 
If multiple texture stages reference the same texcoord set, Panda wouldn't flatten the tex matrices even if they were the exact same

Fixes #1392
This commit is contained in:
rdb 2022-11-13 11:08:05 +01:00
parent 0220a43ce0
commit fe94e43bc4
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,38 +203,56 @@ apply_attribs_to_vertices(const AccumulatedAttribs &attribs, int attrib_types,
// effect on the GeomNode; this may not be true if there is a // effect on the GeomNode; this may not be true if there is a
// texture that has been applied at a node above that from which we // texture that has been applied at a node above that from which we
// started the flatten operation, but caveat programmer. // started the flatten operation, but caveat programmer.
NameCount name_count; pmap<InternalName *, pset<CPT(TransformState)> > name_transforms;
if (geom_attribs._texture != nullptr) {
const TextureAttrib *ta = DCAST(TextureAttrib, geom_attribs._texture);
int num_on_stages = ta->get_num_on_stages();
for (int si = 0; si < num_on_stages; si++) {
TextureStage *stage = ta->get_on_stage(si);
const InternalName *name = stage->get_texcoord_name();
count_name(name_count, name);
}
}
const TexMatrixAttrib *tma = const TexMatrixAttrib *tma =
DCAST(TexMatrixAttrib, geom_attribs._tex_matrix); DCAST(TexMatrixAttrib, geom_attribs._tex_matrix);
CPT(TexMatrixAttrib) new_tma = DCAST(TexMatrixAttrib, TexMatrixAttrib::make());
int num_stages = tma->get_num_stages(); int num_stages = tma->get_num_stages();
for (int i = 0; i < num_stages; i++) { for (int i = 0; i < num_stages; i++) {
TextureStage *stage = tma->get_stage(i); TextureStage *stage = tma->get_stage(i);
InternalName *name = stage->get_texcoord_name(); InternalName *name = stage->get_texcoord_name();
if (get_name_count(name_count, name) > 1) { name_transforms[name].insert(tma->get_transform(stage)->get_unique());
}
if (geom_attribs._texture != nullptr) {
// There may be stages without a TexMatrixAttrib, which implicitly
// use the identity transform.
const TextureAttrib *ta = DCAST(TextureAttrib, geom_attribs._texture);
int num_on_stages = ta->get_num_on_stages();
for (int si = 0; si < num_on_stages; si++) {
TextureStage *stage = ta->get_on_stage(si);
InternalName *name = stage->get_texcoord_name();
if (!tma->has_stage(stage)) {
name_transforms[name].insert(TransformState::make_identity());
}
}
}
CPT(TexMatrixAttrib) new_tma = DCAST(TexMatrixAttrib, TexMatrixAttrib::make());
for (int i = 0; i < num_stages; i++) {
TextureStage *stage = tma->get_stage(i);
InternalName *name = stage->get_texcoord_name();
auto it = name_transforms.find(name);
if (it == name_transforms.end()) {
// Already processed this set.
}
else if (it->second.size() != 1) {
// We can't transform these texcoords, since the name is used by // We can't transform these texcoords, since the name is used by
// more than one active stage. // more than one active stage.
new_tma = DCAST(TexMatrixAttrib, new_tma->add_stage(stage, tma->get_transform(stage))); new_tma = DCAST(TexMatrixAttrib, new_tma->add_stage(stage, tma->get_transform(stage)));
}
} else { else {
// It's safe to transform these texcoords; the name is used by // It's safe to transform these texcoords; the name is used by
// no more than one active stage. // no more than one active stage, or all these stages have the
if (transformer.transform_texcoords(new_geom, name, name, tma->get_mat(stage))) { // same transform.
const TransformState *transform = *(it->second.begin());
if (!transform->is_identity() &&
transformer.transform_texcoords(new_geom, name, name, transform->get_mat())) {
any_changed = true; any_changed = true;
} }
// Now make sure we don't transform this set more than once.
name_transforms.erase(it);
} }
} }