Fix gl_texturecompression_sprites to check for gl_texturecompression. Rough patch...

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 3247d0f96e49a57af337234583e2bb1fe9aab1a2..c34890cad8af0c43ee088e057f387b2a303817a0 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -103,18 +103,18 @@ blendweights_t;
 
 typedef struct r_vertexgeneric_s
 {
-       // 24 bytes
+       // 36 bytes
        float vertex3f[3];
-       unsigned char color4ub[4];
+       float color4f[4];
        float texcoord2f[2];
 }
 r_vertexgeneric_t;
 
 typedef struct r_vertexmesh_s
 {
-       // 68 bytes
+       // 80 bytes
        float vertex3f[3];
-       unsigned char color4ub[4];
+       float color4f[4];
        float texcoordtexture2f[2];
        float texcoordlightmap2f[2];
        float svector3f[3];
@@ -445,6 +445,7 @@ typedef struct q3shaderinfo_s
        // dp-specific additions:
 
        // shadow control
+       qboolean dpnortlight;
        qboolean dpshadow;
        qboolean dpnoshadow;
 
@@ -1022,6 +1023,8 @@ typedef struct model_s
        void (*TracePoint)(struct model_s *model, const struct frameblend_s *frameblend, const struct skeleton_s *skeleton, struct trace_s *trace, const vec3_t start, int hitsupercontentsmask);
        // find the supercontents value at a point in this model
        int (*PointSuperContents)(struct model_s *model, int frame, const vec3_t point);
+       // trace a line against geometry in this model and report correct texture (used by r_shadow_bouncegrid)
+       void (*TraceLineAgainstSurfaces)(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);
        // fields belonging to some types of model
        model_sprite_t  sprite;
        model_brush_t   brush;
@@ -1096,13 +1099,6 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
 extern cvar_t r_mipskins;
 extern cvar_t r_mipnormalmaps;
 
-typedef struct skeleton_s
-{
-       const dp_model_t *model;
-       matrix4x4_t *relativetransforms;
-}
-skeleton_t;
-
 typedef struct skinfileitem_s
 {
        struct skinfileitem_s *next;