X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=world.c;h=338de3ddfef538d87b5f1686a8269df4851bbfe2;hb=168e698298ba31a1d0c53fff93a7156229c42183;hp=85a53826222b91bb7c7d8de5ec696f6f2f817149;hpb=3e259a1be67a618c83d16972843e4c3407e25dc4;p=xonotic%2Fdarkplaces.git

diff --git a/world.c b/world.c
index 85a53826..338de3dd 100644
--- a/world.c
+++ b/world.c
@@ -30,7 +30,6 @@ line of sight checks trace->inopen and trace->inwater, but bullets don't
 */
 
 cvar_t sv_debugmove = {CVAR_NOTIFY, "sv_debugmove", "0"};
-cvar_t sv_polygoncollisions = {CVAR_NOTIFY, "sv_polygoncollisions", "0"};
 cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64"};
 
 void SV_AreaStats_f(void);
@@ -38,7 +37,6 @@ void SV_AreaStats_f(void);
 void SV_World_Init(void)
 {
 	Cvar_RegisterVariable(&sv_debugmove);
-	Cvar_RegisterVariable(&sv_polygoncollisions);
 	Cvar_RegisterVariable(&sv_areagrid_mingridsize);
 	Cmd_AddCommand("sv_areastats", SV_AreaStats_f);
 	Collision_Init();
@@ -55,9 +53,6 @@ typedef struct
 	// size when clipping against monsters
 	vec3_t mins2, maxs2;
 
-	// size when clipping against brush models
-	vec3_t hullmins, hullmaxs;
-
 	// start and end origin of move
 	vec3_t start, end;
 
@@ -283,7 +278,10 @@ void SV_TouchAreaGrid(edict_t *ent)
 void SV_LinkEdict_AreaGrid(edict_t *ent)
 {
 	areagrid_t *grid;
-	int igrid[3], igridmins[3], igridmaxs[3], gridnum;
+	int igrid[3], igridmins[3], igridmaxs[3], gridnum, entitynumber = NUM_FOR_EDICT(ent);
+
+	if (entitynumber <= 0 || entitynumber >= sv.max_edicts || EDICT_NUM(entitynumber) != ent)
+		Host_Error("SV_LinkEdict_AreaGrid: invalid edict %p (sv.edicts is %p, edict compared to sv.edicts is %i)\n", ent, sv.edicts, entitynumber);
 
 	igridmins[0] = (int) ((ent->v->absmin[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
 	igridmins[1] = (int) ((ent->v->absmin[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
@@ -295,9 +293,9 @@ void SV_LinkEdict_AreaGrid(edict_t *ent)
 	{
 		// wow, something outside the grid, store it as such
 		if (ent->v->solid == SOLID_TRIGGER)
-			InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.trigger_edicts, NUM_FOR_EDICT(ent));
+			InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.trigger_edicts, entitynumber);
 		else
-			InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.solid_edicts, NUM_FOR_EDICT(ent));
+			InsertLinkBefore (&ent->e->areagrid[0], &sv_areagrid_outside.solid_edicts, entitynumber);
 		return;
 	}
 
@@ -308,9 +306,9 @@ void SV_LinkEdict_AreaGrid(edict_t *ent)
 		for (igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++, gridnum++)
 		{
 			if (ent->v->solid == SOLID_TRIGGER)
-				InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->trigger_edicts, NUM_FOR_EDICT(ent));
+				InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->trigger_edicts, entitynumber);
 			else
-				InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->solid_edicts, NUM_FOR_EDICT(ent));
+				InsertLinkBefore (&ent->e->areagrid[gridnum], &grid->solid_edicts, entitynumber);
 		}
 	}
 }
