X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=f913e4bd89bd85cf68284558f5e898b0c992759a;hb=fa52203a89fe2b289fa7e1196dedf05329ff0728;hp=f48a1bbd08d15bb89a7c145f0573f37256e779ec;hpb=f94d0332f2786609fbcddd1b9516e8d83d7c3eeb;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index f48a1bbd..f913e4bd 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -614,14 +614,29 @@ typedef struct texture_s
 	rtexture_t *backgroundnmaptexture; // normalmap (bumpmap for dot3)
 	rtexture_t *backgroundglosstexture; // glossmap (for dot3)
 	rtexture_t *backgroundglowtexture; // glow only (fullbrights)
-	float specularscale;
 	float specularpower;
-	// color tint (colormod * currentalpha) used for rtlighting this material
-	float dlightcolor[3];
-	// color tint (colormod * 2) used for lightmapped lighting on this material
-	// includes alpha as 4th component
-	// replaces role of gl_Color in GLSL shader
-	float lightmapcolor[4];
+
+	// rendering parameters - updated by R_GetCurrentTexture using rsurface.render_* fields
+	// (almost) all map textures are lightmap (no MATERIALFLAG_MODELLIGHT set),
+	// (almost) all model textures are MATERIALFLAG_MODELLIGHT,
+	// MATERIALFLAG_FULLBRIGHT is rendered as a forced MATERIALFLAG_MODELLIGHT with rtlights disabled
+	float render_glowmod[3];
+	// MATERIALFLAG_MODELLIGHT uses these parameters
+	float render_modellight_ambient[3];
+	float render_modellight_diffuse[3];
+	float render_modellight_lightdir[3];
+	float render_modellight_specular[3];
+	// lightmap rendering (not MATERIALFLAG_MODELLIGHT)
+	float render_lightmap_ambient[3];
+	float render_lightmap_diffuse[3];
+	float render_lightmap_specular[3];
+	// rtlights use these colors for the materials on this entity
+	float render_rtlight_diffuse[3];
+	float render_rtlight_specular[3];
+	// tint applied on top of render_*_diffuse for pants layer
+	float render_colormap_pants[3];
+	// tint applied on top of render_*_diffuse for shirt layer
+	float render_colormap_shirt[3];
 
 	// from q3 shaders
 	int customblendfunc[2];
@@ -852,8 +867,8 @@ typedef struct model_brush_s
 	shadowmesh_t *collisionmesh;
 
 	// common functions
-	int (*SuperContentsFromNativeContents)(struct model_s *model, int nativecontents);
-	int (*NativeContentsFromSuperContents)(struct model_s *model, int supercontents);
+	int (*SuperContentsFromNativeContents)(int nativecontents);
+	int (*NativeContentsFromSuperContents)(int supercontents);
 	unsigned char *(*GetPVS)(struct model_s *model, const vec3_t p);
 	int (*FatPVS)(struct model_s *model, const vec3_t org, vec_t radius, unsigned char *pvsbuffer, int pvsbufferlength, qboolean merge);
 	int (*BoxTouchingPVS)(struct model_s *model, const unsigned char *pvs, const vec3_t mins, const vec3_t maxs);
@@ -1225,11 +1240,11 @@ qboolean Mod_AllocLightmap_Block(mod_alloclightmap_state_t *state, int blockwidt
 // bsp models
 void Mod_BrushInit(void);
 // used for talking to the QuakeC mainly
-int Mod_Q1BSP_NativeContentsFromSuperContents(struct model_s *model, int supercontents);
-int Mod_Q1BSP_SuperContentsFromNativeContents(struct model_s *model, int nativecontents);
+int Mod_Q1BSP_NativeContentsFromSuperContents(int supercontents);
+int Mod_Q1BSP_SuperContentsFromNativeContents(int nativecontents);
 // used for loading wal files in Mod_LoadTextureFromQ3Shader
-int Mod_Q2BSP_SuperContentsFromNativeContents(dp_model_t *model, int nativecontents);
-int Mod_Q2BSP_NativeContentsFromSuperContents(dp_model_t *model, int supercontents);
+int Mod_Q2BSP_SuperContentsFromNativeContents(int nativecontents);
+int Mod_Q2BSP_NativeContentsFromSuperContents(int supercontents);
 
 // a lot of model formats use the Q1BSP code, so here are the prototypes...
 struct entity_render_s;