shithub: 3dee

Info  •  Files  •  Log  •  Branches

obj: update texture handling to the new libobj OBJTexture

--- a/obj.c

+++ b/obj.c

@@ -169,17 +169,17 @@

 			if(objmtl->map_Kd != nil){

 				mtl->diffusemap = alloctexture(sRGBTexture, nil);

-				mtl->diffusemap->image = dupmemimage(objmtl->map_Kd);

+				mtl->diffusemap->image = dupmemimage(objmtl->map_Kd->image);

 			}

 			if(objmtl->map_Ks != nil){

 				mtl->specularmap = alloctexture(sRGBTexture, nil);

-				mtl->specularmap->image = dupmemimage(objmtl->map_Ks);

+				mtl->specularmap->image = dupmemimage(objmtl->map_Ks->image);

 			}

 			if(objmtl->norm != nil){

 				mtl->normalmap = alloctexture(RAWTexture, nil);

-				mtl->normalmap->image = dupmemimage(objmtl->norm);

+				mtl->normalmap->image = dupmemimage(objmtl->norm->image);

 			}

 			addmtlmap(&mtlmap, objmtl, m->nmaterials-1);

-- 

⑨