X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_sprite.c;h=7fa46ea2dd51f73898222d18369e5dca146a1f49;hp=1dde92119d17f4a799bb7cf6935c84e016935384;hb=fdfa815d659f4ceec149ce3f907c107f38022c3d;hpb=39678a9b44007e3fdb03cda2d97bfc2f529798c8

diff --git a/model_sprite.c b/model_sprite.c
index 1dde9211..7fa46ea2 100644
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // on the same machine.
 
 #include "quakedef.h"
+#include "image.h"
+
+cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"};
 
 /*
 ===============
@@ -31,9 +34,10 @@ Mod_SpriteInit
 */
 void Mod_SpriteInit (void)
 {
+	Cvar_RegisterVariable(&r_mipsprites);
 }
 
-void Mod_Sprite_StripExtension(char *in, char *out)
+static void Mod_Sprite_StripExtension(char *in, char *out)
 {
 	char *end;
 	end = in + strlen(in);
@@ -48,221 +52,280 @@ void Mod_Sprite_StripExtension(char *in, char *out)
 	*out++ = 0;
 }
 
-/*
-=================
-Mod_LoadSpriteFrame
-=================
-*/
-void * Mod_LoadSpriteFrame (void * pin, mspriteframe_t **ppframe, int framenum, int bytesperpixel)
+static void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
 {
+	int					i, j, k, groupframes, realframes, x, y, origin[2], width, height;
+	dspriteframetype_t	*pinframetype;
 	dspriteframe_t		*pinframe;
-	mspriteframe_t		*pspriteframe;
-	int					i, width, height, size, origin[2];
-	char				name[256], tempname[256];
-	byte				*pixbuf, *pixel, *inpixel;
-
-	pinframe = (dspriteframe_t *)pin;
-
-	width = LittleLong (pinframe->width);
-	height = LittleLong (pinframe->height);
-	size = width * height * bytesperpixel;
-
-	pspriteframe = Hunk_AllocName (sizeof (mspriteframe_t),loadname);
-
-	memset (pspriteframe, 0, sizeof (mspriteframe_t));
+	dspritegroup_t		*pingroup;
+	dspriteinterval_t	*pinintervals;
+	float				modelradius, interval;
+	char				tempname[MAX_QPATH], name[MAX_QPATH];
+	qbyte				*pixbuf;
+	void				*startframes;
+	modelradius = 0;
 
-	*ppframe = pspriteframe;
+	Mod_Sprite_StripExtension(loadmodel->name, tempname);
 
-	pspriteframe->width = width;
-	pspriteframe->height = height;
-	origin[0] = LittleLong (pinframe->origin[0]);
-	origin[1] = LittleLong (pinframe->origin[1]);
+	if (loadmodel->numframes < 1)
+		Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d\n", loadmodel->numframes);
 
-	pspriteframe->up = origin[1];
-	pspriteframe->down = origin[1] - height;
-	pspriteframe->left = origin[0];
-	pspriteframe->right = width + origin[0];
+	loadmodel->type = mod_sprite;
+	loadmodel->flags = EF_FULLBRIGHT;
 
-	Mod_Sprite_StripExtension(loadmodel->name, tempname);
-	sprintf (name, "%s_%i", tempname, framenum);
-	pspriteframe->gl_texturenum = loadtextureimagewithmask(name, 0, 0, false, true);
-	pspriteframe->gl_fogtexturenum = image_masktexnum;
-	if (pspriteframe->gl_texturenum == 0)
+	// LordHavoc: hack to allow sprites to be non-fullbright
+	for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++)
 	{
-		pspriteframe->gl_texturenum = GL_LoadTexture (name, width, height, (byte *)(pinframe + 1), true, true, bytesperpixel);
-		// make fog version (just alpha)
-		pixbuf = pixel = malloc(width*height*4);
-		inpixel = (byte *)(pinframe + 1);
-		if (bytesperpixel == 1)
+		if (loadmodel->name[i] == '!')
 		{
-			for (i = 0;i < width*height;i++)
-			{
-				*pixel++ = 255;
-				*pixel++ = 255;
-				*pixel++ = 255;
-				if (*inpixel++ != 255)
-					*pixel++ = 255;
-				else
-					*pixel++ = 0;
-			}
-		}
-		else
-		{
-			inpixel+=3;
-			for (i = 0;i < width*height;i++)
-			{
-				*pixel++ = 255;
-				*pixel++ = 255;
-				*pixel++ = 255;
-				*pixel++ = *inpixel;
-				inpixel+=4;
-			}
+			loadmodel->flags &= ~EF_FULLBRIGHT;
+			break;
 		}
-		sprintf (name, "%s_%ifog", loadmodel->name, framenum);
-		pspriteframe->gl_fogtexturenum = GL_LoadTexture (name, width, height, pixbuf, true, true, 4);
-		free(pixbuf);
 	}
 
