X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_sprite.c;h=30a7ec4b6b9df8a0df9155924eb953d9ae28f248;hp=7d2960f5718476952fe326e8da314cb056ddaf8e;hb=76ed5d5ee3a2517bfae3df09fb0b8d912f7286bc;hpb=d4c8d7d1f126232f3ed69a97da905d9425a291c2

diff --git a/model_sprite.c b/model_sprite.c
index 7d2960f5..30a7ec4b 100644
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -25,7 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "image.h"
 
-cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1"};
+cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1", "mipmaps skins (so they become blurrier in the distance), unlike skins the sprites do not have strange border colors"};
+cvar_t r_picmipsprites = {CVAR_SAVE, "r_picmipsprites", "1", "make gl_picmip affect sprites too (saves some graphics memory in sprite heavy games)"};
 
 /*
 ===============
@@ -35,34 +36,47 @@ Mod_SpriteInit
 void Mod_SpriteInit (void)
 {
 	Cvar_RegisterVariable(&r_mipsprites);
+	Cvar_RegisterVariable(&r_picmipsprites);
 }
 
-static int alphaonlytable[4] = {255 | 0x80000000, 255 | 0x80000000, 255 | 0x80000000, 3};
-static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const int *palette, const int *alphapalette)
+static void Mod_SpriteSetupTexture(texture_t *texture, skinframe_t *skinframe, qboolean fullbright, qboolean additive)
 {
-	int					i, j, groupframes, realframes, x, y, origin[2], width, height;
+	if (!skinframe)
+		skinframe = R_SkinFrame_LoadMissing();
+	texture->basematerialflags = MATERIALFLAG_WALL;
+	if (fullbright)
+		texture->basematerialflags |= MATERIALFLAG_FULLBRIGHT;
+	if (additive)
+		texture->basematerialflags |= MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+	else if (skinframe->fog)
+		texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
+	texture->currentmaterialflags = texture->basematerialflags;
+	texture->numskinframes = 1;
+	texture->currentskinframe = texture->skinframes[0] = skinframe;
+}
+
+static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version, const unsigned int *palette, const unsigned int *alphapalette, qboolean additive)
+{
+	int					i, j, groupframes, realframes, x, y, origin[2], width, height, fullbright;
 	dspriteframetype_t	*pinframetype;
 	dspriteframe_t		*pinframe;
 	dspritegroup_t		*pingroup;
 	dspriteinterval_t	*pinintervals;
+	skinframe_t			*skinframe;
 	float				modelradius, interval;
 	char				name[MAX_QPATH], fogname[MAX_QPATH];
-	qbyte				*pixbuf;
 	const void			*startframes;
+	int                 texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
 	modelradius = 0;
 
 	if (loadmodel->numframes < 1)
-		Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d\n", loadmodel->numframes);
+		Host_Error ("Mod_Sprite_SharedSetup: Invalid # of frames: %d", loadmodel->numframes);
 
 	// LordHavoc: hack to allow sprites to be non-fullbright
+	fullbright = true;
 	for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++)
-	{
 		if (loadmodel->name[i] == '!')
-		{
-			loadmodel->flags2 &= ~EF_FULLBRIGHT;
-			break;
-		}
-	}
+			fullbright = false;
 
 //
 // load the frames
@@ -97,10 +111,13 @@ static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const
 		realframes += groupframes;
 	}
 
-	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
-	loadmodel->sprite.sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
+	loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+	loadmodel->sprite.sprdata_frames = (mspriteframe_t *)Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * realframes);
+	loadmodel->num_textures = realframes;
+	loadmodel->num_texturesperskin = 1;
+	loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, sizeof(texture_t) * loadmodel->num_textures);
 
-	datapointer = startframes;
+	datapointer = (unsigned char *)startframes;
 	realframes = 0;
 	for (i = 0;i < loadmodel->numframes;i++)
 	{
@@ -148,41 +165,30 @@ static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const
 			loadmodel->sprite.sprdata_frames[realframes].up = origin[1];
 			loadmodel->sprite.sprdata_frames[realframes].down = origin[1] - height;
 
-			x = max(loadmodel->sprite.sprdata_frames[realframes].left * loadmodel->sprite.sprdata_frames[realframes].left, loadmodel->sprite.sprdata_frames[realframes].right * loadmodel->sprite.sprdata_frames[realframes].right);
-			y = max(loadmodel->sprite.sprdata_frames[realframes].up * loadmodel->sprite.sprdata_frames[realframes].up, loadmodel->sprite.sprdata_frames[realframes].down * loadmodel->sprite.sprdata_frames[realframes].down);
+			x = (int)max(loadmodel->sprite.sprdata_frames[realframes].left * loadmodel->sprite.sprdata_frames[realframes].left, loadmodel->sprite.sprdata_frames[realframes].right * loadmodel->sprite.sprdata_frames[realframes].right);
+			y = (int)max(loadmodel->sprite.sprdata_frames[realframes].up * loadmodel->sprite.sprdata_frames[realframes].up, loadmodel->sprite.sprdata_frames[realframes].down * loadmodel->sprite.sprdata_frames[realframes].down);
 			if (modelradius < x + y)
 				modelradius = x + y;
 
-			if (width > 0 && height > 0)
+			if (width > 0 && height > 0 && cls.state != ca_dedicated)
 			{
+				skinframe = NULL;
 				if (groupframes > 1)
 					sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
 				else
 					sprintf (name, "%s_%i", loadmodel->name, i);
-				loadmodel->sprite.sprdata_frames[realframes].texture = loadtextureimagewithmask(loadmodel->texturepool, name, 0, 0, false, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP);
-				loadmodel->sprite.sprdata_frames[realframes].fogtexture = image_masktex;
-
-				if (!loadmodel->sprite.sprdata_frames[realframes].texture)
+				if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags)))
 				{
 					if (groupframes > 1)
 						sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
 					else
 						sprintf (fogname, "%s_%ifog", loadmodel->name, i);
 					if (version == SPRITE32_VERSION)
-					{
-						loadmodel->sprite.sprdata_frames[realframes].texture = R_LoadTexture2D(loadmodel->texturepool, name, width, height, datapointer, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, NULL);
-						// make fog version (just alpha)
-						pixbuf = Mem_Alloc(tempmempool, width*height*4);
-						Image_CopyMux(pixbuf, datapointer, width, height, false, false, false, 4, 4, alphaonlytable);
-						loadmodel->sprite.sprdata_frames[realframes].fogtexture = R_LoadTexture2D(loadmodel->texturepool, fogname, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, NULL);
-						Mem_Free(pixbuf);
-					}
+						skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 32, NULL, NULL);
 					else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
-					{
-						loadmodel->sprite.sprdata_frames[realframes].texture = R_LoadTexture2D(loadmodel->texturepool, name, width, height, datapointer, TEXTYPE_PALETTE, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, palette);
-						loadmodel->sprite.sprdata_frames[realframes].fogtexture = R_LoadTexture2D(loadmodel->texturepool, fogname, width, height, datapointer, TEXTYPE_PALETTE, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP, alphapalette);
-					}
+						skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 8, palette, alphapalette);
 				}
+				Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive);
 			}
 
 			if (version == SPRITE32_VERSION)
@@ -204,18 +210,18 @@ static void Mod_Sprite_SharedSetup(const qbyte *datapointer, int version, const
 }
 
 extern void R_Model_Sprite_Draw(entity_render_t *ent);
-void Mod_IDSP_Load(model_t *mod, const void *buffer)
+void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
 {
 	int version;
-	const qbyte *datapointer;
+	const unsigned char *datapointer;
 
-	datapointer = buffer;
+	datapointer = (unsigned char *)buffer;
 
 	loadmodel->type = mod_sprite;
-	loadmodel->flags2 = EF_FULLBRIGHT;
 
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Sprite_Draw;
+	loadmodel->CompileShadowVolume = NULL;
 	loadmodel->DrawShadowVolume = NULL;
 	loadmodel->DrawLight = NULL;
 
@@ -229,15 +235,15 @@ void Mod_IDSP_Load(model_t *mod, const void *buffer)
 
 		loadmodel->numframes = LittleLong (pinqsprite->numframes);
 		loadmodel->sprite.sprnum_type = LittleLong (pinqsprite->type);
-		loadmodel->synctype = LittleLong (pinqsprite->synctype);
+		loadmodel->synctype = (synctype_t)LittleLong (pinqsprite->synctype);
 
-		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete, palette_alpha);
+		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), NULL, NULL, false);
 	}
 	else if (version == SPRITEHL_VERSION)
 	{
 		int i, rendermode;
-		qbyte palette[256][4], alphapalette[256][4];
-		const qbyte *in;
+		unsigned char palette[256][4], alphapalette[256][4];
+		const unsigned char *in;
 		dspritehl_t *pinhlsprite;
 
 		pinhlsprite = (dspritehl_t *)datapointer;
@@ -245,7 +251,7 @@ void Mod_IDSP_Load(model_t *mod, const void *buffer)
 
 		loadmodel->numframes = LittleLong (pinhlsprite->numframes);
 		loadmodel->sprite.sprnum_type = LittleLong (pinhlsprite->type);
-		loadmodel->synctype = LittleLong (pinhlsprite->synctype);
+		loadmodel->synctype = (synctype_t)LittleLong (pinhlsprite->synctype);
 		rendermode = pinhlsprite->rendermode;
 
 		in = datapointer;
@@ -274,7 +280,7 @@ void Mod_IDSP_Load(model_t *mod, const void *buffer)
 				palette[i][2] = *in++;
 				palette[i][3] = 255;
 			}
-			loadmodel->flags2 |= EF_ADDITIVE;
+			// also passes additive == true to Mod_Sprite_SharedSetup
 			break;
 		case SPRHL_INDEXALPHA:
 			for (i = 0;i < 256;i++)
@@ -295,9 +301,10 @@ void Mod_IDSP_Load(model_t *mod, const void *buffer)
 				palette[i][3] = 255;
 			}
 			palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
+			// should this use alpha test or alpha blend?  (currently blend)
 			break;
 		default:
-			Host_Error("Mod_IDSP_Load: unknown texFormat (%i, should be 0, 1, 2, or 3)\n", i);
+			Host_Error("Mod_IDSP_Load: unknown texFormat (%i, should be 0, 1, 2, or 3)", i);
 			return;
 		}
 
@@ -309,7 +316,7 @@ void Mod_IDSP_Load(model_t *mod, const void *buffer)
 			alphapalette[i][3] = palette[i][3];
 		}
 
-		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (int *)(&palette[0][0]), (int *)(&alphapalette[0][0]));
+		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinhlsprite->version), (unsigned int *)(&palette[0][0]), (unsigned int *)(&alphapalette[0][0]), rendermode == SPRHL_ADDITIVE);
 	}
 	else
 		Host_Error("Mod_IDSP_Load: %s has wrong version number (%i). Only %i (quake), %i (HalfLife), and %i (sprite32) supported",
@@ -317,17 +324,19 @@ void Mod_IDSP_Load(model_t *mod, const void *buffer)
 }
 
 
-void Mod_IDS2_Load(model_t *mod, const void *buffer)
+void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
 {
-	int i, version;
+	int i, version, fullbright;
 	const dsprite2_t *pinqsprite;
+	skinframe_t *skinframe;
 	float modelradius;
-	
+	int texflags = (r_mipsprites.integer ? TEXF_MIPMAP : 0) | (r_picmipsprites.integer ? TEXF_PICMIP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE;
+
 	loadmodel->type = mod_sprite;
-	loadmodel->flags2 = EF_FULLBRIGHT;
 
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Sprite_Draw;
+	loadmodel->CompileShadowVolume = NULL;
 	loadmodel->DrawShadowVolume = NULL;
 	loadmodel->DrawLight = NULL;
 
@@ -339,22 +348,21 @@ void Mod_IDS2_Load(model_t *mod, const void *buffer)
 
 	loadmodel->numframes = LittleLong (pinqsprite->numframes);
 	if (loadmodel->numframes < 1)
-		Host_Error ("Mod_IDS2_Load: Invalid # of frames: %d\n", loadmodel->numframes);
+		Host_Error ("Mod_IDS2_Load: Invalid # of frames: %d", loadmodel->numframes);
 	loadmodel->sprite.sprnum_type = SPR_VP_PARALLEL;
 	loadmodel->synctype = ST_SYNC;
 
-	// Hack to allow sprites to be non-fullbright
+	// LordHavoc: hack to allow sprites to be non-fullbright
+	fullbright = true;
 	for (i = 0;i < MAX_QPATH && loadmodel->name[i];i++)
-	{
 		if (loadmodel->name[i] == '!')
-		{
-			loadmodel->flags2 &= ~EF_FULLBRIGHT;
-			break;
-		}
-	}
+			fullbright = false;
 
-	loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
-	loadmodel->sprite.sprdata_frames = Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * loadmodel->numframes);
+	loadmodel->animscenes = (animscene_t *)Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes);
+	loadmodel->sprite.sprdata_frames = (mspriteframe_t *)Mem_Alloc(loadmodel->mempool, sizeof(mspriteframe_t) * loadmodel->numframes);
+	loadmodel->num_textures = loadmodel->numframes;
+	loadmodel->num_texturesperskin = 1;
+	loadmodel->data_textures = (texture_t *)Mem_Alloc(loadmodel->mempool, sizeof(texture_t) * loadmodel->num_textures);
 
 	modelradius = 0;
 	for (i = 0;i < loadmodel->numframes;i++)
@@ -378,24 +386,31 @@ void Mod_IDS2_Load(model_t *mod, const void *buffer)
 
 		sprframe = &loadmodel->sprite.sprdata_frames[i];
 
-		sprframe->left = origin[0];
-		sprframe->right = origin[0] + width;
+		// note that sp2 origin[0] is positive, where as it is negative in
+		// spr/spr32/hlspr
+		sprframe->left = -origin[0];
+		sprframe->right = -origin[0] + width;
 		sprframe->up = origin[1];
 		sprframe->down = origin[1] - height;
 
-		x = max(sprframe->left * sprframe->left, sprframe->right * sprframe->right);
-		y = max(sprframe->up * sprframe->up, sprframe->down * sprframe->down);
+		x = (int)max(sprframe->left * sprframe->left, sprframe->right * sprframe->right);
+		y = (int)max(sprframe->up * sprframe->up, sprframe->down * sprframe->down);
 		if (modelradius < x + y)
 			modelradius = x + y;
+	}
 
-		if (width > 0 && height > 0)
+	if (cls.state != ca_dedicated)
+	{
+		for (i = 0;i < loadmodel->numframes;i++)
 		{
-			sprframe->texture = loadtextureimagewithmask(loadmodel->texturepool, pinframe->name, 0, 0, false, (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE | TEXF_PICMIP);
-			sprframe->fogtexture = image_masktex;
-
-			// TODO: use a default texture if we can't load it?
-			if (sprframe->texture == NULL)
-				Host_Error("Mod_IDS2_Load: failed to load %s", pinframe->name);
+			const dsprite2frame_t *pinframe;
+			pinframe = &pinqsprite->frames[i];
+			if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags)))
+			{
+				Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name);
+				skinframe = R_SkinFrame_LoadMissing();
+			}
+			Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false);
 		}
 	}