added DrawQ_SuperPic, fixed severe bug in DrawQ_Mesh (was not allocating enough room...

[xonotic/darkplaces.git] / cl_collision.c

diff --git a/cl_collision.c b/cl_collision.c
index 22d846af766e056f3f19fc222929dc4d6c99e2ac..8269bebbf22dbedddec4c5aef1952f39976507ea 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -1,5 +1,6 @@
 
 #include "quakedef.h"
+#include "cl_collision.h"
 
 /*
 // not yet used
@@ -28,57 +29,18 @@ typedef struct physentity_s
 physentity_t;
 */
 
-static entity_render_t *traceline_entity[MAX_EDICTS];
-static int traceline_entities;
-
-// builds list of entities for TraceLine to check later
-void CL_TraceLine_ScanForBModels(void)
-{
-       int i;
-       entity_render_t *ent;
-       model_t *model;
-       traceline_entities = 0;
-       for (i = 1;i < MAX_EDICTS;i++)
-       {
-               ent = &cl_entities[i].render;
-               model = ent->model;
-               // look for embedded brush models only
-               if (model && model->name[0] == '*')
-               {
-                       // this does nothing for * models currently...
-                       //Mod_CheckLoaded(model);
-                       if (model->type == mod_brush)
-                       {
-                               traceline_entity[traceline_entities++] = ent;
-                               if (ent->angles[0] || ent->angles[2])
-                               {
-                                       // pitch or roll
-                                       VectorAdd(ent->origin, model->rotatedmins, ent->mins);
-                                       VectorAdd(ent->origin, model->rotatedmaxs, ent->maxs);
-                               }
-                               else if (ent->angles[1])
-                               {
-                                       // yaw
-                                       VectorAdd(ent->origin, model->yawmins, ent->mins);
-                                       VectorAdd(ent->origin, model->yawmaxs, ent->maxs);
-                               }
-                               else
-                               {
-                                       VectorAdd(ent->origin, model->normalmins, ent->mins);
-                                       VectorAdd(ent->origin, model->normalmaxs, ent->maxs);
-                               }
-                       }
-               }
-       }
-}
-
 int cl_traceline_endcontents;
 
-float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int contents, int hitbmodels)
+float CL_TraceLine (const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int contents, int hitbmodels, entity_render_t **hitent)
 {
-       double maxfrac;
+       float maxfrac;
+       int n;
+       entity_render_t *ent;
+       float tracemins[3], tracemaxs[3];
        trace_t trace;
 
+       if (hitent)
+               *hitent = NULL;
        Mod_CheckLoaded(cl.worldmodel);
        Collision_ClipTrace(&trace, NULL, cl.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, start, vec3_origin, vec3_origin, end);
 
@@ -88,12 +50,11 @@ float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int
                VectorCopy (trace.plane.normal, normal);
        cl_traceline_endcontents = trace.endcontents;
        maxfrac = trace.fraction;
+       if (hitent && trace.fraction < 1)
+               *hitent = &cl_entities[0].render;
 
-       if (hitbmodels && traceline_entities)
+       if (hitbmodels && cl_num_brushmodel_entities)
        {
-               int n;
-               entity_render_t *ent;
-               double /*start2[3], end2[3], */tracemins[3], tracemaxs[3];
                tracemins[0] = min(start[0], end[0]);
                tracemaxs[0] = max(start[0], end[0]);
                tracemins[1] = min(start[1], end[1]);
@@ -102,9 +63,9 @@ float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int
                tracemaxs[2] = max(start[2], end[2]);
 
                // look for embedded bmodels
-               for (n = 0;n < traceline_entities;n++)
+               for (n = 0;n < cl_num_brushmodel_entities;n++)
                {
-                       ent = traceline_entity[n];
+                       ent = cl_brushmodel_entities[n];
                        if (ent->mins[0] > tracemaxs[0] || ent->maxs[0] < tracemins[0]
                         || ent->mins[1] > tracemaxs[1] || ent->maxs[1] < tracemins[1]
                         || ent->mins[2] > tracemaxs[2] || ent->maxs[2] < tracemins[2])
@@ -120,8 +81,12 @@ float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int
                                if (normal)
                                        VectorCopy(trace.plane.normal, normal);
                                cl_traceline_endcontents = trace.endcontents;
+                               if (hitent)
+                                       *hitent = ent;
                        }
                }
        }
+       if (maxfrac < 0 || maxfrac > 1) Con_Printf("fraction out of bounds %f %s:%d\n", maxfrac, __LINE__, __FILE__);
        return maxfrac;
 }
+