-	return (void *)((byte *)pinframe + sizeof (dspriteframe_t) + size);
-}
+	// LordHavoc: 32bit textures
+	if (version != SPRITE_VERSION && version != SPRITE32_VERSION && version != SPRITEHL_VERSION)
+		Host_Error("Mod_Sprite_SharedSetup: unsupported version %i, only %i (quake), %i (HalfLife), and %i (sprite32) supported", version, SPRITE_VERSION, SPRITEHL_VERSION, SPRITE32_VERSION);
 
+//
+// load the frames
+//
+	startframes = datapointer;
+	realframes = 0;
+	for (i = 0;i < loadmodel->numframes;i++)
+	{
+		pinframetype = (dspriteframetype_t *)datapointer;
+		datapointer += sizeof(dspriteframetype_t);
 
-/*
-=================
-Mod_LoadSpriteGroup
-=================
-*/
-void * Mod_LoadSpriteGroup (void * pin, mspriteframe_t **ppframe, int framenum, int bytesperpixel)
-{
-	dspritegroup_t		*pingroup;
-	mspritegroup_t		*pspritegroup;
-	int					i, numframes;
-	dspriteinterval_t	*pin_intervals;
-	float				*poutintervals;
-	void				*ptemp;
+		if (LittleLong (pinframetype->type) == SPR_SINGLE)
+			groupframes = 1;
+		else
+		{
+			pingroup = (dspritegroup_t *)datapointer;
+			datapointer += sizeof(dspritegroup_t);
 
-	pingroup = (dspritegroup_t *)pin;
+			groupframes = LittleLong(pingroup->numframes);
 
-	numframes = LittleLong (pingroup->numframes);
+			datapointer += sizeof(dspriteinterval_t) * groupframes;
+		}
 
-	pspritegroup = Hunk_AllocName (sizeof (mspritegroup_t) +
-				(numframes - 1) * sizeof (pspritegroup->frames[0]), loadname);
+		for (j = 0;j < groupframes;j++)
+		{
+			pinframe = (dspriteframe_t *)datapointer;
+			if (version == SPRITE32_VERSION)
+				datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height) * 4;
+			else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
+				datapointer += sizeof(dspriteframe_t) + LittleLong(pinframe->width) * LittleLong(pinframe->height);
+		}
+		realframes += groupframes;
+	}
 
-	pspritegroup->numframes = numframes;
+	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+	loadmodel->sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
 
