added comments to the bloom code in R_BlendView to try to explain how it works

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index fe3adef4ec14a54e88c6f87ea97b1bb8ed047e84..e99f07cd9b66c3570a68ab797ee75e6fa549a0fe 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -61,19 +61,31 @@ mplane_t;
 #define SHADERSTAGE_NORMAL 1
 #define SHADERSTAGE_COUNT 2
 
-#define SURF_PLANEBACK 2
-#define SURF_DRAWSKY 4
-#define SURF_DRAWTURB 0x10
-#define SURF_LIGHTMAP 0x20
-#define SURF_DRAWNOALPHA 0x100
-#define SURF_DRAWFULLBRIGHT 0x200
-#define SURF_LIGHTBOTHSIDES 0x400
-#define SURF_WATERALPHA 0x4000 // this polygon's alpha is modulated by r_wateralpha
-#define SURF_SOLIDCLIP 0x8000 // this polygon blocks movement
-
-#define SURFRENDER_OPAQUE 0
-#define SURFRENDER_ALPHA 1
-#define SURFRENDER_ADD 2
+//#define SURF_PLANEBACK 2
+
+// set for anything to be transparent sorted
+#define MATERIALFLAG_TRANSPARENT 1
+// use alpha blend on this material
+#define MATERIALFLAG_ALPHA 2
+// use additive blend on this material
+#define MATERIALFLAG_ADD 4
+// turn off depth test on this material
+#define MATERIALFLAG_NODEPTHTEST 8
+// multiply alpha by r_wateralpha cvar
+#define MATERIALFLAG_WATERALPHA 16
+// draw with no lighting
+#define MATERIALFLAG_FULLBRIGHT 32
+// drawn as a normal lightmapped wall
+#define MATERIALFLAG_WALL 64
+// swirling water effect
+#define MATERIALFLAG_WATER 128
+// this surface shows the sky
+// skipped if transparent
+#define MATERIALFLAG_SKY 256
+// skips drawing the surface
+#define MATERIALFLAG_NODRAW 512
+// probably used only on q1bsp water
+#define MATERIALFLAG_LIGHTBOTHSIDES 1024
 
 struct entity_render_s;
 struct texture_s;
@@ -87,10 +99,12 @@ typedef struct texture_s
        // size
        unsigned int width, height;
        // SURF_ flags
-       unsigned int flags;
+       //unsigned int flags;
 
-       // type of rendering (SURFRENDER_ value)
-       int rendertype;
+       // base material flags
+       int basematerialflags;
+       // current material flags (updated each bmodel render)
+       int currentmaterialflags;
 
        // loaded the same as model skins
        skinframe_t skin;
@@ -134,7 +148,7 @@ typedef struct
 }
 mtexinfo_t;
 
-struct q3meffect_s;
+struct q3deffect_s;
 typedef struct msurface_s
 {
        // bounding box for onscreen checks
@@ -150,13 +164,11 @@ typedef struct msurface_s
        int num_firstshadowmeshtriangle;
 
        // the node plane this is on, backwards if SURF_PLANEBACK flag set
-       mplane_t *plane; // q1bsp
+       //mplane_t *plane; // q1bsp
        // SURF_ flags
-       int flags; // q1bsp
+       //int flags; // q1bsp
        // texture mapping properties used by this surface
        mtexinfo_t *texinfo; // q1bsp
-       // if lightmap settings changed, this forces update
-       int cached_dlight; // q1bsp
        // index into d_lightstylevalue array, 255 means not used (black)
        qbyte styles[MAXLIGHTMAPS]; // q1bsp
        // RGB lighting data [numstyles][height][width][3]
@@ -167,13 +179,10 @@ typedef struct msurface_s
        int lightmaptexturestride; // q1bsp
        int texturemins[2]; // q1bsp
        int extents[2]; // q1bsp
-       // if this == r_framecount there are dynamic lights on the surface
-       int dlightframe; // q1bsp
-       // which dynamic lights are touching this surface
-       // (only access this if dlightframe is current)
-       int dlightbits[8]; // q1bsp
+       // if lightmap settings changed, this forces update
+       int cached_dlight; // q1bsp
 
-       struct q3meffect_s *effect; // q3bsp
+       struct q3deffect_s *effect; // q3bsp
        // FIXME: collisionmarkframe should be kept in a separate array
        int collisionmarkframe; // q3bsp // don't collide twice in one trace
 }
@@ -293,9 +302,6 @@ typedef struct mlight_s
 }
 mlight_t;
 
-extern rtexture_t *r_notexture;
-extern texture_t r_notexture_mip;
-
 struct model_s;
 void Mod_Q1BSP_Load(struct model_s *mod, void *buffer);
 void Mod_IBSP_Load(struct model_s *mod, void *buffer);
@@ -593,7 +599,7 @@ typedef struct
 }
 q3dmeshvertex_t;
 
-typedef struct
+typedef struct q3deffect_s
 {
        char shadername[Q3PATHLENGTH];
        int brushindex;
@@ -777,14 +783,6 @@ typedef struct q3mbrushside_s
 }
 q3mbrushside_t;
 
-typedef struct q3meffect_s
-{
-       char shadername[Q3PATHLENGTH];
-       struct q3mbrush_s *brush;
-       int unknown; // 5 or -1
-}
-q3meffect_t;
-
 #define CHECKPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] & (1 << ((b) & 7))) : false)
 #define SETPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] |= (1 << ((b) & 7))) : false)
 #define CLEARPVSBIT(pvs,b) ((b) >= 0 ? ((pvs)[(b) >> 3] &= ~(1 << ((b) & 7))) : false)