X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=9ec9bf16e545ab6f55af169b358b4aa83965546e;hb=39bd84c0938ff847775cf8890d55402218446a7f;hp=89d3b2b9a9a4c8b27dee5da8a6e54b03c9fa100b;hpb=8b92078f5943f2cfacaec5432007540e1f5c6da5;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index 89d3b2b9..9ec9bf16 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -341,7 +341,7 @@ typedef struct q3shaderinfo_layer_s
 	int clampmap;
 	float framerate;
 	int numframes;
-	char texturename[TEXTURE_MAXFRAMES][Q3PATHLENGTH];
+	char** texturename;
 	int blendfunc[2];
 	q3shaderinfo_layer_rgbgen_t rgbgen;
 	q3shaderinfo_layer_alphagen_t alphagen;
@@ -368,7 +368,7 @@ typedef struct q3shaderinfo_s
 	qboolean lighting;
 	qboolean vertexalpha;
 	qboolean textureblendalpha;
-	q3shaderinfo_layer_t *primarylayer, *backgroundlayer;
+	int primarylayer, backgroundlayer;
 	q3shaderinfo_layer_t layers[Q3SHADER_MAXLAYERS];
 	char skyboxname[Q3PATHLENGTH];
 	q3shaderinfo_deform_t deforms[Q3MAXDEFORMS];
@@ -429,11 +429,10 @@ typedef struct texture_s
 	// current material flags (updated each bmodel render)
 	int currentmaterialflags;
 
-	// current PolygonOffset values for rendering this material
-	float currentpolygonfactor;
-	float currentpolygonoffset;
-	float basepolygonfactor;
-	float basepolygonoffset;
+	// PolygonOffset values for rendering this material
+	// (these are added to the r_refdef values and submodel values)
+	float biaspolygonfactor;
+	float biaspolygonoffset;
 
 	// textures to use when rendering this material
 	skinframe_t *currentskinframe;
@@ -580,6 +579,15 @@ model_sprite_t;
 
 struct trace_s;
 
+typedef struct model_brush_lightstyleinfo_s
+{
+	int style;
+	int value;
+	int numsurfaces;
+	int *surfacelist;
+}
+model_brush_lightstyleinfo_t;
+
 typedef struct model_brush_s
 {
 	// true if this model is a HalfLife .bsp file
@@ -701,11 +709,8 @@ typedef struct model_brushq1_s
 	unsigned char			*nmaplightdata; // deluxemap file
 
 	// lightmap update chains for light styles
-	int				light_styles;
-	unsigned char			*light_style;
-	int				*light_stylevalue;
-	msurface_t		***light_styleupdatechains;
-	msurface_t		**light_styleupdatechainsbuffer;
+	int				num_lightstyles;
+	model_brush_lightstyleinfo_t *data_lightstyleinfo;
 }
 model_brushq1_t;