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

support multiple objecttypes

Browse Source
This commit is contained in:
David Rose 2003-01-24 19:13:28 +00:00
parent 720ca3db24
commit 29e9fe84ec
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandatool/src/egg-palettize/textureReference.cxx
View File

@ -445,12 +445,13 @@ get_uv_range(EggGroupNode *group, Palettizer::RemapUV remap) {
if (group->is_of_type(EggGroup::get_class_type())) { if (group->is_of_type(EggGroup::get_class_type())) {
EggGroup *egg_group; EggGroup *egg_group;
DCAST_INTO_V(egg_group, group); DCAST_INTO_V(egg_group, group);
if (egg_group->has_objecttype() && for (int i = 0; i < egg_group->get_num_object_types(); i++) {
cmp_nocase_uh(egg_group->get_objecttype(), "backstage") == 0) { if (cmp_nocase_uh(egg_group->get_object_type(i), "backstage") == 0) {
// If we reach a <Group> node with the "backstage" flag set, // If we reach a <Group> node with the "backstage" flag set,
// ignore it and everything under it. // ignore it and everything under it.
return; return;
} }
}
if (egg_group->get_dart_type() != EggGroup::DT_none) { if (egg_group->get_dart_type() != EggGroup::DT_none) {
// If it's a character, we might change the kind of remapping we // If it's a character, we might change the kind of remapping we
@ -540,12 +541,13 @@ update_uv_range(EggGroupNode *group, Palettizer::RemapUV remap) {
if (group->is_of_type(EggGroup::get_class_type())) { if (group->is_of_type(EggGroup::get_class_type())) {
EggGroup *egg_group; EggGroup *egg_group;
DCAST_INTO_V(egg_group, group); DCAST_INTO_V(egg_group, group);
if (egg_group->has_objecttype() && for (int i = 0; i < egg_group->get_num_object_types(); i++) {
cmp_nocase_uh(egg_group->get_objecttype(), "backstage") == 0) { if (cmp_nocase_uh(egg_group->get_object_type(i), "backstage") == 0) {
// If we reach a <Group> node with the "backstage" flag set, // If we reach a <Group> node with the "backstage" flag set,
// ignore it and everything under it. // ignore it and everything under it.
return; return;
} }
}
if (egg_group->get_dart_type() != EggGroup::DT_none) { if (egg_group->get_dart_type() != EggGroup::DT_none) {
// If it's a character, we might change the kind of remapping we // If it's a character, we might change the kind of remapping we

4
pandatool/src/egg-palettize/txaLine.cxx
View File

@ -532,6 +532,10 @@ output(ostream &out) const {
case KW_cont: case KW_cont:
out << " cont"; out << " cont";
break; break;
case KW_anisotropic:
out << " aniso " << _aniso_degree;
break;
} }
} }