bring back old glibc workaround

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index a7ecd4fedc6b1eef85c7804ee5ad064b3155188d..ff098bbfad02b37420cffc9c66cadf739d8d6cc3 100644 (file)
--- 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;
 
@@ -968,10 +979,10 @@ typedef struct model_s
        // for skeletal models
        int                             num_bones;
        aliasbone_t             *data_bones;
-       float                   num_posescale; // scaling factor from origin in poses6s format (includes divide by 32767)
-       float                   num_poseinvscale; // scaling factor to origin in poses6s format (includes multiply by 32767)
+       float                   num_posescale; // scaling factor from origin in poses7s format (includes divide by 32767)
+       float                   num_poseinvscale; // scaling factor to origin in poses7s format (includes multiply by 32767)
        int                             num_poses;
-       short                   *data_poses6s; // origin xyz, quat xyz, w implied negative, unit length, values normalized to +/-32767 range
+       short                   *data_poses7s; // origin xyz, quat xyzw, unit length, values normalized to +/-32767 range
        float                   *data_baseboneposeinverse;
        // textures of this model
        int                             num_textures;
@@ -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;
 
@@ -1099,13 +1111,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;