X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=819dae89606f95532c8ee6f23f980d1d1543e959;hb=fabdca42b48cc4acf214c06adda9814e5cce8577;hp=ae47246bc675ad569a5297eea043428532fedcbf;hpb=87af6a50d2699bb3a46b4b7c47e952c040709949;p=xonotic%2Fdarkplaces.git

diff --git a/cl_main.c b/cl_main.c
index ae47246b..819dae89 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -259,6 +259,37 @@ static void CL_PrintEntities_f (void)
 	}
 }
 
+static const vec3_t nomodelmins = {-16, -16, -16};
+static const vec3_t nomodelmaxs = {16, 16, 16};
+void CL_BoundingBoxForEntity(entity_render_t *ent)
+{
+	if (ent->model)
+	{
+		if (ent->angles[0] || ent->angles[2])
+		{
+			// pitch or roll
+			VectorAdd(ent->origin, ent->model->rotatedmins, ent->mins);
+			VectorAdd(ent->origin, ent->model->rotatedmaxs, ent->maxs);
+		}
+		else if (ent->angles[1])
+		{
+			// yaw
+			VectorAdd(ent->origin, ent->model->yawmins, ent->mins);
+			VectorAdd(ent->origin, ent->model->yawmaxs, ent->maxs);
+		}
+		else
+		{
+			VectorAdd(ent->origin, ent->model->normalmins, ent->mins);
+			VectorAdd(ent->origin, ent->model->normalmaxs, ent->maxs);
+		}
+	}
+	else
+	{
+		VectorAdd(ent->origin, nomodelmins, ent->mins);
+		VectorAdd(ent->origin, nomodelmaxs, ent->maxs);
+	}
+}
+
 void CL_LerpUpdate(entity_t *e)
 {
 	entity_persistent_t *p;
@@ -330,6 +361,103 @@ static float CL_LerpPoint (void)
 	return bound(0, f, 1);
 }
 
