adapt to recent changes in libgraphics.

also set the normals correctly in the phong shader
after mapping from tangent space. that way we can
see the actual normals being used in the normals
framebuffer.

1 files changed, 2 insertions, 2 deletions

diff --git a/solar.c b/solar.c
index 5fa5497..f9b2712 100644
--- a/solar.c
+++ b/solar.c
@@ -350,7 +350,7 @@ Color
 identshader(FSparams *sp)
 {
 	if(sp->v.mtl != nil && sp->v.mtl->diffusemap != nil && sp->v.uv.w != 0)
-		return texture(sp->v.mtl->diffusemap, sp->v.uv, neartexsampler);
+		return sampletexture(sp->v.mtl->diffusemap, sp->v.uv, neartexsampler);
 	return sp->v.c;
 }
 
@@ -814,7 +814,7 @@ threadmain(int argc, char *argv[])
 		else
 			cmds[i].r = rectaddpt(cmds[i].r, Pt(cmds[i-1].r.max.x+Cmdmargin,cmds[i-1].r.min.y));
 	}
-	screenb = eallocimage(display, viewr, RGBA32, 0, DNofill);
+	screenb = eallocimage(display, viewr, XRGB32, 0, DNofill);
 	v = mkviewport(screenb->r);
 	placecamera(&camera, cameracfg.p, cameracfg.lookat, cameracfg.up);
 	configcamera(&camera, v, cameracfg.fov, cameracfg.clipn, cameracfg.clipf, cameracfg.ptype);