X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_sprite.c;h=989cfa7b115366fc435a6c2610dc9bb18e133b3d;hb=a95a5849f03a278febc784cf588b733fb24f5e86;hp=346fddb10297e7538c9e41f701dbd7782720d53a;hpb=8d4a595ba1b90a62dc781b93b12c2edbfff5080f;p=xonotic%2Fdarkplaces.git

diff --git a/model_sprite.c b/model_sprite.c
index 346fddb1..989cfa7b 100644
--- a/model_sprite.c
+++ b/model_sprite.c
@@ -23,6 +23,7 @@ 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"};
 
@@ -36,7 +37,7 @@ 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);
@@ -51,7 +52,7 @@ void Mod_Sprite_StripExtension(char *in, char *out)
 	*out++ = 0;
 }
 
-void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
+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;
@@ -181,7 +182,7 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
 					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, true);
+				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)
@@ -192,7 +193,7 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
 					else //if (version == SPRITE_VERSION || version == SPRITEHL_VERSION)
 						Image_Copy8bitRGBA(datapointer, pixbuf, width*height, palette);
 
-					loadmodel->sprdata_frames[realframes].texture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
+					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++)
@@ -205,7 +206,7 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
 						sprintf (name, "%s_%i_%ifog", tempname, i, j);
 					else
 						sprintf (name, "%s_%ifog", tempname, i);
-					loadmodel->sprdata_frames[realframes].fogtexture = R_LoadTexture (loadmodel->texturepool, name, width, height, pixbuf, TEXTYPE_RGBA, TEXF_ALPHA | (r_mipsprites.integer ? TEXF_MIPMAP : 0) | TEXF_PRECACHE);
+					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);
 				}
@@ -225,20 +226,16 @@ void Mod_Sprite_SharedSetup(qbyte *datapointer, int version, int *palette)
 		loadmodel->normalmins[i] = loadmodel->yawmins[i] = loadmodel->rotatedmins[i] = -modelradius;
 		loadmodel->normalmaxs[i] = loadmodel->yawmaxs[i] = loadmodel->rotatedmaxs[i] = modelradius;
 	}
-//	loadmodel->modelradius = modelradius;
+	loadmodel->radius = modelradius;
+	loadmodel->radius2 = modelradius * modelradius;
 }
 
-void Mod_Sprite_SERAddEntity(void)
-{
-	R_ClipSprite();
-}
-
-
 /*
 =================
 Mod_LoadSpriteModel
 =================
 */
+extern void R_Model_Sprite_Draw(entity_render_t *ent);
 void Mod_LoadSpriteModel (model_t *mod, void *buffer)
 {
 	int version, i, rendermode;
@@ -249,10 +246,11 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
 
 	datapointer = buffer;
 
-	loadmodel->SERAddEntity = Mod_Sprite_SERAddEntity;
-	loadmodel->Draw = R_DrawSpriteModel;
 	loadmodel->DrawSky = NULL;
-	loadmodel->DrawShadow = 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)
@@ -264,7 +262,7 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
 		loadmodel->sprnum_type = LittleLong (pinqsprite->type);
 		loadmodel->synctype = LittleLong (pinqsprite->synctype);
 
-		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), d_8to24table);
+		Mod_Sprite_SharedSetup(datapointer, LittleLong (pinqsprite->version), palette_complete);
 	}
 	else if (version == SPRITEHL_VERSION)
 	{
@@ -303,7 +301,6 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
 				palette[i][2] = *in++;
 				palette[i][3] = 255;
 			}
-	//		palette[255][0] = palette[255][1] = palette[255][2] = palette[255][3] = 0;
 			loadmodel->flags |= EF_ADDITIVE;
 			break;
 		case SPRHL_INDEXALPHA:
@@ -336,3 +333,4 @@ void Mod_LoadSpriteModel (model_t *mod, void *buffer)
 	else
 		Host_Error ("Mod_LoadSpriteModel: %s has wrong version number (%i should be 1 (quake) or 32 (sprite32) or 2 (halflife)", loadmodel->name, version);
 }
+