X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_collision.c;h=3ade5bcf15d54dce4f11fe733af0ed9e0e87aefd;hb=9d92b5ea2e94eb7772405186dd70b2dbbdfc96bb;hp=5b85035f90898719d960f2f7b3da77231ac685c6;hpb=93bce2dbe64b734e74d721164369943fffe7e397;p=xonotic%2Fdarkplaces.git

diff --git a/cl_collision.c b/cl_collision.c
index 5b85035f..3ade5bcf 100644
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -29,32 +29,34 @@ 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, entity_render_t **hitent)
+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)
 {
-	float 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];
+
+	memset (&trace, 0 , sizeof(trace_t));
+	trace.fraction = 1;
+	trace.realfraction = 1;
+	VectorCopy (end, trace.endpos);
 
 	if (hitent)
-		*hitent = NULL;
+		*hitent = &cl_entities[0].render;
 	Mod_CheckLoaded(cl.worldmodel);
-	if (cl.worldmodel && cl.worldmodel->brush.TraceBox)
-		cl.worldmodel->brush.TraceBox(cl.worldmodel, vec3_origin, vec3_origin, &trace, NULL, start, vec3_origin, vec3_origin, end);
-	else
-		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;
-	if (hitent && trace.fraction < 1)
-		*hitent = &cl_entities[0].render;
+	maxrealfrac = trace.realfraction;
 
 	if (hitbmodels && cl_num_brushmodel_entities)
 	{
@@ -72,27 +74,34 @@ 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;
 
-			if (ent->model && ent->model->brush.TraceBox)
-				ent->model->brush.TraceBox(ent->model, ent->origin, ent->angles, &trace, NULL, start, vec3_origin, vec3_origin, end);
-			else
-				Collision_ClipTrace(&trace, ent, ent->model, ent->origin, ent->angles, ent->mins, ent->maxs, start, vec3_origin, vec3_origin, end);
+			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);
 
-			if (trace.allsolid || trace.startsolid || trace.fraction < maxfrac)
+			if (ent->model && ent->model->TraceBox)
+				ent->model->TraceBox(ent->model, 0, &trace, starttransformed, starttransformed, endtransformed, endtransformed, hitsupercontentsmask);
+
+			cl_traceline_startsupercontents |= trace.startsupercontents;
+			if (maxrealfrac > trace.realfraction)
 			{
-				maxfrac = trace.fraction;
-				if (impact)
-					VectorCopy(trace.endpos, impact);
-				if (normal)
-					VectorCopy(trace.plane.normal, normal);
-				cl_traceline_endcontents = trace.endcontents;
 				if (hitent)
 					*hitent = ent;
+				maxfrac = trace.fraction;
+				maxrealfrac = trace.realfraction;
+				if (normal)
+				{
+					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, __LINE__, __FILE__);
+	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;
 }
 
@@ -103,11 +112,27 @@ void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius)
 		cl.worldmodel->brush.FindNonSolidLocation(cl.worldmodel, in, out, radius);
 }
 
-int CL_PointContents(const vec3_t p)
+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.PointContents)
-		return cl.worldmodel->brush.PointContents(cl.worldmodel, p);
-	return CONTENTS_EMPTY;
+	if (cl.worldmodel && cl.worldmodel->brush.PointContentsQ1)
+		return cl.worldmodel->brush.PointContentsQ1(cl.worldmodel, p);
+	return 0;
+	*/
 }