X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_collision.c;h=5e59158fa4a3dc03b207f54bbe0354c633ad3461;hp=1bc60f72a26ae88411683ccd7e507654d87179dd;hb=4147f4e4f3341da88dfbe4df2c5bdab97e8cd08c;hpb=5715fdeb47caa02252ab9b6c0895310e43bea716

diff --git a/cl_collision.c b/cl_collision.c
index 1bc60f72..5e59158f 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,36 @@ typedef struct physentity_s
 physentity_t;
 */
 
-int cl_traceline_endcontents;
+int cl_traceline_startsupercontents;
 
-float CL_TraceLine (const vec3_t start, const 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;
+	float tempnormal[3], starttransformed[3], endtransformed[3];
 
+	memset (&trace, 0 , sizeof(trace_t));
+	trace.fraction = 1;
+	trace.realfraction = 1;
+	VectorCopy (end, trace.endpos);
+
+	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 +73,137 @@ float CL_TraceLine (const vec3_t start, const vec3_t end, vec3_t impact, vec3_t
 			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_Transform(&ent->inversematrix, start, starttransformed);
+			Matrix4x4_Transform(&ent->inversematrix, 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(&ent->matrix, tempnormal, normal);
+				}
 			}
 		}
 	}
+	maxfrac = bound(0, maxfrac, 1);
+	maxrealfrac = bound(0, maxrealfrac, 1);
+	//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;
 }
 
+float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent)
+{
+	float maxfrac, maxrealfrac;
+	int n;
+	entity_render_t *ent;
+	float tracemins[3], tracemaxs[3];
+	trace_t trace;
+	float tempnormal[3], starttransformed[3], endtransformed[3];
+
+	memset (&trace, 0 , sizeof(trace_t));
+	trace.fraction = 1;
+	trace.realfraction = 1;
+	VectorCopy (end, trace.endpos);
+
+	if (hitent)
+		*hitent = 0;
+	Mod_CheckLoaded(cl.worldmodel);
+	if (cl.worldmodel && cl.worldmodel->TraceBox)
+		cl.worldmodel->TraceBox(cl.worldmodel, 0, &trace, start, start, end, end, SUPERCONTENTS_SOLID);
+
+	if (normal)
+		VectorCopy(trace.plane.normal, normal);
+	cl_traceline_startsupercontents = trace.startsupercontents;
+	maxfrac = trace.fraction;
+	maxrealfrac = trace.realfraction;
+
+	tracemins[0] = min(start[0], end[0]);
+	tracemaxs[0] = max(start[0], end[0]);
+	tracemins[1] = min(start[1], end[1]);
+	tracemaxs[1] = max(start[1], end[1]);
+	tracemins[2] = min(start[2], end[2]);
+	tracemaxs[2] = max(start[2], end[2]);
+
+	// look for embedded bmodels
+	for (n = 0;n < MAX_EDICTS;n++)
+	{
+		if (!cl_entities_active[n])
+			continue;
+		ent = &cl_entities[n].render;
+		if (!BoxesOverlap(ent->mins, ent->maxs, tracemins, tracemaxs))
+			continue;
+		if (!ent->model || !ent->model->TraceBox)
+			continue;
+		// if transparent and not selectable, skip entity
+		if (!(cl_entities[n].state_current.effects & EF_SELECTABLE) && (ent->alpha < 1 || (ent->effects & (EF_ADDITIVE | EF_NODEPTHTEST))))
+			continue;
+		Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
+		Matrix4x4_Transform(&ent->inversematrix, end, endtransformed);
+
+		if (ent->model && ent->model->TraceBox)
+			ent->model->TraceBox(ent->model, ent->frameblend[0].frame, &trace, starttransformed, starttransformed, endtransformed, endtransformed, SUPERCONTENTS_SOLID);
+
+		cl_traceline_startsupercontents |= trace.startsupercontents;
+		if (maxrealfrac > trace.realfraction)
+		{
+			if (hitent)
+				*hitent = n;
+			maxfrac = trace.fraction;
+			maxrealfrac = trace.realfraction;
+			if (normal)
+			{
+				VectorCopy(trace.plane.normal, tempnormal);
+				Matrix4x4_Transform3x3(&ent->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;
+	*/
+}
+