TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Identify texmat_x by texture stage ID, not by texturematrix ID.

Browse Source
This commit is contained in:
rdb 2009-06-12 09:40:24 +00:00
parent b3d8d834d4
commit 620a38cbfb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/display/graphicsStateGuardian.cxx
View File

@ -1090,11 +1090,12 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name, LMatrix4f
}
case Shader::SMO_texmat_x: {
const TexMatrixAttrib *tma = DCAST(TexMatrixAttrib, _target_rs->get_attrib_def(TexMatrixAttrib::get_class_slot()));
const TextureAttrib *ta = DCAST(TextureAttrib, _target_rs->get_attrib_def(TextureAttrib::get_class_slot()));
int stagenr = atoi(name->get_name().c_str());
if (stagenr >= tma->get_num_stages()) {
if (stagenr >= ta->get_num_on_stages()) {
return &LMatrix4f::ident_mat();
}
return &tma->get_mat(tma->get_stage(stagenr));
return &tma->get_mat(ta->get_on_stage(stagenr));
}
case Shader::SMO_plane_x: {
const NodePath &np = _target_shader->get_shader_input_nodepath(name);