+void CL_ClearTempEntities (void)
+{
+	cl_num_temp_entities = 0;
+}
+
+entity_t *CL_NewTempEntity (void)
+{
+	entity_t *ent;
+
+	if (r_refdef.numentities >= r_refdef.maxentities)
+		return NULL;
+	if (cl_num_temp_entities >= cl_max_temp_entities)
+		return NULL;
+	ent = &cl_temp_entities[cl_num_temp_entities++];
+	memset (ent, 0, sizeof(*ent));
+	r_refdef.entities[r_refdef.numentities++] = &ent->render;
+
+	ent->render.colormap = -1; // no special coloring
+	ent->render.scale = 1;
+	ent->render.alpha = 1;
+	return ent;
+}
+
+void CL_AllocDlight (entity_render_t *ent, vec3_t org, float radius, float red, float green, float blue, float decay, float lifetime)
+{
+	int i;
+	dlight_t *dl;
+
+	/*
+// first look for an exact key match
+	if (ent)
+	{
+		dl = cl_dlights;
+		for (i = 0;i < MAX_DLIGHTS;i++, dl++)
+			if (dl->ent == ent)
+				goto dlightsetup;
+	}
+	*/
+
+// then look for anything else
+	dl = cl_dlights;
+	for (i = 0;i < MAX_DLIGHTS;i++, dl++)
+		if (!dl->radius)
+			goto dlightsetup;
+
+	// unable to find one
+	return;
+
+dlightsetup:
+	//Con_Printf("dlight %i : %f %f %f : %f %f %f\n", i, org[0], org[1], org[2], red * radius, green * radius, blue * radius);
+	memset (dl, 0, sizeof(*dl));
+	dl->ent = ent;
+	VectorCopy(org, dl->origin);
+	dl->radius = radius;
+	dl->color[0] = red;
+	dl->color[1] = green;
+	dl->color[2] = blue;
+	dl->decay = decay;
+	if (lifetime)
+		dl->die = cl.time + lifetime;
+	else
+		dl->die = 0;
+}
+
+void CL_DecayLights (void)
+{
+	int i;
+	dlight_t *dl;
+	float time;
+
+	time = cl.time - cl.oldtime;
+
+	dl = cl_dlights;
+	for (i=0 ; i<MAX_DLIGHTS ; i++, dl++)
+	{
+		if (!dl->radius)
+			continue;
+		if (dl->die < cl.time)
+		{
+			dl->radius = 0;
+			continue;
+		}
+
+		dl->radius -= time*dl->decay;
+		if (dl->radius < 0)
+			dl->radius = 0;
+	}
+}
+
+void CL_RelinkWorld (void)
+{
+	if (cl_num_entities < 1)
+		cl_num_entities = 1;
+	cl_brushmodel_entities[cl_num_brushmodel_entities++] = &cl_entities[0].render;
+	CL_BoundingBoxForEntity(&cl_entities[0].render);
+}
+
 static void CL_RelinkStaticEntities(void)
 {
 	int i;
@@ -516,7 +644,7 @@ static void CL_RelinkNetworkEntities()
 			v2[0] = v[0] * 18 + neworg[0];
 			v2[1] = v[1] * 18 + neworg[1];
 			v2[2] = v[2] * 18 + neworg[2] + 16;
-			CL_TraceLine(neworg, v2, v, NULL, 0, true);
+			CL_TraceLine(neworg, v2, v, NULL, 0, true, NULL);
 
 			CL_AllocDlight (NULL, v, ent->persistent.muzzleflash, 1, 1, 1, 0, 0);
 			ent->persistent.muzzleflash -= cl.frametime * 1000;
@@ -579,7 +707,7 @@ static void CL_RelinkNetworkEntities()
 		{
 			// * 4 for the expansion from 0-255 to 0-1023 range,
 			// / 255 to scale down byte colors
-			VectorMA(dlightcolor, ent->state_current.glowsize * (4.0f / 255.0f), (qbyte *)&d_8to24table[ent->state_current.glowcolor], dlightcolor);
+			VectorMA(dlightcolor, ent->state_current.glowsize * (4.0f / 255.0f), (qbyte *)&palette_complete[ent->state_current.glowcolor], dlightcolor);
 		}
 		// LordHavoc: customizable trail
 		if (ent->render.flags & RENDER_GLOWTRAIL)
@@ -589,9 +717,9 @@ static void CL_RelinkNetworkEntities()
 		{
 			VectorCopy(neworg, v);
 			// hack to make glowing player light shine on their gun
-			if (i == cl.viewentity && !chase_active.integer)
+			if (i == cl.viewentity/* && !chase_active.integer*/)
 				v[2] += 30;
-			CL_AllocDlight (NULL, v, 1, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0);
+			CL_AllocDlight (&ent->render, v, 1, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0);
 		}
 
 		if (chase_active.integer)
@@ -605,74 +733,25 @@ static void CL_RelinkNetworkEntities()
 				continue;
 		}
 
-		if (ent->render.model == NULL)
+		// don't show entities with no modelindex (note: this still shows
+		// entities which have a modelindex that resolved to a NULL model)
+		if (!ent->state_current.modelindex)
 			continue;
 		if (effects & EF_NODRAW)
 			continue;
 
-		if (ent->render.angles[0] || ent->render.angles[2])
-		{
-			// pitch or roll
-			VectorAdd(ent->render.origin, ent->render.model->rotatedmins, ent->render.mins);
-			VectorAdd(ent->render.origin, ent->render.model->rotatedmaxs, ent->render.maxs);
-		}
-		else if (ent->render.angles[1])
-		{
-			// yaw
-			VectorAdd(ent->render.origin, ent->render.model->yawmins, ent->render.mins);
-			VectorAdd(ent->render.origin, ent->render.model->yawmaxs, ent->render.maxs);
-		}
-		else
-		{
-			VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
-			VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
-		}
+		CL_BoundingBoxForEntity(&ent->render);
+		if (ent->render.model && ent->render.model->name[0] == '*' && ent->render.model->type == mod_brush)
+			cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render;
 
 		if (r_refdef.numentities < r_refdef.maxentities)
 			r_refdef.entities[r_refdef.numentities++] = &ent->render;
 
-		if (ent->render.model->name[0] == '*' && ent->render.model->type == mod_brush)
-			cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render;
-
 		if (cl_num_entities < i + 1)
 			cl_num_entities = i + 1;
 	}
 }
 
