X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/bbcffc80c95c69d02635b02d37e78912c7f12305..fa7c556d251ebcb41ef9709b4d85a2c820dee94b:/src/image.c

diff --git a/src/image.c b/src/image.c
index f98238e..a5a4bff 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,7 +1,7 @@
 /*
  *  2ooM: The Master of Orion II Reverse Engineering Project
  *  Library for working with LBX image files.
- *  Copyright (C) 2006-2008 Nick Bowler
+ *  Copyright (C) 2006-2010 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,19 +28,23 @@
 #include "pack.h"
 #include "misc.h"
 #include "lbx.h"
+#include "error.h"
 #include "image.h"
 
+#define FLAG_RAW       0x0100 /* Image is stored as a flat array of bytes. */
 #define FLAG_OVERWRITE 0x0400 /* Draw each frame on a clean slate (unsure). */
+#define FLAG_BUILDING  0x0800 /* Buildings have this, related to shadow? */
 #define FLAG_PALETTE   0x1000 /* Image contains embedded palette. */
 #define FLAG_LOOPING   0x2000 /* Loop over all frames in the image (unsure). */
-#define FLAG_ALL (FLAG_OVERWRITE|FLAG_PALETTE|FLAG_LOOPING)
+
+#define FLAG_ALL (FLAG_RAW|FLAG_OVERWRITE|FLAG_BUILDING|FLAG_PALETTE|FLAG_LOOPING)
 
 #define HDR_LEN 12
 
 struct lbx_image {
 	unsigned short width, height;
 	unsigned short wtf, flags;
-	unsigned short frames, leadin;
+	unsigned char  frames, wtf2, leadin, chunk;
 	unsigned short palstart, palcount;
 
 	const struct lbx_file_ops *fops;
@@ -64,7 +68,7 @@ static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN])
 
 	img = malloc(sizeof *img + sizeof img->offsets[0] * (nframes+1));
 	if (!img) {
-		lbx_errno = -errno;
+		lbx_error_raise(LBX_ENOMEM);
 		return NULL;
 	}
 
@@ -72,8 +76,10 @@ static struct lbx_image *lbximg_init(unsigned char hdr[static HDR_LEN])
 		.width  = unpack_16_le(hdr+0),
 		.height = unpack_16_le(hdr+2),
 		.wtf    = unpack_16_le(hdr+4),
-		.frames = unpack_16_le(hdr+6),
-		.leadin = unpack_16_le(hdr+8),
+		.frames = hdr[6],
+		.wtf2   = hdr[7],
+		.leadin = hdr[8],
+		.chunk  = hdr[9],
 		.flags  = unpack_16_le(hdr+10),
 
 		.currentframe = -1,
@@ -89,9 +95,8 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
 	struct lbx_image *img;
 
 	if (fops->read(hdr_buf, sizeof hdr_buf, f) != sizeof hdr_buf) {
-		lbx_errno = -errno;
 		if (fops->eof(f))
-			lbx_errno = LBX_EEOF;
+			lbx_error_raise(LBX_EEOF);
 		return NULL;
 	}
 
@@ -106,11 +111,12 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
 	/*
 	 * DEBUG ONLY.  These assertions exist to catch otherwise valid image
 	 * files which differ from what I believe to be true of all LBX images.
-	 * If we never find any exceptions, we can replace the assertions with
-	 * assumptions.
+	 * When we can decode every image, then these assertions should be
+	 * replaced with constraints.
 	 */
-	_lbx_assert(img->wtf == 0); /* version? */
-	_lbx_assert(img->frames > img->leadin); /* cmbtshp.lbx breaks this. */
+	_lbx_assert(img->wtf  == 0); /* version? */
+	_lbx_assert(img->wtf2 == 0); /* very likely is simply reserved. */
+	_lbx_assert(img->frames > img->leadin);
 	_lbx_assert(!(img->flags & ~FLAG_ALL));
 
 	/* Read all offsets.  Should be merged with identical code in lbx.c */
@@ -118,9 +124,8 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
 		unsigned char buf[4];
 
 		if (fops->read(buf, sizeof buf, f) != sizeof buf) {
-			lbx_errno = -errno;
 			if (fops->eof(f))
-				lbx_errno = LBX_EEOF;
+				lbx_error_raise(LBX_EEOF);
 			free(img);
 			return NULL;
 		}
