From: John Tsiombikas <nuclear@member.fsf.org>
Date: Thu, 15 Feb 2018 05:01:36 +0000 (+0200)
Subject: - moved image rgb24->rgb16 conversion to gfxutil
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=e7220b01f07d1df5a45fe7c83608d4157881956a

- moved image rgb24->rgb16 conversion to gfxutil
- ugly infcubes textures
---

diff --git a/src/gfxutil.c b/src/gfxutil.c
index b82a612..37eb4c5 100644
--- a/src/gfxutil.c
+++ b/src/gfxutil.c
@@ -202,3 +202,16 @@ void blur_grey_vert(uint16_t *dest, uint16_t *src, int xsz, int ysz, int rad, in
 
 	BLUR(ysz, xsz, pixel_step, scanline_step);
 }
+
+void convimg_rgb24_rgb16(uint16_t *dest, unsigned char *src, int xsz, int ysz)
+{
+	int i;
+	int npixels = xsz * ysz;
+
+	for(i=0; i<npixels; i++) {
+		int r = *src++;
+		int g = *src++;
+		int b = *src++;
+		*dest++ = PACK_RGB16(r, g, b);
+	}
+}
diff --git a/src/gfxutil.h b/src/gfxutil.h
index c0a1fde..f0468b6 100644
--- a/src/gfxutil.h
+++ b/src/gfxutil.h
@@ -22,4 +22,6 @@ void draw_line(int x0, int y0, int x1, int y1, unsigned short color);
 void blur_grey_horiz(uint16_t *dest, uint16_t *src, int xsz, int ysz, int radius, int scale);
 void blur_grey_vert(uint16_t *dest, uint16_t *src, int xsz, int ysz, int radius, int scale);
 
+void convimg_rgb24_rgb16(uint16_t *dest, unsigned char *src, int xsz, int ysz);
+
 #endif	/* GFXUTIL_H_ */
diff --git a/src/infcubes.c b/src/infcubes.c
index 3df25fe..e55b1bc 100644
--- a/src/infcubes.c
+++ b/src/infcubes.c
@@ -26,7 +26,7 @@ static struct screen scr = {
 
 static float cam_theta = -29, cam_phi = 35;
 static float cam_dist = 5;
-static struct pimage tex_crate;
+static struct pimage tex_inner, tex_outer;
 static struct g3d_mesh mesh_cube;
 
 struct screen *infcubes_screen(void)
@@ -37,25 +37,19 @@ struct screen *infcubes_screen(void)
 
 static int init(void)
 {
-	int i, npixels;
-	unsigned char *src;
-	uint16_t *dst;
-
-	if(!(tex_crate.pixels = img_load_pixels("data/crate.jpg", &tex_crate.width,
-					&tex_crate.height, IMG_FMT_RGB24))) {
+	if(!(tex_inner.pixels = img_load_pixels("data/crate.jpg", &tex_inner.width,
+					&tex_inner.height, IMG_FMT_RGB24))) {
 		fprintf(stderr, "infcubes: failed to load crate texture\n");
 		return -1;
 	}
+	convimg_rgb24_rgb16(tex_inner.pixels, (unsigned char*)tex_inner.pixels, tex_inner.width, tex_inner.height);
 
-	npixels = tex_crate.width * tex_crate.height;
-	src = (unsigned char*)tex_crate.pixels;
-	dst = tex_crate.pixels;
-	for(i=0; i<npixels; i++) {
-		int r = *src++;
-		int g = *src++;
-		int b = *src++;
-		*dst++ = PACK_RGB16(r, g, b);
+	if(!(tex_outer.pixels = img_load_pixels("data/steelfrm.jpg", &tex_outer.width,
+					&tex_outer.height, IMG_FMT_RGB24))) {
+		fprintf(stderr, "infcubes: failed to load ornamental texture\n");
+		return -1;
 	}
+	convimg_rgb24_rgb16(tex_outer.pixels, (unsigned char*)tex_outer.pixels, tex_outer.width, tex_outer.height);
 
 	if(gen_cube_mesh(&mesh_cube, 1.0f, 3) == -1) {
 		return -1;
@@ -65,7 +59,7 @@ static int init(void)
 
 static void destroy(void)
 {
-	img_free_pixels(tex_crate.pixels);
+	img_free_pixels(tex_inner.pixels);
 }
 
 static void start(long trans_time)
@@ -77,8 +71,6 @@ static void start(long trans_time)
 	g3d_enable(G3D_CULL_FACE);
 	g3d_disable(G3D_LIGHTING);
 	g3d_enable(G3D_LIGHT0);
-
-	g3d_set_texture(tex_crate.width, tex_crate.height, tex_crate.pixels);
 }
 
 static void update(void)
@@ -101,11 +93,15 @@ static void draw(void)
 
 	memset(fb_pixels, 0, fb_width * fb_height * 2);
 
-	g3d_polygon_mode(G3D_FLAT);
-	draw_cube(-6);
-
 	g3d_polygon_mode(G3D_TEX);
-	/*draw_cube(1);*/
+
+	g3d_push_matrix();
+	g3d_scale(-6, -6, -6);
+	g3d_set_texture(tex_outer.width, tex_outer.height, tex_outer.pixels);
+	draw_mesh(&mesh_cube);
+	g3d_pop_matrix();
+
+	g3d_set_texture(tex_inner.width, tex_inner.height, tex_inner.pixels);
 	draw_mesh(&mesh_cube);
 
 	swap_buffers(fb_pixels);
diff --git a/src/polyfill.c b/src/polyfill.c
index 8f6dbd2..1393cd2 100644
--- a/src/polyfill.c
+++ b/src/polyfill.c
@@ -67,7 +67,7 @@ void polyfill_wire(struct pvertex *verts, int nverts)
  * but produces some slight quantization artifacts, due to the limited precision
  * of fixed-point calculations.
  */
-#undef HIGH_QUALITY
+#define HIGH_QUALITY
 
 /* extra bits of precision to use when interpolating colors.
  * try tweaking this if you notice strange quantization artifacts.