no longer uses rectangle textures for deferred rendering (reduces

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index b455609ad7b367bb634a33f72cafe38570dcdec4..19b252b1200971be1c642a0d59d90ce217f15c04 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -30,7 +30,7 @@ m*_t structures are in-memory
 
 */
 
-typedef enum modtype_e {mod_invalid, mod_brushq1, mod_sprite, mod_alias, mod_brushq2, mod_brushq3, mod_null} modtype_t;
+typedef enum modtype_e {mod_invalid, mod_brushq1, mod_sprite, mod_alias, mod_brushq2, mod_brushq3, mod_obj, mod_null} modtype_t;
 
 typedef struct animscene_s
 {
@@ -408,16 +408,6 @@ typedef enum texturelayertype_e
 }
 texturelayertype_t;
 
-typedef enum texturelayerflag_e
-{
-       // indicates that the pass should apply fog darkening; used on
-       // transparent surfaces where simply blending an alpha fog as a final
-       // pass would not behave properly, so all the surfaces must be darkened,
-       // and the fog color added as a separate pass
-       TEXTURELAYERFLAG_FOGDARKEN = 1,
-}
-texturelayerflag_t;
-
 typedef struct texturelayer_s
 {
        texturelayertype_t type;
@@ -427,7 +417,6 @@ typedef struct texturelayer_s
        rtexture_t *texture;
        matrix4x4_t texmatrix;
        vec4_t color;
-       int flags;
 }
 texturelayer_t;
 
@@ -491,10 +480,17 @@ typedef struct texture_s
        q3shaderinfo_deform_t deforms[Q3MAXDEFORMS];
 
        qboolean colormapping;
-       rtexture_t *basetexture;
-       rtexture_t *glosstexture;
-       rtexture_t *backgroundbasetexture;
-       rtexture_t *backgroundglosstexture;
+       rtexture_t *basetexture; // original texture without pants/shirt/glow
+       rtexture_t *pantstexture; // pants only (in greyscale)
+       rtexture_t *shirttexture; // shirt only (in greyscale)
+       rtexture_t *nmaptexture; // normalmap (bumpmap for dot3)
+       rtexture_t *glosstexture; // glossmap (for dot3)
+       rtexture_t *glowtexture; // glow only (fullbrights)
+       rtexture_t *fogtexture; // alpha of the base texture (if not opaque)
+       rtexture_t *backgroundbasetexture; // original texture without pants/shirt/glow
+       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
@@ -751,6 +747,7 @@ typedef struct model_brushq1_s
 
        // this contains bytes that are 1 if a surface needs its lightmap rebuilt
        unsigned char *lightmapupdateflags;
+       qboolean firstrender; // causes all surface lightmaps to be loaded in first frame
 }
 model_brushq1_t;
 
@@ -1011,6 +1008,7 @@ skinfile_t;
 skinfile_t *Mod_LoadSkinFiles(void);
 void Mod_FreeSkinFiles(skinfile_t *skinfile);
 int Mod_CountSkinFiles(skinfile_t *skinfile);
+void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, const char *meshname, const char *shadername);
 
 void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float snap);
 int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f);