-void CL_LerpPlayer(float frac)
-{
-	int i;
-	float d;
-
-	if (cl.entitydatabase.numframes && cl.viewentity == cl.playerentity)
-	{
-		cl.viewentorigin[0] = cl.viewentoriginold[0] + frac * (cl.viewentoriginnew[0] - cl.viewentoriginold[0]);
-		cl.viewentorigin[1] = cl.viewentoriginold[1] + frac * (cl.viewentoriginnew[1] - cl.viewentoriginold[1]);
-		cl.viewentorigin[2] = cl.viewentoriginold[2] + frac * (cl.viewentoriginnew[2] - cl.viewentoriginold[2]);
-	}
-	else
-		VectorCopy (cl_entities[cl.viewentity].render.origin, cl.viewentorigin);
-
-	cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold);
-
-	for (i = 0;i < 3;i++)
-		cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]);
-
-	if (cls.demoplayback)
-	{
-		// interpolate the angles
-		for (i = 0;i < 3;i++)
-		{
-			d = cl.mviewangles[0][i] - cl.mviewangles[1][i];
-			if (d > 180)
-				d -= 360;
-			else if (d < -180)
-				d += 360;
-			cl.viewangles[i] = cl.mviewangles[1][i] + frac * d;
-		}
-	}
-}
-
 void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate)
 {
 	int i;
@@ -746,33 +825,112 @@ static void CL_RelinkEffects()
 				ent->render.scale = 1;
 				ent->render.alpha = 1;
 
-				if (ent->render.angles[0] || ent->render.angles[2])
-				{
-					// pitch or roll
-					VectorAdd(ent->render.origin, ent->render.model->rotatedmins, ent->render.mins);
-					VectorAdd(ent->render.origin, ent->render.model->rotatedmaxs, ent->render.maxs);
-				}
-				else if (ent->render.angles[1])
-				{
-					// yaw
-					VectorAdd(ent->render.origin, ent->render.model->yawmins, ent->render.mins);
-					VectorAdd(ent->render.origin, ent->render.model->yawmaxs, ent->render.maxs);
-				}
-				else
-				{
-					VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins);
-					VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs);
-				}
+				CL_BoundingBoxForEntity(&ent->render);
 			}
 		}
 	}
 }
 
-void CL_RelinkWorld (void)
+void CL_RelinkBeams (void)
 {
-	if (cl_num_entities < 1)
-		cl_num_entities = 1;
-	cl_brushmodel_entities[cl_num_brushmodel_entities++] = &cl_entities[0].render;
+	int i;
+	beam_t *b;
+	vec3_t dist, org;
+	float d;
+	entity_t *ent;
+	float yaw, pitch;
+	float forward;
+
+	for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+	{
+		if (!b->model || b->endtime < cl.time)
+			continue;
+
+		// if coming from the player, update the start position
+		//if (b->entity == cl.viewentity)
+		//	VectorCopy (cl_entities[cl.viewentity].render.origin, b->start);
+		if (b->entity && cl_entities[b->entity].state_current.active)
+		{
+			VectorCopy (cl_entities[b->entity].render.origin, b->start);
+			b->start[2] += 16;
+		}
+
+		// calculate pitch and yaw
+		VectorSubtract (b->end, b->start, dist);
+
+		if (dist[1] == 0 && dist[0] == 0)
+		{
+			yaw = 0;
+			if (dist[2] > 0)
+				pitch = 90;
+			else
+				pitch = 270;
+		}
+		else
+		{
+			yaw = (int) (atan2(dist[1], dist[0]) * 180 / M_PI);
+			if (yaw < 0)
+				yaw += 360;
+
+			forward = sqrt (dist[0]*dist[0] + dist[1]*dist[1]);
+			pitch = (int) (atan2(dist[2], forward) * 180 / M_PI);
+			if (pitch < 0)
+				pitch += 360;
+		}
+
+		// add new entities for the lightning
+		VectorCopy (b->start, org);
+		d = VectorNormalizeLength(dist);
+		while (d > 0)
+		{
+			ent = CL_NewTempEntity ();
+			if (!ent)
+				return;
+			VectorCopy (org, ent->render.origin);
+			ent->render.model = b->model;
+			ent->render.effects = EF_FULLBRIGHT;
+			ent->render.angles[0] = pitch;
+			ent->render.angles[1] = yaw;
+			ent->render.angles[2] = rand()%360;
+			CL_BoundingBoxForEntity(&ent->render);
+			VectorMA(org, 30, dist, org);
+			d -= 30;
+		}
+	}
+}
+
+void CL_LerpPlayer(float frac)
+{
+	int i;
+	float d;
+
+	if (cl.entitydatabase.numframes && cl.viewentity == cl.playerentity)
+	{
+		cl.viewentorigin[0] = cl.viewentoriginold[0] + frac * (cl.viewentoriginnew[0] - cl.viewentoriginold[0]);
+		cl.viewentorigin[1] = cl.viewentoriginold[1] + frac * (cl.viewentoriginnew[1] - cl.viewentoriginold[1]);
+		cl.viewentorigin[2] = cl.viewentoriginold[2] + frac * (cl.viewentoriginnew[2] - cl.viewentoriginold[2]);
+	}
+	else
+		VectorCopy (cl_entities[cl.viewentity].render.origin, cl.viewentorigin);
+
+	cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold);
+
+	for (i = 0;i < 3;i++)
+		cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]);
+
+	if (cls.demoplayback)
+	{
+		// interpolate the angles
+		for (i = 0;i < 3;i++)
+		{
+			d = cl.mviewangles[0][i] - cl.mviewangles[1][i];
+			if (d > 180)
+				d -= 360;
+			else if (d < -180)
+				d += 360;
+			cl.viewangles[i] = cl.mviewangles[1][i] + frac * d;
+		}
+	}
 }
 
 void CL_RelinkEntities (void)