@@ -132,9 +137,8 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
 		unsigned char buf[4];
 
 		if (fops->read(buf, sizeof buf, f) != sizeof buf) {
-			lbx_errno = -errno;
 			if (fops->eof(f))
-				lbx_errno = LBX_EEOF;
+				lbx_error_raise(LBX_EEOF);
 			free(img);
 			return NULL;
 		}
@@ -144,7 +148,7 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
 		img->paloff   = fops->tell(f);
 
 		if (img->palstart + img->palcount > 256) {
-			lbx_errno = LBX_EFORMAT;
+			lbx_error_raise(LBX_EFORMAT);
 			free(img);
 			return NULL;
 		}
@@ -153,9 +157,41 @@ struct lbx_image *lbximg_open(void *f, const struct lbx_file_ops *fops,
 	return img;
 }
 
-struct lbx_image *lbximg_fopen(FILE *f)
+static int pipe_close(void *f)
+{
+	struct lbx_pipe_state *p = f;
+	int rc;
+
+	rc = fclose(p->f);
+	free(p);
+	return rc;
+}
+
+static int file_close(void *f)
 {
-	return lbximg_open(f, &lbx_default_fops, NULL);
+	return fclose((FILE *)f);
+}
+
+struct lbx_image *lbximg_fopen(const char *file)
+{
+	struct lbx_pipe_state *p;
+	FILE *f;
+
+	f = fopen(file, "rb");
+	if (!f)
+		return NULL;
+
+	if (fseek(f, 0, SEEK_CUR) == 0)
+		return lbximg_open(f, &lbx_default_fops, file_close);
+
+	p = malloc(sizeof *p);
+	if (!p) {
+		fclose(f);
+		return NULL;
+	}
+
+	*p = (struct lbx_pipe_state) { .f = f };
+	return lbximg_open(p, &lbx_pipe_fops, pipe_close);
 }
 
 static int _lbx_drawrow(int first, struct lbx_image *img)
@@ -193,7 +229,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
 
 		/* Ensure that the row fits in the image. */
 		if (img->height - img->currenty <= yval || xval >= img->width) {
-			lbx_errno = LBX_EFORMAT;
+			lbx_error_raise(LBX_EFORMAT);
 			return -1;
 		}
 
@@ -203,7 +239,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
 		xval = unpack_16_le(buf+2);
 
 		if (img->width - img->currentx <= xval) {
-			lbx_errno = LBX_EFORMAT;
+			lbx_error_raise(LBX_EFORMAT);
 			return -1;
 		}
 		img->currentx += xval;
@@ -212,7 +248,7 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
 	}
 
 	if (count > img->width - img->currentx) {
-		lbx_errno = LBX_EFORMAT;
+		lbx_error_raise(LBX_EFORMAT);
 		return -1;
 	}
 
@@ -232,9 +268,8 @@ static int _lbx_drawrow(int first, struct lbx_image *img)
 
 	return 0;
 readerr:
-	lbx_errno = -errno;
 	if (img->fops->eof(img->f))
-		lbx_errno = LBX_EEOF;
+		lbx_error_raise(LBX_EEOF);
 	return -1;
 }
 
@@ -245,13 +280,13 @@ static unsigned char **allocframebuffer(size_t width, size_t height)
 
 	tmp = calloc(height, width);
 	if (!tmp) {
-		lbx_errno = -errno;
+		lbx_error_raise(LBX_ENOMEM);
 		return NULL;
 	}
 
 	new = malloc(height * sizeof *new);
 	if (!new) {
-		lbx_errno = -errno;
+		lbx_error_raise(LBX_ENOMEM);
 		free(tmp);
 		return NULL;
 	}
@@ -263,10 +298,35 @@ static unsigned char **allocframebuffer(size_t width, size_t height)
 	return new;
 }
 
+static unsigned char **read_raw_frame(struct lbx_image *img, int frame)
+{
+	unsigned long size = img->width * img->height;
+
+	assert(img->flags & FLAG_RAW);
+
+	if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) {
+		return NULL;
+	}
+
+	if (img->fops->read(img->framedata[0], size, img->f) != size) {
+		if (img->fops->eof(img->f))
+			lbx_error_raise(LBX_EEOF);
+		return NULL;
+	}
+	memset(img->mask[0], 1, size);
+
+	if (img->fops->tell(img->f) > img->offsets[frame+1]) {
+		lbx_error_raise(LBX_EFORMAT);
+		return NULL;
+	}
+
+	return img->framedata;
+}
+
 unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 {
 	if (frame >= img->frames || frame < 0) {
-		lbx_errno = LBX_ERANGE;
+		lbx_error_raise(LBX_ENOENT);
 		return NULL;
 	}
 
@@ -282,15 +342,22 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 			return NULL;
 	}
 
