gloss: exact specular math has min gloss exponent 4, not 1

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index a7ecd4fedc6b1eef85c7804ee5ad064b3155188d..09627f7cd8a30d3b60c8610adb109cdcb4dd3751 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -452,6 +452,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];
 
@@ -475,7 +478,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;
 
@@ -613,6 +619,9 @@ typedef struct texture_s
        // gloss
        float specularscalemod;
        float specularpowermod;
+
+       // diffuse and ambient
+       float rtlightambient;
 }
  texture_t;
 
@@ -1099,13 +1108,6 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
 extern cvar_t r_mipskins;
 extern cvar_t r_mipnormalmaps;
 
-typedef struct skeleton_s
-{
-       const dp_model_t *model;
-       matrix4x4_t *relativetransforms;
-}
-skeleton_t;
-
 typedef struct skinfileitem_s
 {
        struct skinfileitem_s *next;