@@ -343,8 +341,9 @@ void SV_LinkEdict (edict_t *ent, qboolean touch_triggers)
 		model = sv.models[(int) ent->v->modelindex];
 		if (model != NULL)
 		{
-			if (model->type != mod_brush)
-				Host_Error("SOLID_BSP with non-BSP model\n");
+			Mod_CheckLoaded(model);
+			if (!model->TraceBox)
+				Host_Error("SOLID_BSP with non-collidable model\n");
 
 			if (ent->v->angles[0] || ent->v->angles[2] || ent->v->avelocity[0] || ent->v->avelocity[2])
 			{
@@ -449,36 +448,67 @@ Handles selection or creation of a clipping hull, and offseting (and
 eventually rotation) of the end points
 ==================
 */
-trace_t SV_ClipMoveToEntity (edict_t *ent, vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end)
+trace_t SV_ClipMoveToEntity(edict_t *ent, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int movetype)
 {
 	int i;
 	trace_t trace;
-	model_t *model;
-
-	i = ent->v->modelindex;
-	if ((unsigned int) i >= MAX_MODELS)
-		Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
-	model = sv.models[i];
-	if (i != 0 && model == NULL)
-		Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+	model_t *model = NULL;
+	matrix4x4_t matrix, imatrix;
+	float tempnormal[3], starttransformed[3], endtransformed[3];
+	float starttransformedmins[3], starttransformedmaxs[3], endtransformedmins[3], endtransformedmaxs[3];
 
-	if ((int) ent->v->solid == SOLID_BSP)
+	if ((int) ent->v->solid == SOLID_BSP || movetype == MOVE_HITMODEL)
 	{
+		i = ent->v->modelindex;
+		if ((unsigned int) i >= MAX_MODELS)
+			Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+		model = sv.models[i];
+		if (i != 0 && model == NULL)
+			Host_Error("SV_ClipMoveToEntity: invalid modelindex\n");
+
 		Mod_CheckLoaded(model);
-		if (model->type != mod_brush)
+		if ((int) ent->v->solid == SOLID_BSP)
 		{
-			Con_Printf ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model, entity dump:\n");
-			ED_Print (ent);
-			Host_Error ("SV_ClipMoveToEntity: SOLID_BSP with a non bsp model\n");
+			if (!model->TraceBox)
+			{
+				Con_Printf("SV_ClipMoveToEntity: SOLID_BSP with a non-collidable model, entity dump:\n");
+				ED_Print(ent);
+				Host_Error("SV_ClipMoveToEntity: SOLID_BSP with a non-collidable model\n");
+			}
+			if (ent->v->movetype != MOVETYPE_PUSH)
+				Host_Error("SV_ClipMoveToEntity: SOLID_BSP without MOVETYPE_PUSH");
 		}
-		if (ent->v->movetype != MOVETYPE_PUSH)
-			Host_Error ("SV_ClipMoveToEntity: SOLID_BSP without MOVETYPE_PUSH");
 	}
 
-	if (sv_polygoncollisions.integer && (mins[0] != maxs[0] || mins[1] != maxs[1] || mins[2] != maxs[2]))
-		Collision_PolygonClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end);
+	Matrix4x4_CreateFromQuakeEntity(&matrix, ent->v->origin[0], ent->v->origin[1], ent->v->origin[2], ent->v->angles[0], ent->v->angles[1], ent->v->angles[2], 1);
+	Matrix4x4_Invert_Simple(&imatrix, &matrix);
+	Matrix4x4_Transform(&imatrix, start, starttransformed);
+	Matrix4x4_Transform(&imatrix, end, endtransformed);
+
+	if (model && model->TraceBox)
+	{
+		int frame;
+		frame = (int)ent->v->frame;
+		frame = bound(0, frame, (model->numframes - 1));
+		VectorAdd(starttransformed, maxs, starttransformedmaxs);
+		VectorAdd(endtransformed, maxs, endtransformedmaxs);
+		VectorAdd(starttransformed, mins, starttransformedmins);
+		VectorAdd(endtransformed, mins, endtransformedmins);
+		model->TraceBox(model, frame, &trace, starttransformedmins, starttransformedmaxs, endtransformedmins, endtransformedmaxs, SUPERCONTENTS_SOLID);
+	}
+	else
+		Collision_ClipTrace_Box(&trace, ent->v->mins, ent->v->maxs, starttransformed, mins, maxs, endtransformed, SUPERCONTENTS_SOLID, SUPERCONTENTS_SOLID);
+
+	if (trace.fraction < 1 || trace.startsolid)
+	{
+		trace.ent = ent;
+		VectorLerp(start, trace.fraction, end, trace.endpos);
+		VectorCopy(trace.plane.normal, tempnormal);
+		Matrix4x4_Transform3x3(&matrix, tempnormal, trace.plane.normal);
+		// FIXME: should recalc trace.plane.dist
+	}
 	else
-		Collision_ClipTrace(&trace, ent, model, ent->v->origin, ent->v->angles, ent->v->mins, ent->v->maxs, start, mins, maxs, end);
+		VectorCopy(end, trace.endpos);
 
 	return trace;
 }
@@ -517,7 +547,7 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list)
 
 		if (clip->passedict)
 		{
-			if (clip->passedict->v->size[0] && !touch->v->size[0])
+			if (!clip->passedict->v->size[0] && !touch->v->size[0])
 				continue;	// points never interact
 			if (PROG_TO_EDICT(touch->v->owner) == clip->passedict)
 				continue;	// don't clip against own missiles
@@ -540,19 +570,19 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list)
 
 		// might interact, so do an exact clip
 		if (touch->v->solid == SOLID_BSP)
