added GLSL shader path for normal rendering stage, reworked a lot of things to do...

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index bcb79f103798daa4b2f9b91d465bfee52c2cc9a7..080daf0eb9654343e0923ef152ccfad5039b7fdb 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -174,43 +174,6 @@ typedef struct svbspmesh_s
 }
 svbspmesh_t;
 
-typedef struct mlight_s
-{
-       // location of light
-       vec3_t origin;
-       // distance attenuation scale (smaller is a larger light)
-       float falloff;
-       // color and brightness combined
-       vec3_t light;
-       // brightness bias, used for limiting radius without a hard edge
-       float subtract;
-       // spotlight direction
-       vec3_t spotdir;
-       // cosine of spotlight cone angle (or 0 if not a spotlight)
-       float spotcone;
-       // distance bias (larger value is softer and darker)
-       float distbias;
-       // light style controlling this light
-       int style;
-       // maximum extent of the light for shading purposes
-       float lightradius;
-       // maximum extent of the light for culling purposes
-       float cullradius;
-       float cullradius2;
-       /*
-       // surfaces this shines on
-       int numsurfaces;
-       msurface_t **surfaces;
-       // lit area
-       vec3_t mins, maxs;
-       // precomputed shadow volume meshs
-       //svbspmesh_t *shadowvolume;
-       //vec3_t shadowvolumemins, shadowvolumemaxs;
-       shadowmesh_t *shadowvolume;
-       */
-}
-mlight_t;
-
 // Q2 bsp stuff
 
 #define Q2BSPVERSION   38
@@ -245,7 +208,7 @@ typedef struct q2dheader_s
 {
        int                     ident;
        int                     version;
-       lump_t          lumps[HEADER_LUMPS];
+       lump_t          lumps[Q2HEADER_LUMPS];
 } q2dheader_t;
 
 typedef struct q2dmodel_s
@@ -419,7 +382,7 @@ typedef struct q3dheader_s
 {
        int                     ident;
        int                     version;
-       lump_t          lumps[HEADER_LUMPS];
+       lump_t          lumps[Q3HEADER_LUMPS];
 } q3dheader_t;
 
 typedef struct q3dtexture_s