X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=a56f83afd66cc642edd843dc4745601260397717;hb=5cf485940428b401e658f4351f65d1da08f93d36;hp=bd8c59074c357745b3a77ac541875f6366ceca39;hpb=5147c014a6b7737761558c8b1c936459128f649c;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index bd8c5907..a56f83af 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -53,6 +53,23 @@ typedef struct skinframe_s
 	rtexture_t *gloss; // glossmap (for dot3)
 	rtexture_t *glow; // glow only (fullbrights)
 	rtexture_t *fog; // alpha of the base texture (if not opaque)
+	// accounting data for hash searches:
+	// the compare variables are used to identify internal skins from certain
+	// model formats
+	// (so that two q1bsp maps with the same texture name for different
+	//  textures do not have any conflicts)
+	struct skinframe_s *next; // next on hash chain
+	char basename[MAX_QPATH]; // name of this
+	int textureflags; // texture flags to use
+	int comparewidth;
+	int compareheight;
+	int comparecrc;
+	// mark and sweep garbage collection, this value is updated to a new value
+	// on each level change for the used skinframes, if some are not used they
+	// are freed
+	int loadsequence;
+	// on 32bit systems this makes the struct 128 bytes long
+	int padding;
 }
 skinframe_t;
 
@@ -218,12 +235,12 @@ typedef struct texture_s
 	skinframe_t *currentskinframe;
 	int numskinframes;
 	float skinframerate;
-	skinframe_t skinframes[TEXTURE_MAXFRAMES];
+	skinframe_t *skinframes[TEXTURE_MAXFRAMES];
 	// background layer (for terrain texture blending)
 	skinframe_t *backgroundcurrentskinframe;
 	int backgroundnumskinframes;
 	float backgroundskinframerate;
-	skinframe_t backgroundskinframes[TEXTURE_MAXFRAMES];
+	skinframe_t *backgroundskinframes[TEXTURE_MAXFRAMES];
 
 	// total frames in sequence and alternate sequence
 	int anim_total[2];
@@ -261,8 +278,6 @@ typedef struct texture_s
 	int supercontents;
 	int surfaceparms;
 	int textureflags;
-
-	//skinframe_t skin;
 }
 texture_t;
 
@@ -554,10 +569,8 @@ typedef struct model_s
 	mempool_t		*mempool;
 	// all models use textures...
 	rtexturepool_t	*texturepool;
-	// flags from the model file
-	int				flags;
-	// engine calculated flags, ones that can not be set in the file
-	int				flags2;
+	// EF_* flags (translated from the model file's different flags layout)
+	int				effects;
 	// number of QC accessible frame(group)s in the model
 	int				numframes;
 	// number of QC accessible skin(group)s in the model
@@ -598,6 +611,7 @@ typedef struct model_s
 	float			*data_baseboneposeinverse;
 	// textures of this model
 	int				num_textures;
+	int				num_texturesperskin;
 	texture_t		*data_textures;
 	// surfaces of this model
 	int				num_surfaces;
@@ -610,6 +624,8 @@ typedef struct model_s
 	void(*DrawSky)(struct entity_render_s *ent);
 	// draw the model using lightmap/dlight shading
 	void(*Draw)(struct entity_render_s *ent);
+	// draw the model to the depth buffer (no color rendering at all)
+	void(*DrawDepth)(struct entity_render_s *ent);
 	// gathers info on which clusters and surfaces are lit by light, as well as calculating a bounding box
 	void(*GetLightInfo)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs);
 	// compile a shadow volume for the model based on light source
@@ -677,9 +693,6 @@ shadowmesh_t *Mod_ShadowMesh_Finish(mempool_t *mempool, shadowmesh_t *firstmesh,
 void Mod_ShadowMesh_CalcBBox(shadowmesh_t *firstmesh, vec3_t mins, vec3_t maxs, vec3_t center, float *radius);
 void Mod_ShadowMesh_Free(shadowmesh_t *mesh);
 
-int Mod_LoadSkinFrame(skinframe_t *skinframe, const char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture);
-int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, const char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture, const unsigned char *skindata, int width, int height, int bitsperpixel, const unsigned int *palette, const unsigned int *alphapalette);
-
 extern cvar_t r_mipskins;
 
 typedef struct skinfileitem_s
@@ -715,6 +728,7 @@ int Mod_Q1BSP_SuperContentsFromNativeContents(struct model_s *model, int nativec
 struct entity_render_s;
 void R_Q1BSP_DrawSky(struct entity_render_s *ent);
 void R_Q1BSP_Draw(struct entity_render_s *ent);
+void R_Q1BSP_DrawDepth(struct entity_render_s *ent);
 void R_Q1BSP_GetLightInfo(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs);
 void R_Q1BSP_CompileShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist);
 void R_Q1BSP_DrawShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);