-	*ppframe = (mspriteframe_t *)pspritegroup;
+	datapointer = startframes;
+	realframes = 0;
+	for (i = 0;i < loadmodel->numframes;i++)
+	{
+		pinframetype = (dspriteframetype_t *)datapointer;
+		datapointer += sizeof(dspriteframetype_t);
 
-	pin_intervals = (dspriteinterval_t *)(pingroup + 1);
+		if (LittleLong (pinframetype->type) == SPR_SINGLE)
+		{
+			groupframes = 1;
+			interval = 0.1f;
+		}
+		else
+		{
+			pingroup = (dspritegroup_t *)datapointer;
+			datapointer += sizeof(dspritegroup_t);
 
-	poutintervals = Hunk_AllocName (numframes * sizeof (float), loadname);
+			groupframes = LittleLong(pingroup->numframes);
 
-	pspritegroup->intervals = poutintervals;
+			pinintervals = (dspriteinterval_t *)datapointer;
+			datapointer += sizeof(dspriteinterval_t) * groupframes;
 
-	for (i=0 ; i<numframes ; i++)
-	{
-		*poutintervals = LittleFloat (pin_intervals->interval);
-		if (*poutintervals <= 0.0)
-			Host_Error ("Mod_LoadSpriteGroup: interval<=0");
+			interval = LittleFloat(pinintervals[0].interval);
+			if (interval < 0.01f)
+				Host_Error("Mod_Sprite_SharedSetup: invalid interval");
+		}
 
-		poutintervals++;
-		pin_intervals++;
-	}
+		sprintf(loadmodel->animscenes[i].name, "frame %i", i);
+		loadmodel->animscenes[i].firstframe = realframes;
+		loadmodel->animscenes[i].framecount = groupframes;
+		loadmodel->animscenes[i].framerate = 1.0f / interval;
+		loadmodel->animscenes[i].loop = true;
 
-	ptemp = (void *)pin_intervals;
+		for (j = 0;j < groupframes;j++)
+		{
+			pinframe = (dspriteframe_t *)datapointer;
+			datapointer += sizeof(dspriteframe_t);
 
-	for (i=0 ; i<numframes ; i++)
-		ptemp = Mod_LoadSpriteFrame (ptemp, &pspritegroup->frames[i], framenum * 100 + i, bytesperpixel);
+			origin[0] = LittleLong (pinframe->origin[0]);
+			origin[1] = LittleLong (pinframe->origin[1]);
+			width = LittleLong (pinframe->width);
+			height = LittleLong (pinframe->height);
 
-	return ptemp;
-}
+			loadmodel->sprdata_frames[realframes].left = origin[0];
+			loadmodel->sprdata_frames[realframes].right = origin[0] + width;
+			loadmodel->sprdata_frames[realframes].up = origin[1];
+			loadmodel->sprdata_frames[realframes].down = origin[1] - height;
 
+			x = max(loadmodel->sprdata_frames[realframes].left * loadmodel->sprdata_frames[realframes].left, loadmodel->sprdata_frames[realframes].right * loadmodel->sprdata_frames[realframes].right);
+			y = max(loadmodel->sprdata_frames[realframes].up * loadmodel->sprdata_frames[realframes].up, loadmodel->sprdata_frames[realframes].down * loadmodel->sprdata_frames[realframes].down);
+			if (modelradius < x + y)
+				modelradius = x + y;
 
-/*
-=================
-Mod_LoadSpriteModel
-=================
-*/
-void Mod_LoadSpriteModel (model_t *mod, void *buffer)
-{
-	int					i;
-	int					version;
-	dsprite_t			*pin;
-	msprite_t			*psprite;
-	int					numframes;
-	int					size;
-	dspriteframetype_t	*pframetype;
-	// LordHavoc: 32bit textures
-	int		bytesperpixel;
+			if (width > 0 && height > 0)
+			{
+				if (groupframes > 1)
+					sprintf (name, "%s_%i_%i", tempname, i, j);
+				else
+					sprintf (name, "%s_%i", tempname, i);
+				loadmodel->sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE);
+				loadmodel->sprdata_frames[realframes].fogtexture = image_masktex;
+
+				if (!loadmodel->sprdata_frames[realframes].texture)
+				{
+					pixbuf = Mem_Alloc(tempmempool, width*height*4);
+					if (version == SPRITE32_VERSION)
+						memcpy(pixbuf, datapointer, width*height*4);
+					else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
+						Image_Copy8bitRGBA(datapointer, pixbuf, width*height, palette);
+
+					loadmodel->sprdata_frames[realframes].texture = R_LoadTexture2D (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE, NULL);
+
+					// make fog version (just alpha)
+					for (k = 0;k < width*height;k++)
+					{
+						pixbuf[k*4+0] = 255;
+						pixbuf[k*4+1] = 255;
+						pixbuf[k*4+2] = 255;
+					}
+					if (groupframes > 1)
+						sprintf (name, "%s_%i_%ifog", tempname, i, j);
+					else
+						sprintf (name, "%s_%ifog", tempname, i);
+					loadmodel->sprdata_frames[realframes].fogtexture = R_LoadTexture2D (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE, NULL);
+
+					Mem_Free(pixbuf);
+				}
+			}
 
-	mod->flags = EF_FULLBRIGHT;
-	// LordHavoc: hack to allow sprites to be non-fullbright
-	for (i = 0;i < MAX_QPATH && mod->name[i];i++)
-	{
-		if (mod->name[i] == '!')
-		{
-			mod->flags &= ~EF_FULLBRIGHT;
-			break;
+			if (version == SPRITE32_VERSION)
+				datapointer += width * height * 4;
+			else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
+				datapointer += width * height;
+			realframes++;
 		}
 	}
 
-	pin = (dsprite_t *)buffer;
-
-	version = LittleLong (pin->version);
-	if (version == 2)
+	modelradius = sqrt(modelradius);
+	for (i = 0;i < 3;i++)
 	{
-		version = 32;
-		Con_Printf("warning: %s is a version 2 sprite (RGBA), supported for now, please hex edit to version 32 incase HalfLife sprites might be supported at some point.\n", mod->name);
+		loadmodel->normalmins[i] = loadmodel->yawmins[i] = loadmodel->rotatedmins[i] = -modelradius;
+		loadmodel->normalmaxs[i] = loadmodel->yawmaxs[i] = loadmodel->rotatedmaxs[i] = modelradius;
 	}
-	// LordHavoc: 32bit textures
-	if (version != SPRITE_VERSION && version != SPRITE32_VERSION)
-		Host_Error ("%s has wrong version number "
-				 "(%i should be %i or %i)", mod->name, version, SPRITE_VERSION, SPRITE32_VERSION);
-	bytesperpixel = 1;
-	if (version == SPRITE32_VERSION)
-		bytesperpixel = 4;
-
-	numframes = LittleLong (pin->numframes);
-
-	size = sizeof (msprite_t) +	(numframes - 1) * sizeof (psprite->frames);
-
-	psprite = Hunk_AllocName (size, loadname);
-
-	mod->cache.data = psprite;
-
-	psprite->type = LittleLong (pin->type);
-	psprite->maxwidth = LittleLong (pin->width);
-	psprite->maxheight = LittleLong (pin->height);
-	psprite->beamlength = LittleFloat (pin->beamlength);
-	mod->synctype = LittleLong (pin->synctype);
-	psprite->numframes = numframes;
-
-	mod->mins[0] = mod->mins[1] = -psprite->maxwidth/2;
-	mod->maxs[0] = mod->maxs[1] = psprite->maxwidth/2;
-	mod->mins[2] = -psprite->maxheight/2;
-	mod->maxs[2] = psprite->maxheight/2;
-	
-//
-// load the frames
-//
-	if (numframes < 1)
-		Host_Error ("Mod_LoadSpriteModel: Invalid # of frames: %d\n", numframes);
-
-	mod->numframes = numframes;
-
-	pframetype = (dspriteframetype_t *)(pin + 1);
+	loadmodel->radius = modelradius;
+	loadmodel->radius2 = modelradius * modelradius;
+}
 