-			trace = SV_ClipMoveToEntity (touch, clip->start, clip->hullmins, clip->hullmaxs, clip->end);
+			trace = SV_ClipMoveToEntity(touch, clip->start, clip->mins, clip->maxs, clip->end, clip->type);
 		else if ((int)touch->v->flags & FL_MONSTER)
-			trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins2, clip->maxs2, clip->end);
+			trace = SV_ClipMoveToEntity(touch, clip->start, clip->mins2, clip->maxs2, clip->end, clip->type);
 		else
-			trace = SV_ClipMoveToEntity (touch, clip->start, clip->mins, clip->maxs, clip->end);
+			trace = SV_ClipMoveToEntity(touch, clip->start, clip->mins, clip->maxs, clip->end, clip->type);
 		// LordHavoc: take the 'best' answers from the new trace and combine with existing data
 		if (trace.allsolid)
 			clip->trace.allsolid = true;
 		if (trace.startsolid)
 		{
 			clip->trace.startsolid = true;
-			if (!clip->trace.ent)
-				clip->trace.ent = trace.ent;
+			//if (!clip->trace.ent)
+			//	clip->trace.ent = trace.ent;
 		}
 		if (trace.inopen)
 			clip->trace.inopen = true;
@@ -563,84 +593,11 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list)
 			clip->trace.fraction = trace.fraction;
 			VectorCopy(trace.endpos, clip->trace.endpos);
 			clip->trace.plane = trace.plane;
-			clip->trace.endcontents = trace.endcontents;
-			clip->trace.ent = trace.ent;
+			clip->trace.ent = touch;
 		}
