fixed some dynamic lighting bugs related to glowing self

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index c2eed625767883d9848a1d923206291c37a148f6..2998a1063e477d317803daf6f62499c63a90081e 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -57,8 +57,7 @@ mplane_t;
 
 #define SHADERSTAGE_SKY 0
 #define SHADERSTAGE_NORMAL 1
-#define SHADERSTAGE_BASELIGHTING 2
-#define SHADERSTAGE_COUNT 3
+#define SHADERSTAGE_COUNT 2
 
 #define SHADERFLAGS_NEEDLIGHTMAP 1
 
@@ -113,6 +112,10 @@ typedef struct texture_s
        rtexture_t *fogtexture;
        // detail texture (usually not used if transparent)
        rtexture_t *detailtexture;
+       // normalmap for bumpmap shading
+       rtexture_t *nmaptexture;
+       // color filtering for glossy surfaces
+       rtexture_t *glosstexture;
 
        // shader to use for this texture
        Cshader_t *shader;
@@ -191,7 +194,6 @@ typedef struct msurface_s
        short extents[2];
 
        mtexinfo_t *texinfo;
-       texture_t *currenttexture; // updated (animated) during early surface processing each frame
 
        // index into d_lightstylevalue array, 255 means not used (black)
        qbyte styles[MAXLIGHTMAPS];