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 further bugs with multitexture in dx8/9

This commit is contained in:
David Rose 2008-02-28 00:04:29 +00:00
parent 1521158158
commit 4ad2ecb59f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/dxgsg8/dxGeomMunger8.cxx
View File

@ -148,15 +148,17 @@ munge_format_impl(const GeomVertexFormat *orig,
// the stages of the attrib and get the index numbers in the
// appropriate order.
int si, tc_index;
int max_tc_index = 0;
for (si = 0; si < num_stages; ++si) {
int tc_index = _filtered_texture->get_ff_tc_index(si);
ff_tc_index[tc_index] = si;
max_tc_index = max(tc_index, max_tc_index);
}
// Now walk through the texture coordinates in the order they will
// appear on the final geometry. For each one, get the texture
// coordinate name from the associated stage.
for (tc_index = 0; tc_index < num_stages; ++tc_index) {
for (tc_index = 0; tc_index <= max_tc_index; ++tc_index) {
si = ff_tc_index[tc_index];
TextureStage *stage = _filtered_texture->get_on_ff_stage(si);
InternalName *name = stage->get_texcoord_name();

4
panda/src/dxgsg9/dxGeomMunger9.cxx
View File

@ -148,15 +148,17 @@ munge_format_impl(const GeomVertexFormat *orig,
// the stages of the attrib and get the index numbers in the
// appropriate order.
int si, tc_index;
int max_tc_index = 0;
for (si = 0; si < num_stages; ++si) {
int tc_index = _filtered_texture->get_ff_tc_index(si);
ff_tc_index[tc_index] = si;
max_tc_index = max(tc_index, max_tc_index);
}
// Now walk through the texture coordinates in the order they will
// appear on the final geometry. For each one, get the texture
// coordinate name from the associated stage.
for (tc_index = 0; tc_index < num_stages; ++tc_index) {
for (tc_index = 0; tc_index <= max_tc_index; ++tc_index) {
si = ff_tc_index[tc_index];
TextureStage *stage = _filtered_texture->get_on_ff_stage(si);
InternalName *name = stage->get_texcoord_name();