-		if (clip->trace.allsolid)
-			return;
-	}
-}
-
-/*
-====================
-SV_ClipToAreaGrid
-
-Mins and maxs enclose the entire area swept by the move
-====================
-*/
-void SV_ClipToAreaGrid(moveclip_t *clip)
-{
-	areagrid_t *grid;
-	int igrid[3], igridmins[3], igridmaxs[3];
-
-	if (clip->trace.allsolid)
-		return;
-
-	sv_areagrid_stats_calls++;
-	sv_areagrid_marknumber++;
-	igridmins[0] = (int) ((clip->boxmins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
-	igridmins[1] = (int) ((clip->boxmins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
-	//igridmins[2] = (int) ((clip->boxmins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
-	igridmaxs[0] = (int) ((clip->boxmaxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
-	igridmaxs[1] = (int) ((clip->boxmaxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
-	//igridmaxs[2] = (int) ((clip->boxmaxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
-	igridmins[0] = max(0, igridmins[0]);
-	igridmins[1] = max(0, igridmins[1]);
-	//igridmins[2] = max(0, igridmins[2]);
-	igridmaxs[0] = min(AREA_GRID, igridmaxs[0]);
-	igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
-	//igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
-
-	if (sv_areagrid_outside.solid_edicts.next != &sv_areagrid_outside.solid_edicts)
-		SV_ClipToNode(clip, &sv_areagrid_outside.solid_edicts);
-
-	for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
-		for (grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0], igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
-			if (grid->solid_edicts.next != &grid->solid_edicts)
-				SV_ClipToNode(clip, &grid->solid_edicts);
-}
-
-
-/*
-==================
-SV_MoveBounds
-==================
-*/
-void SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, vec3_t boxmins, vec3_t boxmaxs)
-{
-	if (!sv_debugmove.integer)
-	{
-		int i;
-
-		for (i=0 ; i<3 ; i++)
-		{
-			if (end[i] > start[i])
-			{
-				boxmins[i] = start[i] + mins[i] - 1;
-				boxmaxs[i] = end[i] + maxs[i] + 1;
-			}
-			else
-			{
-				boxmins[i] = end[i] + mins[i] - 1;
-				boxmaxs[i] = start[i] + maxs[i] + 1;
-			}
-		}
-	}
-	else
-	{
-		// debug to test against everything
-		boxmins[0] = boxmins[1] = boxmins[2] = -999999999;
-		boxmaxs[0] = boxmaxs[1] = boxmaxs[2] =  999999999;
+		clip->trace.startsupercontents |= trace.startsupercontents;
+		//if (clip->trace.allsolid)
+		//	return;
 	}
 }
 
@@ -649,54 +606,98 @@ void SV_MoveBounds (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, vec3_t b
 SV_Move
 ==================
 */
-trace_t SV_Move (vec3_t start, vec3_t mins, vec3_t maxs, vec3_t end, int type, edict_t *passedict)
+trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, edict_t *passedict)
 {
-	moveclip_t	clip;
-	vec3_t		bigmins, bigmaxs;
-	int			i;
+	moveclip_t clip;
+	vec3_t hullmins, hullmaxs;
+	areagrid_t *grid;
+	int i, igrid[3], igridmins[3], igridmaxs[3];
 
-	memset ( &clip, 0, sizeof ( moveclip_t ) );
+	memset(&clip, 0, sizeof(moveclip_t));
 
 	VectorCopy(start, clip.start);
 	VectorCopy(end, clip.end);
 	VectorCopy(mins, clip.mins);
 	VectorCopy(maxs, clip.maxs);
+	VectorCopy(mins, clip.mins2);
+	VectorCopy(maxs, clip.maxs2);
 	clip.type = type;
 	clip.passedict = passedict;
 
-	Collision_RoundUpToHullSize(sv.worldmodel, clip.mins, clip.maxs, clip.hullmins, clip.hullmaxs);
+	// clip to world
+	clip.trace = SV_ClipMoveToEntity(sv.edicts, clip.start, clip.mins, clip.maxs, clip.end, clip.type);
+	if (clip.type == MOVE_WORLDONLY)
+	//if (clip.trace.allsolid)
+		return clip.trace;
 
-	if (type == MOVE_MISSILE)
+	if (clip.type == MOVE_MISSILE)
 	{
-		// LordHavoc: modified this, was = -15, now = clip.mins[i] - 15
-		for (i=0 ; i<3 ; i++)
+		// LordHavoc: modified this, was = -15, now -= 15
+		for (i = 0;i < 3;i++)
 		{
-			clip.mins2[i] = clip.mins[i] - 15;
-			clip.maxs2[i] = clip.maxs[i] + 15;
+			clip.mins2[i] -= 15;
+			clip.maxs2[i] += 15;
 		}
 	}
+
+	// get adjusted box for bmodel collisions if the world is q1bsp or hlbsp
+	if (sv.worldmodel && sv.worldmodel->brush.RoundUpToHullSize)
+		sv.worldmodel->brush.RoundUpToHullSize(sv.worldmodel, clip.mins, clip.maxs, hullmins, hullmaxs);
 	else
 	{
-		VectorCopy (clip.mins, clip.mins2);
-		VectorCopy (clip.maxs, clip.maxs2);
+		VectorCopy(clip.mins, hullmins);
+		VectorCopy(clip.maxs, hullmaxs);
 	}
 
-	bigmins[0] = min(clip.mins2[0], clip.hullmins[0]);
-	bigmaxs[0] = max(clip.maxs2[0], clip.hullmaxs[0]);
-	bigmins[1] = min(clip.mins2[1], clip.hullmins[1]);
-	bigmaxs[1] = max(clip.maxs2[1], clip.hullmaxs[1]);
-	bigmins[2] = min(clip.mins2[2], clip.hullmins[2]);
-	bigmaxs[2] = max(clip.maxs2[2], clip.hullmaxs[2]);
+	// create the bounding box of the entire move
+	for (i = 0;i < 3;i++)
+	{
+		clip.boxmins[i] = min(clip.start[i], clip.trace.endpos[i]) + min(hullmins[i], clip.mins2[i]) - 1;
+		clip.boxmaxs[i] = max(clip.start[i], clip.trace.endpos[i]) + max(hullmaxs[i], clip.maxs2[i]) + 1;
+	}
 
-	// clip to world
-	clip.trace = SV_ClipMoveToEntity (sv.edicts, start, mins, maxs, end);
+	// debug override to test against everything
+	if (sv_debugmove.integer)
+	{
+		clip.boxmins[0] = clip.boxmins[1] = clip.boxmins[2] = -999999999;
+		clip.boxmaxs[0] = clip.boxmaxs[1] = clip.boxmaxs[2] =  999999999;
+	}
 
-	// clip to entities
-	// create the bounding box of the entire move
-	SV_MoveBounds ( start, bigmins, bigmaxs, end, clip.boxmins, clip.boxmaxs );
+	// clip to enttiies
+	sv_areagrid_stats_calls++;
+	sv_areagrid_marknumber++;
+	igridmins[0] = (int) ((clip.boxmins[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]);
+	igridmins[1] = (int) ((clip.boxmins[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]);
+	//igridmins[2] = (int) ((clip->boxmins[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]);
+	igridmaxs[0] = (int) ((clip.boxmaxs[0] + sv_areagrid_bias[0]) * sv_areagrid_scale[0]) + 1;
+	igridmaxs[1] = (int) ((clip.boxmaxs[1] + sv_areagrid_bias[1]) * sv_areagrid_scale[1]) + 1;
+	//igridmaxs[2] = (int) ((clip->boxmaxs[2] + sv_areagrid_bias[2]) * sv_areagrid_scale[2]) + 1;
+	igridmins[0] = max(0, igridmins[0]);
+	igridmins[1] = max(0, igridmins[1]);
+	//igridmins[2] = max(0, igridmins[2]);
+	igridmaxs[0] = min(AREA_GRID, igridmaxs[0]);
+	igridmaxs[1] = min(AREA_GRID, igridmaxs[1]);
+	//igridmaxs[2] = min(AREA_GRID, igridmaxs[2]);
 
-	SV_ClipToAreaGrid(&clip);
+	if (sv_areagrid_outside.solid_edicts.next != &sv_areagrid_outside.solid_edicts)
+		SV_ClipToNode(&clip, &sv_areagrid_outside.solid_edicts);
+
+	for (igrid[1] = igridmins[1];igrid[1] < igridmaxs[1];igrid[1]++)
+		for (grid = sv_areagrid + igrid[1] * AREA_GRID + igridmins[0], igrid[0] = igridmins[0];igrid[0] < igridmaxs[0];igrid[0]++, grid++)
+			if (grid->solid_edicts.next != &grid->solid_edicts)
+				SV_ClipToNode(&clip, &grid->solid_edicts);
 
 	return clip.trace;
 }
 
+int SV_PointSuperContents(const vec3_t point)
+{
+	return SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents;
+}
+
+int SV_PointQ1Contents(const vec3_t point)
+{
+	return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(point));
+}
+
+