-	/* Start over if we are backtracking. */
-	if (img->currentframe > frame)
-		img->currentframe == -1;
+	if (img->flags & FLAG_RAW)
+		return read_raw_frame(img, frame);
 
-	if (img->flags & FLAG_OVERWRITE) {
+	if ((img->flags & FLAG_OVERWRITE)
+	     || (img->chunk && !(frame % img->chunk))) {
 		/* Clear the slate. */
+		img->currentframe = -1;
 		memset(img->framedata[0], 0, img->width * img->height);
 		memset(img->mask[0],      0, img->width * img->height);
 	} else {
+		/* Start over if we are backtracking. */
+		if (img->currentframe > frame) {
+			memset(img->mask[0], 0, img->width * img->height);
+			img->currentframe = -1;
+		}
+
 		/* We must have previous frame decoded to continue. */
 		if (frame > img->currentframe + 1) {
 			if (!lbximg_getframe(img, frame-1))
@@ -302,7 +369,6 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 		int rc, first = 1;
 
 		if (img->fops->seek(img->f, img->offsets[frame], SEEK_SET)) {
-			lbx_errno = -errno;
 			return NULL;
 		}
 
@@ -313,7 +379,7 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 			first = 0;
 
 			if (img->fops->tell(img->f) > img->offsets[frame+1]) {
-				lbx_errno = LBX_EFORMAT;
+				lbx_error_raise(LBX_EFORMAT);
 				return NULL;
 			}
 		} while (!rc);
@@ -323,26 +389,30 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 	return img->framedata;
 }
 
-int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256])
+int
+lbximg_loadpalette(void *f, const struct lbx_file_ops *fops,
+                   struct lbx_colour palette[static 256])
 {
 	unsigned char entry[4];
 	int i;
 
 	for (i = 0; i < 256; i++) {
-		if (fread(entry, sizeof entry, 1, f) != 1) {
-			lbx_errno = (feof(f)) ? LBX_EEOF : -errno;
+		if (fops->read(entry, sizeof entry, f) != sizeof entry) {
+			if (fops->eof(f))
+				lbx_error_raise(LBX_EEOF);
 			return -1;
 		}
 
 		if (entry[0] != 1) {
-			lbx_errno = LBX_EFORMAT;
+			lbx_error_raise(LBX_EFORMAT);
 			return -1;
 		}
 
-		palette[i] = (struct lbx_colour){
-			.red   = entry[1] << 2,
-			.green = entry[2] << 2,
-			.blue  = entry[3] << 2,
+		palette[i] = (struct lbx_colour) {
+			.red    = entry[1] << 2,
+			.green  = entry[2] << 2,
+			.blue   = entry[3] << 2,
+			.active = 1,
 		};
 	}
 
@@ -361,32 +431,32 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
 		return 0;
 
 	if (img->fops->seek(img->f, img->paloff, SEEK_SET)) {
-		lbx_errno = -errno;
 		return -1;
 	}
 
 	for (i = 0; i < img->palcount; i++) {
 		rc = img->fops->read(entry, sizeof entry, img->f);
-
 		if (rc < sizeof entry) {
 			goto readerr;
 		}
 
 		if (entry[0] != 0) {
-			lbx_errno = LBX_EFORMAT;
+			lbx_error_raise(LBX_EFORMAT);
 			return -1;
 		}
 
 		palette[img->palstart + i] = (struct lbx_colour){
-			.red   = entry[1] << 2,
-			.green = entry[2] << 2,
-			.blue  = entry[3] << 2,
+			.red    = entry[1] << 2,
+			.green  = entry[2] << 2,
+			.blue   = entry[3] << 2,
+			.active = 1,
 		};
 	}
 
 	return 0;
 readerr:
-	lbx_errno = img->fops->eof(img->f) ? LBX_EEOF : -errno;
+	if (img->fops->eof(img->f))
+		lbx_error_raise(LBX_EEOF);
 	return -1;
 }
 
@@ -396,6 +466,7 @@ void lbximg_getinfo(struct lbx_image *img, struct lbx_imginfo *info)
 		.width      = img->width,
 		.height     = img->height,
 		.nframes    = img->frames,
+		.chunk      = img->chunk,
 		.palettesz  = (img->flags & FLAG_PALETTE) ? img->palcount : 0,
 	};