X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_collision.c;h=486e87510eba289cefdbaee0fcf1b9c4890bb54e;hb=4661645372b29d5c863d5ca9fb4dfbc0d2bf96b7;hp=6457fbf2fd52392cb8c0d56f800a7afbd87cc8a4;hpb=a76b746a4cd4e319c9629348ad2fb6563ef49393;p=xonotic%2Fdarkplaces.git

diff --git a/cl_collision.c b/cl_collision.c
index 6457fbf2..486e8751 100644
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -1,5 +1,6 @@
 
 #include "quakedef.h"
+#include "cl_collision.h"
 
 /*
 // not yet used
@@ -28,28 +29,32 @@ typedef struct physentity_s
 physentity_t;
 */
 
-int cl_traceline_endcontents;
+int cl_traceline_startsupercontents;
 
-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 hitbmodels, entity_render_t **hitent, int hitsupercontentsmask)
 {
-	double maxfrac;
+	float maxfrac, maxrealfrac;
+	int n;
+	entity_render_t *ent;
+	float tracemins[3], tracemaxs[3];
 	trace_t trace;
+	matrix4x4_t matrix, imatrix;
+	float tempnormal[3], starttransformed[3], endtransformed[3];
 
+	if (hitent)
+		*hitent = &cl_entities[0].render;
 	Mod_CheckLoaded(cl.worldmodel);
-	Collision_ClipTrace(&trace, NULL, cl.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, start, vec3_origin, vec3_origin, end);
+	if (cl.worldmodel && cl.worldmodel->TraceBox)
+		cl.worldmodel->TraceBox(cl.worldmodel, 0, &trace, start, start, end, end, hitsupercontentsmask);
 
-	if (impact)
-		VectorCopy (trace.endpos, impact);
 	if (normal)
-		VectorCopy (trace.plane.normal, normal);
-	cl_traceline_endcontents = trace.endcontents;
+		VectorCopy(trace.plane.normal, normal);
+	cl_traceline_startsupercontents = trace.startsupercontents;
 	maxfrac = trace.fraction;
+	maxrealfrac = trace.realfraction;
 
 	if (hitbmodels && cl_num_brushmodel_entities)
 	{
-		int n;
-		entity_render_t *ent;
-		double 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]);
@@ -64,21 +69,65 @@ float CL_TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int
 			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])
-			 	continue;
+				continue;
+
+			Matrix4x4_CreateFromQuakeEntity(&matrix, ent->origin[0], ent->origin[1], ent->origin[2], ent->angles[0], ent->angles[1], ent->angles[2], 1);
+			Matrix4x4_Invert_Simple(&imatrix, &matrix);
+			Matrix4x4_Transform(&imatrix, start, starttransformed);
+			Matrix4x4_Transform(&imatrix, end, endtransformed);
 
-			Collision_ClipTrace(&trace, ent, ent->model, ent->origin, ent->angles, ent->mins, ent->maxs, start, vec3_origin, vec3_origin, end);
+			if (ent->model && ent->model->TraceBox)
+				ent->model->TraceBox(ent->model, 0, &trace, starttransformed, starttransformed, endtransformed, endtransformed, hitsupercontentsmask);
 
-			if (trace.allsolid || trace.startsolid || trace.fraction < maxfrac)
+			cl_traceline_startsupercontents |= trace.startsupercontents;
+			if (maxrealfrac > trace.realfraction)
 			{
+				if (hitent)
+					*hitent = ent;
 				maxfrac = trace.fraction;
-				if (impact)
-					VectorCopy(trace.endpos, impact);
+				maxrealfrac = trace.realfraction;
 				if (normal)
-					VectorCopy(trace.plane.normal, normal);
-				cl_traceline_endcontents = trace.endcontents;
+				{
+					VectorCopy(trace.plane.normal, tempnormal);
+					Matrix4x4_Transform3x3(&matrix, tempnormal, normal);
+				}
 			}
 		}
 	}
+	if (maxfrac < 0 || maxfrac > 1) Con_Printf("fraction out of bounds %f %s:%d\n", maxfrac, __FILE__, __LINE__);
+	if (impact)
+		VectorLerp(start, maxfrac, end, impact);
 	return maxfrac;
 }
 
+void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius)
+{
+	// FIXME: check multiple brush models
+	if (cl.worldmodel && cl.worldmodel->brush.FindNonSolidLocation)
+		cl.worldmodel->brush.FindNonSolidLocation(cl.worldmodel, in, out, radius);
+}
+
+int CL_PointQ1Contents(const vec3_t p)
+{
+	CL_TraceLine(p, p, NULL, NULL, true, NULL, 0);
+	return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, cl_traceline_startsupercontents);
+	/*
+	// FIXME: check multiple brush models
+	if (cl.worldmodel && cl.worldmodel->brush.PointContentsQ1)
+		return cl.worldmodel->brush.PointContentsQ1(cl.worldmodel, p);
+	return 0;
+	*/
+}
+
+int CL_PointSuperContents(const vec3_t p)
+{
+	CL_TraceLine(p, p, NULL, NULL, true, NULL, 0);
+	return cl_traceline_startsupercontents;
+	/*
+	// FIXME: check multiple brush models
+	if (cl.worldmodel && cl.worldmodel->brush.PointContentsQ1)
+		return cl.worldmodel->brush.PointContentsQ1(cl.worldmodel, p);
+	return 0;
+	*/
+}
+