eqemu

diff src/objfile.cc @ 5:9b5bb05ae53a

foo
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 18 Jul 2014 00:42:15 +0300
parents 3d3656360a82
children 977bc1cb055b
line diff
     1.1 --- a/src/objfile.cc	Thu Jul 17 08:51:17 2014 +0300
     1.2 +++ b/src/objfile.cc	Fri Jul 18 00:42:15 2014 +0300
     1.3 @@ -209,9 +209,12 @@
     1.4  					mat.shininess = vmtl[i].shininess;
     1.5  					mat.alpha = vmtl[i].alpha;
     1.6  
     1.7 -					/*if(vmtl[i].tex_dif.length()) {
     1.8 -						mat.set_texture(get_texture(vmtl[i].tex_dif.c_str()));
     1.9 -					}*/
    1.10 +					if(vmtl[i].tex_dif.length()) {
    1.11 +						mat.tex[TEX_DIFFUSE] = load_texture(vmtl[i].tex_dif.c_str());
    1.12 +					}
    1.13 +					if(vmtl[i].tex_refl.length()) {
    1.14 +						mat.tex[TEX_ENVMAP] = load_texture(vmtl[i].tex_refl.c_str());
    1.15 +					}
    1.16  
    1.17  					matlib[vmtl[i].name] = mat;
    1.18  				}