two-layer sky rendering now uses GL_ARB_texture_env_combine if available to render...

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index 41d42c956eb0a970ccc36a85982138e73d2ae8ff..bd233df27923d2812f84728f9a41762a6e0d5523 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -133,9 +133,9 @@ typedef struct msurface_s
 
        int                     lightmaptexturenum;
        byte            styles[MAXLIGHTMAPS];
-       unsigned short  cached_light[MAXLIGHTMAPS];     // values currently used in lightmap
+       unsigned short cached_light[MAXLIGHTMAPS];      // values currently used in lightmap
        short           cached_dlight;                          // LordHavoc: if lightmap was lit by dynamic lights, update on frame after end of effect to erase it
-       short           cached_lighthalf;                       // LordHavoc: to cause lightmap to be rerendered when lighthalf changes
+       short           cached_lightscalebit;           // LordHavoc: to cause lightmap to be rerendered when lighthalf changes
        float           cached_ambient;                         // LordHavoc: rerender lightmaps when r_ambient changes
        byte            *samples;               // [numstyles*surfsize]
 } msurface_t;
@@ -149,6 +149,10 @@ typedef struct mnode_s
        struct mnode_s  *parent;
        struct mportal_s *portals;
 
+       // for bounding box culling
+       vec3_t          mins;
+       vec3_t          maxs;
+
 // node specific
        mplane_t        *plane;
        struct mnode_s  *children[2];
@@ -167,15 +171,15 @@ typedef struct mleaf_s
        struct mnode_s  *parent;
        struct mportal_s *portals;
 
-// leaf specific
-//     int                     visframe;               // visible if current (r_framecount)
-//     int                     worldnodeframe; // used by certain worldnode variants to avoid processing the same leaf twice in a frame
-       int                     portalmarkid;   // used by polygon-through-portals visibility checker
-
        // for bounding box culling
        vec3_t          mins;
        vec3_t          maxs;
 
+// leaf specific
+       int                     visframe;               // visible if current (r_framecount)
+       int                     worldnodeframe; // used by certain worldnode variants to avoid processing the same leaf twice in a frame
+       int                     portalmarkid;   // used by polygon-through-portals visibility checker
+
        // LordHavoc: leaf based dynamic lighting
        int                     dlightbits[8];
        int                     dlightframe;