-	for (i=0 ; i<numframes ; i++)
+extern void R_Model_Sprite_Draw(entity_render_t *ent);
+void Mod_IDSP_Load(model_t *mod, void *buffer)
+{
+	int version, i, rendermode;
+	qbyte palette[256][4], *in;
+	dsprite_t *pinqsprite;
+	dspritehl_t *pinhlsprite;
+	qbyte *datapointer;
+
+	datapointer = buffer;
+
+	loadmodel->DrawSky = NULL;
+	loadmodel->Draw = R_Model_Sprite_Draw;
+	loadmodel->DrawFakeShadow = NULL;
+	loadmodel->DrawShadowVolume = NULL;
+	loadmodel->DrawLight = NULL;
+
+	version = LittleLong(((dsprite_t *)buffer)->version);
+	if (version == SPRITE_VERSION || SPRITE32_VERSION)
 	{
-		spriteframetype_t	frametype;
+		pinqsprite = (dsprite_t *)datapointer;
+		datapointer += sizeof(dsprite_t);
 
-		frametype = LittleLong (pframetype->type);
-		psprite->frames[i].type = frametype;
+		loadmodel->numframes = LittleLong (pinqsprite->numframes);
+		loadmodel->sprnum_type = LittleLong (pinqsprite->type);
+		loadmodel->synctype = LittleLong (pinqsprite->synctype);
 
-		if (frametype == SPR_SINGLE)
-			pframetype = (dspriteframetype_t *) Mod_LoadSpriteFrame (pframetype + 1, &psprite->frames[i].frameptr, i, bytesperpixel);
-		else
-			pframetype = (dspriteframetype_t *) Mod_LoadSpriteGroup (pframetype + 1, &psprite->frames[i].frameptr, i, bytesperpixel);
+		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete);
 	}
