use dynamic eye position-centered bouncegrid when rendering in dynamic

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 8b15a6ef46cc1978d3ff54161dfd733f6442eb4b..9950b0fefac46eeb95e6b69d9146c9575af97468 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -101,13 +101,6 @@ typedef struct blendweights_s
 }
 blendweights_t;
 
-typedef struct r_vertexposition_s
-{
-       // 12 bytes
-       float vertex3f[3];
-}
-r_vertexposition_t;
-
 typedef struct r_vertexgeneric_s
 {
        // 24 bytes
@@ -130,6 +123,15 @@ typedef struct r_vertexmesh_s
 }
 r_vertexmesh_t;
 
+typedef struct r_vertexbouncelight_s
+{
+       // 32 bytes
+       float vertex3f[3];
+       unsigned char color4ub[4];
+       float texcoord4f[4];
+}
+r_vertexbouncelight_t;
+
 typedef struct r_meshbuffer_s
 {
        int bufferobject; // OpenGL
@@ -137,6 +139,7 @@ typedef struct r_meshbuffer_s
        size_t size;
        qboolean isindexbuffer;
        qboolean isdynamic;
+       qboolean isindex16;
        char name[MAX_QPATH];
 }
 r_meshbuffer_t;
@@ -189,9 +192,8 @@ typedef struct surfmesh_s
        qboolean isanimated;
 
        // vertex and index buffers for rendering
-       r_vertexposition_t *vertexposition;
        r_vertexmesh_t *vertexmesh;
-       r_meshbuffer_t *vertexpositionbuffer;
+       r_meshbuffer_t *vertex3fbuffer;
        r_meshbuffer_t *vertexmeshbuffer;
 }
 surfmesh_t;
@@ -243,9 +245,8 @@ typedef struct shadowmesh_s
        size_t vbooffset_texcoord2f;
        // vertex/index buffers for rendering
        // (created by Mod_ShadowMesh_Finish if possible)
-       r_vertexposition_t *vertexposition;
        r_vertexmesh_t *vertexmesh; // usually NULL
-       r_meshbuffer_t *vertexpositionbuffer;
+       r_meshbuffer_t *vertex3fbuffer;
        r_meshbuffer_t *vertexmeshbuffer; // usually NULL
 }
 shadowmesh_t;
@@ -470,11 +471,15 @@ typedef struct q3shaderinfo_s
        float reflectfactor; // amount of reflection distort (1.0 = like the cvar specifies)
        vec4_t reflectcolor4f; // color tint of reflection (including alpha factor)
        float r_water_wateralpha; // additional wateralpha to apply when r_water is active
+       float r_water_waterscroll[2]; // water normalmapscrollblend - scale and speed
 
        // offsetmapping
        dpoffsetmapping_technique_t offsetmapping;
        float offsetscale;
 
+       // polygonoffset (only used if Q3TEXTUREFLAG_POLYGONOFFSET)
+       float biaspolygonoffset, biaspolygonfactor;
+
        // gloss
        float specularscalemod;
        float specularpowermod;
@@ -487,7 +492,7 @@ typedef enum texturelayertype_e
        TEXTURELAYERTYPE_INVALID,
        TEXTURELAYERTYPE_LITTEXTURE,
        TEXTURELAYERTYPE_TEXTURE,
-       TEXTURELAYERTYPE_FOG,
+       TEXTURELAYERTYPE_FOG
 }
 texturelayertype_t;
 
@@ -606,6 +611,7 @@ typedef struct texture_s
        float reflectfactor; // amount of reflection distort (1.0 = like the cvar specifies)
        vec4_t reflectcolor4f; // color tint of reflection (including alpha factor)
        float r_water_wateralpha; // additional wateralpha to apply when r_water is active
+       float r_water_waterscroll[2]; // scale and speed
        int camera_entity; // entity number for use by cameras
 
        // offsetmapping
@@ -878,7 +884,9 @@ typedef struct model_brushq3_s
        // lightmap textures
        int num_originallightmaps;
        int num_mergedlightmaps;
-       int num_lightmapmergepower;
+       int num_lightmapmergedwidthpower;
+       int num_lightmapmergedheightpower;
+       int num_lightmapmergedwidthheightdeluxepower;
        int num_lightmapmerge;
        rtexture_t **data_lightmaps;
        rtexture_t **data_deluxemaps;
@@ -1016,6 +1024,7 @@ typedef struct model_s
        void(*DrawLight)(struct entity_render_s *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs);
        // trace a box against this model
        void (*TraceBox)(struct model_s *model, const struct frameblend_s *frameblend, const struct skeleton_s *skeleton, struct trace_s *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask);
+       void (*TraceBrush)(struct model_s *model, const struct frameblend_s *frameblend, const struct skeleton_s *skeleton, struct trace_s *trace, struct colbrushf_s *start, struct colbrushf_s *end, int hitsupercontentsmask);
        // trace a box against this model
        void (*TraceLine)(struct model_s *model, const struct frameblend_s *frameblend, const struct skeleton_s *skeleton, struct trace_s *trace, const vec3_t start, const vec3_t end, int hitsupercontentsmask);
        // trace a point against this model (like PointSuperContents)
@@ -1032,6 +1041,9 @@ typedef struct model_s
        model_brushq3_t brushq3;
        // flags this model for offseting sounds to the model center (used by brush models)
        int soundfromcenter;
+
+       // if set, the model contains light information (lightmap, or vertexlight)
+       qboolean lit;
 }
 dp_model_t;
 
@@ -1044,6 +1056,7 @@ extern unsigned char *mod_base;
 //extern cvar_t gl_subdivide_size;
 // texture fullbrights
 extern cvar_t r_fullbrights;
+extern cvar_t r_enableshadowvolumes;
 
 void Mod_Init (void);
 void Mod_Reload (void);
@@ -1090,6 +1103,7 @@ q3shaderinfo_t *Mod_LookupQ3Shader(const char *name);
 qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean warnmissing, qboolean fallback, int defaulttexflags);
 
 extern cvar_t r_mipskins;
+extern cvar_t r_mipnormalmaps;
 
 typedef struct skeleton_s
 {
@@ -1168,6 +1182,7 @@ void R_Q1BSP_DrawLight(struct entity_render_s *ent, int numsurfaces, const int *
 void Mod_CollisionBIH_TracePoint(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, const vec3_t start, int hitsupercontentsmask);
 void Mod_CollisionBIH_TraceLine(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, const vec3_t start, const vec3_t end, int hitsupercontentsmask);
 void Mod_CollisionBIH_TraceBox(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask);
+void Mod_CollisionBIH_TraceBrush(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, struct colbrushf_s *start, struct colbrushf_s *end, int hitsupercontentsmask);
 void Mod_CollisionBIH_TracePoint_Mesh(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, const vec3_t start, int hitsupercontentsmask);
 int Mod_CollisionBIH_PointSuperContents_Mesh(struct model_s *model, int frame, const vec3_t point);
 bih_t *Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces, bih_t *out);