added radius and radius2 (squared radius) fields to model structure

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 6fc568cf3f835777b71e110e8b5fd279c4d4f8e0..c58b238366107190284b47069823af4f2e58e0f8 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -110,13 +110,13 @@ typedef struct model_s
        vec3_t                  yawmins, yawmaxs;
        // bounding box if pitch or roll are used
        vec3_t                  rotatedmins, rotatedmaxs;
-       // usable at any angles
-//     float                   modelradius;
+       // sphere radius, usable at any angles
+       float                   radius;
+       // squared sphere radius for easier comparisons
+       float                   radius2;
 
        // brush model specific
        int                             firstmodelsurface, nummodelsurfaces;
-       // LordHavoc: sorted surface pointer array, sorted by shader type and then by texture
-       msurface_t              **modelsortedsurfaces; // [nummodelsurfaces]
 
        // lightmap format, set to r_lightmaprgba when model is loaded
        int                             lightmaprgba;
@@ -145,6 +145,9 @@ typedef struct model_s
 
        int                             numsurfaces;
        msurface_t              *surfaces;
+       int                             *surfacevisframes;
+       int                             *surfacepvsframes;
+       msurface_t              *surfacepvsnext;
 
        int                             numsurfedges;
        int                             *surfedges;
@@ -153,12 +156,12 @@ typedef struct model_s
        dclipnode_t             *clipnodes;
 
        int                             nummarksurfaces;
-       msurface_t              **marksurfaces;
+       int                             *marksurfaces;
 
        hull_t                  hulls[MAX_MAP_HULLS];
 
        int                             numtextures;
-       texture_t               **textures;
+       texture_t               *textures;
 
        qbyte                   *visdata;
        qbyte                   *lightdata;
@@ -185,6 +188,7 @@ typedef struct model_s
        float                   *mdlmd2data_texcoords;
        md2frame_t              *mdlmd2data_frames;
        trivertx_t              *mdlmd2data_pose;
+       int                             *mdlmd2data_triangleneighbors;
 
        // for Zymotic models
        void                    *zymdata_header;
@@ -196,8 +200,8 @@ typedef struct model_s
        void(*Draw)(struct entity_render_s *ent);
        // draw the model's sky polygons (only used by brush models)
        void(*DrawSky)(struct entity_render_s *ent);
-       // draw the model's shadows
-       void(*DrawShadow)(struct entity_render_s *ent);
+       // draw a fake shadow for the model
+       void(*DrawFakeShadow)(struct entity_render_s *ent);
 
        // memory pool for allocations
        mempool_t               *mempool;
@@ -222,20 +226,20 @@ extern cvar_t r_fullbrights;
 void Mod_Init (void);
 void Mod_CheckLoaded (model_t *mod);
 void Mod_ClearAll (void);
-model_t *Mod_ForName (char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel);
-void Mod_TouchModel (char *name);
+model_t *Mod_FindName (const char *name);
+model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel);
+void Mod_TouchModel (const char *name);
 void Mod_UnloadModel (model_t *mod);
 
-mleaf_t *Mod_PointInLeaf (float *p, model_t *model);
-qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model);
-
 void Mod_ClearUsed(void);
 void Mod_PurgeUnused(void);
+void Mod_LoadModels(void);
 
 extern model_t *loadmodel;
 extern char loadname[32];      // for hunk tags
 
-extern model_t *Mod_FindName (char *name);
+int Mod_FindTriangleWithEdge(int *elements, int numtriangles, int start, int end);
+void Mod_BuildTriangleNeighbors(int *neighbors, int *elements, int numtriangles);
 
 #endif // __MODEL__