Mod_FindNonSolidLocation now takes a radius and can output to a different vector...

[xonotic/darkplaces.git] / model_brush.h

diff --git a/model_brush.h b/model_brush.h
index 339c699efdf003956ecb141f3fceaac47153e5e0..0f2ee072fa7fa8e6493b3a1e6875f9c50f60fafd 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -71,6 +71,7 @@ mplane_t;
 #define SURF_SHADOWCAST 0x1000 // this polygon can cast stencil shadows
 #define SURF_SHADOWLIGHT 0x2000 // this polygon can be lit by stencil shadowing
 #define SURF_WATERALPHA 0x4000 // this polygon's alpha is modulated by r_wateralpha
+#define SURF_SOLIDCLIP 0x8000 // this polygon blocks movement
 
 #define SURFRENDER_OPAQUE 0
 #define SURFRENDER_ALPHA 1
@@ -106,18 +107,8 @@ typedef struct texture_s
        // type of rendering (SURFRENDER_ value)
        int rendertype;
 
-       // base texture without fullbrights, never NULL
-       rtexture_t *texture;
-       // fullbrights texture, NULL if no fullbrights used
-       rtexture_t *glowtexture;
-       // alpha texture (used for fogging), NULL if opaque
-       rtexture_t *fogtexture;
-       // detail texture (usually not used if transparent)
-       rtexture_t *detailtexture;
-       // normalmap for bumpmap shading
-       rtexture_t *nmaptexture;
-       // color filtering for glossy surfaces
-       rtexture_t *glosstexture;
+       // loaded the same as model skins
+       skinframe_t skin;
 
        // shader to use for this texture
        Cshader_t *shader;
@@ -173,28 +164,36 @@ surfmesh_t;
 
 typedef struct msurface_s
 {
-       // surface number, to avoid having to do a divide to find the number of a surface from it's address
-       int number;
-       // should be drawn if visframe == r_framecount (set by PrepareSurfaces)
-       int visframe;
-       // should be drawn if onscreen and not a backface (used for setting visframe)
-       //int pvsframe;
-       // chain of surfaces marked visible by pvs
-       //struct msurface_s *pvschain;
+       // bounding box for onscreen checks
+       vec3_t poly_mins;
+       vec3_t poly_maxs;
 
        // the node plane this is on, backwards if SURF_PLANEBACK flag set
        mplane_t *plane;
        // SURF_ flags
        int flags;
+       // texture mapping properties used by this surface
+       mtexinfo_t *texinfo;
+
+       // the lightmap texture fragment to use on the rendering mesh
+       rtexture_t *lightmaptexture;
+       // mesh for rendering
+       surfmesh_t *mesh;
+       // if lightmap settings changed, this forces update
+       int cached_dlight;
 
-       // look up in model->surfedges[], negative numbers are backwards edges
-       int firstedge;
-       int numedges;
+       // should be drawn if visframe == r_framecount (set by PrepareSurfaces)
+       int visframe;
+       // should be drawn if onscreen and not a backface (used for setting visframe)
+       //int pvsframe;
+       // chain of surfaces marked visible by pvs
+       //struct msurface_s *pvschain;
 
-       short texturemins[2];
-       short extents[2];
+       // surface number, to avoid having to do a divide to find the number of a surface from it's address
+       int number;
 
-       mtexinfo_t *texinfo;
+       // center for sorting transparent meshes
+       vec3_t poly_center;
 
        // index into d_lightstylevalue array, 255 means not used (black)
        qbyte styles[MAXLIGHTMAPS];
@@ -202,39 +201,31 @@ typedef struct msurface_s
        qbyte *samples;
        // stain to apply on lightmap (soot/dirt/blood/whatever)
        qbyte *stainsamples;
-
-       // these fields are generated during model loading
-       // the lightmap texture fragment to use on the surface
-       rtexture_t *lightmaptexture;
        // the stride when building lightmaps to comply with fragment update
        int lightmaptexturestride;
-       // mesh for rendering
-       surfmesh_t *mesh;
+       int texturemins[2];
+       int extents[2];
+
+       // if this == r_framecount there are dynamic lights on the surface
+       int dlightframe;
+       // which dynamic lights are touching this surface
+       // (only access this if dlightframe is current)
+       int dlightbits[8];
+       // avoid redundent addition of dlights
+       int lightframe;
+
+       // avoid multiple collision traces with a surface polygon
+       int colframe;
 
        // these are just 3D points defining the outline of the polygon,
        // no texcoord info (that can be generated from these)
        int poly_numverts;
        float *poly_verts;
-       // bounding box for onscreen checks, and center for sorting
-       vec3_t poly_mins, poly_maxs, poly_center;
 
        // neighboring surfaces (one per poly_numverts)
        //struct msurface_s **neighborsurfaces;
        // currently used only for generating static shadow volumes
        int castshadow;
-
-       // these are regenerated every frame
-       // lighting info
-       // if this == r_framecount there are dynamic lights on the surface
-       int dlightframe;
-       // which dynamic lights are touching this surface
-       // (only access this if dlightframe is current)
-       int dlightbits[8];
-       // avoid redundent addition of dlights
-       int lightframe;
-
-       // if lightmap settings changed, this forces update
-       int cached_dlight;
 }
 msurface_t;
 
@@ -371,7 +362,7 @@ struct model_s;
 void Mod_LoadBrushModel (struct model_s *mod, void *buffer);
 void Mod_BrushInit(void);
 
-void Mod_FindNonSolidLocation(vec3_t pos, struct model_s *mod);
+void Mod_FindNonSolidLocation(vec3_t in, vec3_t out, struct model_s *mod, vec_t radius);
 mleaf_t *Mod_PointInLeaf (const float *p, struct model_s *model);
 int Mod_PointContents (const float *p, struct model_s *model);
 qbyte *Mod_LeafPVS (mleaf_t *leaf, struct model_s *model);