+	else if (version == SPRITEHL_VERSION)
+	{
+		pinhlsprite = (dspritehl_t *)datapointer;
+		datapointer += sizeof(dspritehl_t);
+
+		loadmodel->numframes = LittleLong (pinhlsprite->numframes);
+		loadmodel->sprnum_type = LittleLong (pinhlsprite->type);
+		loadmodel->synctype = LittleLong (pinhlsprite->synctype);
+		rendermode = pinhlsprite->rendermode;
+
+		in = datapointer;
+		datapointer += 2;
+		i = in[0] + in[1] * 256;
+		if (i != 256)
+			Host_Error ("Mod_IDSP_Load: unexpected number of palette colors %i (should be 256)", i);
+		in = datapointer;
+		datapointer += 768;
+		switch(rendermode)
+		{
+		case SPRHL_NORMAL:
+			for (i = 0;i < 255;i++)
+			{
+				palette[i][0] = *in++;
+				palette[i][1] = *in++;
+				palette[i][2] = *in++;
+				palette[i][3] = 255;
+			}
+			palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
+			break;
+		case SPRHL_ADDITIVE:
+			for (i = 0;i < 256;i++)
+			{
+				palette[i][0] = *in++;
+				palette[i][1] = *in++;
+				palette[i][2] = *in++;
+				palette[i][3] = 255;
+			}
+			loadmodel->flags |= EF_ADDITIVE;
+			break;
+		case SPRHL_INDEXALPHA:
+			for (i = 0;i < 256;i++)
+			{
+				palette[i][0] = 255;
+				palette[i][1] = 255;
+				palette[i][2] = 255;
+				palette[i][3] = i;
+				in += 3;
+			}
+			break;
+		case SPRHL_ALPHATEST:
+			for (i = 0;i < 255;i++)
+			{
+				palette[i][0] = *in++;
+				palette[i][1] = *in++;
+				palette[i][2] = *in++;
+				palette[i][3] = 255;
+			}
+			palette[0][0] = palette[0][1] = palette[0][2] = palette[0][3] = 0;
+			break;
+		default:
+			Host_Error("Mod_IDSP_Load: unknown texFormat (%i, should be 0, 1, 2, or 3)\n", i);
+			return;
+		}
 
-	mod->type = mod_sprite;
+		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[0][0]));
+	}
+	else
+		Host_Error("Mod_IDSP_Load: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", loadmodel->name, version);
 }
+