X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=623243d7c1781b6986aa36eec67effac8b28fe91;hb=0dc77d61cf349a3fbe2994cce57f07faa99aab27;hp=0ab36281b7ce2899fa8c1a9674720cc8b400b0cf;hpb=397530aecdd5492236e3dc5620ee7126078c07f3;p=xonotic%2Fdarkplaces.git

diff --git a/model_sprite.c b/model_sprite.c
index 0ab36281..623243d7 100644
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -25,7 +25,7 @@ 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", "mipmaps skins (so they become blurrier in the distance), unlike skins the sprites do not have strange border colors"};
+cvar_t r_mipsprites = {CVAR_SAVE, "r_mipsprites", "1", "mipmaps sprites so they render faster in the distance and do not display noise artifacts"};
 cvar_t r_picmipsprites = {CVAR_SAVE, "r_picmipsprites", "1", "make gl_picmip affect sprites too (saves some graphics memory in sprite heavy games)"};
 
 /*
@@ -114,6 +114,7 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 	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 = (unsigned char *)startframes;
@@ -169,26 +170,32 @@ static void Mod_Sprite_SharedSetup(const unsigned char *datapointer, int version
 			if (modelradius < x + y)
 				modelradius = x + y;
 
-			skinframe = NULL;
-			if (width > 0 && height > 0 && cls.state != ca_dedicated)
+			if (cls.state != ca_dedicated)
 			{
-				if (groupframes > 1)
-					sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
-				else
-					sprintf (name, "%s_%i", loadmodel->name, i);
-				if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags)))
+				skinframe = NULL;
+				// note: Nehahra's null.spr has width == 0 and height == 0
+				if (width > 0 && height > 0)
 				{
 					if (groupframes > 1)
-						sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
+						sprintf (name, "%s_%i_%i", loadmodel->name, i, j);
 					else
-						sprintf (fogname, "%s_%ifog", loadmodel->name, i);
-					if (version == SPRITE32_VERSION)
-						skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 32, NULL, NULL);
-					else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
-						skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 8, palette, alphapalette);
+						sprintf (name, "%s_%i", loadmodel->name, i);
+					if (!(skinframe = R_SkinFrame_LoadExternal(name, texflags, false)))
+					{
+						if (groupframes > 1)
+							sprintf (fogname, "%s_%i_%ifog", loadmodel->name, i, j);
+						else
+							sprintf (fogname, "%s_%ifog", loadmodel->name, i);
+						if (version == SPRITE32_VERSION)
+							skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 32, NULL, NULL);
+						else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
+							skinframe = R_SkinFrame_LoadInternal(name, texflags, false, false, datapointer, width, height, 8, palette, alphapalette);
+					}
 				}
+				if (skinframe == NULL)
+					skinframe = R_SkinFrame_LoadMissing();
+				Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive);
 			}
-			Mod_SpriteSetupTexture(&loadmodel->data_textures[realframes], skinframe, fullbright, additive);
 
 			if (version == SPRITE32_VERSION)
 				datapointer += width * height * 4;
@@ -220,6 +227,7 @@ void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend)
 
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Sprite_Draw;
+	loadmodel->DrawDepth = NULL;
 	loadmodel->CompileShadowVolume = NULL;
 	loadmodel->DrawShadowVolume = NULL;
 	loadmodel->DrawLight = NULL;
@@ -335,6 +343,7 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
 
 	loadmodel->DrawSky = NULL;
 	loadmodel->Draw = R_Model_Sprite_Draw;
+	loadmodel->DrawDepth = NULL;
 	loadmodel->CompileShadowVolume = NULL;
 	loadmodel->DrawShadowVolume = NULL;
 	loadmodel->DrawLight = NULL;
@@ -360,6 +369,7 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
 	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;
@@ -395,17 +405,21 @@ void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend)
 		y = (int)max(sprframe->up * sprframe->up, sprframe->down * sprframe->down);
 		if (modelradius < x + y)
 			modelradius = x + y;
+	}
 
-		skinframe = NULL;
-		if (width > 0 && height > 0 && cls.state != ca_dedicated)
+	if (cls.state != ca_dedicated)
+	{
+		for (i = 0;i < loadmodel->numframes;i++)
 		{
-			if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags)))
+			const dsprite2frame_t *pinframe;
+			pinframe = &pinqsprite->frames[i];
+			if (!(skinframe = R_SkinFrame_LoadExternal(pinframe->name, texflags, false)))
 			{
 				Con_Printf("Mod_IDS2_Load: failed to load %s", pinframe->name);
 				skinframe = R_SkinFrame_LoadMissing();
 			}
+			Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false);
 		}
-		Mod_SpriteSetupTexture(&loadmodel->data_textures[i], skinframe, fullbright, false);
 	}
 
 	modelradius = sqrt(modelradius);