Add r_shadow_culllights_trace feature, this culls rtlights by traceline checks simila...

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index c074d238ce200e9e3781ddf509fdf1a459c38e8a..e3120c08f48941b997598b412a300a6f36e8e650 100644 (file)
--- a/client.h
+++ b/client.h
@@ -286,7 +286,7 @@ typedef struct rtlight_s
        char cubemapname[64];
        /// light style to monitor for brightness
        int style;
-       /// whether light should render shadows
+       /// whether light should render shadows (see castshadows for whether it actually does this frame)
        int shadow;
        /// intensity of corona to render
        vec_t corona;
@@ -307,10 +307,8 @@ typedef struct rtlight_s
        /// culling
        vec3_t cullmins;
        vec3_t cullmaxs;
-       // culling
-       //vec_t cullradius;
-       // squared cullradius
-       //vec_t cullradius2;
+       /// when r_shadow_culllights_trace is set, this is refreshed by each successful trace.
+       double trace_timer;
 
        // rendering properties, updated each time a light is rendered
        // this is rtlight->color * d_lightstylevalue
@@ -323,6 +321,8 @@ typedef struct rtlight_s
        rtexture_t *currentcubemap;
        /// set by R_Shadow_PrepareLight to decide whether R_Shadow_DrawLight should draw it
        qboolean draw;
+       /// set by R_Shadow_PrepareLight to indicate whether R_Shadow_DrawShadowMaps should do anything
+       qboolean castshadows;
        /// these fields are set by R_Shadow_PrepareLight for later drawing
        int cached_numlightentities;
        int cached_numlightentities_noselfshadow;
@@ -352,6 +352,12 @@ typedef struct rtlight_s
        int compiled;
        /// the shadowing mode used to compile this light
        int shadowmode;
+       /// the size that this light should have (assuming no scene LOD kicking in to reduce it)
+       int shadowmapsidesize;
+       /// position of this light in the shadowmap atlas
+       int shadowmapatlasposition[2];
+       /// size of one side of this light in the shadowmap atlas (for omnidirectional shadowmaps this is the min corner of a 2x3 arrangement, or a 4x3 arrangement in the case of noselfshadow entities being present)
+       int shadowmapatlassidesize;
        /// premade shadow volumes to render for world entity
        shadowmesh_t *static_meshchain_shadow_zpass;
        shadowmesh_t *static_meshchain_shadow_zfail;
@@ -387,8 +393,11 @@ typedef struct rtlight_s
        rtlight_particle_t *particlecache_particles;
 
        /// bouncegrid light info
-       float photoncolor[3];
-       float photons;
+       float bouncegrid_photoncolor[3];
+       float bouncegrid_photons;
+       int bouncegrid_hits;
+       int bouncegrid_traces;
+       float bouncegrid_effectiveradius;
 }
 rtlight_t;
 
@@ -834,6 +843,7 @@ typedef struct client_static_s
        double connect_nextsendtime;
        lhnetsocket_t *connect_mysocket;
        lhnetaddress_t connect_address;
+       lhnetaddress_t rcon_address;
        // protocol version of the server we're connected to
        // (kept outside client_state_t because it's used between levels)
        protocolversion_t protocol;
@@ -863,8 +873,8 @@ typedef struct client_static_s
        // value of "qport" cvar at time of connection
        int qw_qport;
        // copied from cls.netcon->qw. variables every time they change, or set by demos (which have no cls.netcon)
-       int qw_incoming_sequence;
-       int qw_outgoing_sequence;
+       unsigned int qw_incoming_sequence;
+       unsigned int qw_outgoing_sequence;
 
        // current file download buffer (only saved when file is completed)
        char qw_downloadname[MAX_QPATH];
@@ -1416,9 +1426,9 @@ typedef struct client_state_s
 
        float qw_weaponkick;
 
-       int qw_validsequence;
+       unsigned int qw_validsequence;
 
-       int qw_deltasequence[QW_UPDATE_BACKUP];
+       unsigned int qw_deltasequence[QW_UPDATE_BACKUP];
 
        // csqc stuff:
        // server entity number corresponding to a clientside entity