X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=model_shared.h;h=e1969eedf3c03b2f225b7cdf38013e7ac6212a19;hb=c99d819bc0dc34da74108d3e8b917d0f83be9d47;hp=c34890cad8af0c43ee088e057f387b2a303817a0;hpb=fc9f3eecc683677641ba6f44a678ec36e33ee013;p=xonotic%2Fdarkplaces.git

diff --git a/model_shared.h b/model_shared.h
index c34890ca..e1969eed 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -432,6 +432,7 @@ typedef struct q3shaderinfo_s
 	char name[Q3PATHLENGTH];
 #define Q3SHADERINFO_COMPARE_START surfaceparms
 	int surfaceparms;
+	int surfaceflags;
 	int textureflags;
 	int numlayers;
 	qboolean lighting;
@@ -452,6 +453,9 @@ typedef struct q3shaderinfo_s
 	// add collisions to all triangles of the surface
 	qboolean dpmeshcollisions;
 
+	// kill shader based on cvar checks
+	qboolean dpshaderkill;
+
 	// fake reflection
 	char dpreflectcube[Q3PATHLENGTH];
 
@@ -468,6 +472,7 @@ typedef struct q3shaderinfo_s
 	// offsetmapping
 	dpoffsetmapping_technique_t offsetmapping;
 	float offsetscale;
+	float offsetbias; // 0 is normal, 1 leads to alpha 0 being neutral and alpha 1 pushing "out"
 
 	// polygonoffset (only used if Q3TEXTUREFLAG_POLYGONOFFSET)
 	float biaspolygonoffset, biaspolygonfactor;
@@ -475,7 +480,10 @@ typedef struct q3shaderinfo_s
 	// gloss
 	float specularscalemod;
 	float specularpowermod;
-#define Q3SHADERINFO_COMPARE_END specularpowermod
+
+	// rtlightning ambient addition
+	float rtlightambient;
+#define Q3SHADERINFO_COMPARE_END rtlightambient
 }
 q3shaderinfo_t;
 
@@ -592,7 +600,6 @@ typedef struct texture_s
 	char name[64];
 	int surfaceflags;
 	int supercontents;
-	int surfaceparms;
 	int textureflags;
 
 	// reflection
@@ -609,10 +616,14 @@ typedef struct texture_s
 	// offsetmapping
 	dpoffsetmapping_technique_t offsetmapping;
 	float offsetscale;
+	float offsetbias;
 
 	// gloss
 	float specularscalemod;
 	float specularpowermod;
+
+	// diffuse and ambient
+	float rtlightambient;
 }
  texture_t;
 
@@ -1038,6 +1049,7 @@ typedef struct model_s
 
 	// if set, the model contains light information (lightmap, or vertexlight)
 	qboolean lit;
+	float lightmapscale;
 }
 dp_model_t;