@@ -785,10 +943,10 @@ void CL_RelinkEntities (void)
 	CL_ClearTempEntities();
 	CL_DecayLights();
 	CL_RelinkWorld();
-	CL_RelinkBeams();
 	CL_RelinkStaticEntities();
 	CL_RelinkNetworkEntities();
 	CL_RelinkEffects();
+	CL_RelinkBeams();
 	CL_MoveParticles();
 
 	CL_LerpPlayer(frac);
@@ -834,7 +992,7 @@ int CL_ReadFromServer (void)
 	cl_num_entities = 0;
 	cl_num_brushmodel_entities = 0;
 
-	if (cls.state == ca_connected && cl.worldmodel)
+	if (cls.state == ca_connected && cls.signon == SIGNONS)
 	{
 		CL_RelinkEntities ();
 
@@ -876,7 +1034,7 @@ void CL_SendCmd (void)
 		CL_SendMove (&cmd);
 	}
 #ifndef NOROUTINGFIX
-	else
+	else if (cls.signon == 0 && !cls.demoplayback)
 	{
 		// LordHavoc: fix for NAT routing of netquake:
 		// bounce back a clc_nop message to the newly allocated server port,
@@ -884,9 +1042,21 @@ void CL_SendCmd (void)
 		// the server waits for this before sending anything
 		if (realtime > cl.sendnoptime)
 		{
-			Con_DPrintf("sending clc_nop to get server's attention\n");
 			cl.sendnoptime = realtime + 3;
-			MSG_WriteByte(&cls.message, clc_nop);
+			Con_DPrintf("sending clc_nop to get server's attention\n");
+			{
+				sizebuf_t buf;
+				qbyte data[128];
+				buf.maxsize = 128;
+				buf.cursize = 0;
+				buf.data = data;
+				MSG_WriteByte(&buf, clc_nop);
+				if (NET_SendUnreliableMessage (cls.netcon, &buf) == -1)
+				{
+					Con_Printf ("CL_SendCmd: lost server connection\n");
+					CL_Disconnect ();
+				}
+			}
 		}
 	}
 #endif
@@ -904,6 +1074,8 @@ void CL_SendCmd (void)
 	if (!NET_CanSendMessage (cls.netcon))
 	{
 		Con_DPrintf ("CL_WriteToServer: can't send\n");
+		if (developer.integer)
+			SZ_HexDumpToConsole(&cls.message);
 		return;
 	}
 
@@ -1029,7 +1201,6 @@ void CL_Init (void)
 	Cvar_RegisterVariable (&cl_itembobheight);
 
 	Cmd_AddCommand ("entities", CL_PrintEntities_f);
-	Cmd_AddCommand ("bitprofile", CL_BitProfile_f);
 	Cmd_AddCommand ("disconnect", CL_Disconnect_f);
 	Cmd_AddCommand ("record", CL_Record_f);
 	Cmd_AddCommand ("stop", CL_Stop_f);