From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 3 Apr 2003 20:55:08 +0000 (+0000)
Subject: got rid of use of eye in entity database
X-Git-Tag: xonotic-v0.1.0preview~6683
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b6b622f054e260ca0644fa96647892e997d492c;p=xonotic%2Fdarkplaces.git

got rid of use of eye in entity database


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2900 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_main.c b/cl_main.c
index d3972a6a..fedd02b5 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -940,7 +940,7 @@ void CL_RelinkBeams (void)
 				// have some lag in it's location, so compare to the
 				// previous player state, not the latest
 				if (b->entity == cl.viewentity)
-					Matrix4x4_CreateFromQuakeEntity(&matrix, cl.viewentoriginold[0], cl.viewentoriginold[1], cl.viewentoriginold[2] + 16, cl.viewangles[0], cl.viewangles[1], cl.viewangles[2], 1);
+					Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2] + 16, cl.viewangles[0], cl.viewangles[1], cl.viewangles[2], 1);
 				else
 					Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2] + 16, p->angles[0], p->angles[1], p->angles[2], 1);
 				Matrix4x4_Invert_Simple(&imatrix, &matrix);
@@ -951,7 +951,7 @@ void CL_RelinkBeams (void)
 			else
 			{
 				if (b->entity == cl.viewentity)
-					Matrix4x4_CreateFromQuakeEntity(&matrix, cl.viewentorigin[0], cl.viewentorigin[1], cl.viewentorigin[2] + 16, cl.viewangles[0], cl.viewangles[1], cl.viewangles[2], 1);
+					Matrix4x4_CreateFromQuakeEntity(&matrix, r->origin[0], r->origin[1], r->origin[2] + 16, cl.viewangles[0], cl.viewangles[1], cl.viewangles[2], 1);
 				else
 					Matrix4x4_CreateFromQuakeEntity(&matrix, r->origin[0], r->origin[1], r->origin[2] + 16, r->angles[0], r->angles[1], r->angles[2], 1);
 				Matrix4x4_Transform(&matrix, b->relativestart, b->start);
@@ -1359,19 +1359,6 @@ 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].state_previous.origin, cl.viewentoriginold);
-		VectorCopy (cl_entities[cl.viewentity].state_current.origin, cl.viewentoriginnew);
-		VectorCopy (cl_entities[cl.viewentity].render.origin, cl.viewentorigin);
-	}
-
 	cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold);
 
 	for (i = 0;i < 3;i++)
diff --git a/cl_parse.c b/cl_parse.c
index aa16ce18..9f11a47d 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -669,8 +669,6 @@ void CL_ReadEntityFrame(void)
 		entlife[ent->state_current.number] = 2;
 		cl_entities_active[ent->state_current.number] = true;
 	}
-	VectorCopy(cl.viewentoriginnew, cl.viewentoriginold);
-	VectorCopy(entityframe.eye, cl.viewentoriginnew);
 }
 
 void CL_EntityUpdateSetup(void)
diff --git a/client.h b/client.h
index ff6f7b77..38402f6d 100644
--- a/client.h
+++ b/client.h
@@ -429,15 +429,12 @@ typedef struct
 	// [cl.maxclients]
 	scoreboard_t *scores;
 
-	// used by view code for setting up eye position
-	vec3_t viewentorigin;
 	// LordHavoc: sniping zoom, QC controlled
 	float viewzoom;
 	// for interpolation
 	float viewzoomold, viewzoomnew;
 
 	// entity database stuff
-	vec3_t viewentoriginold, viewentoriginnew;
 	entity_database_t entitydatabase;
 }
 client_state_t;
diff --git a/view.c b/view.c
index 121b922a..0f86ef82 100644
--- a/view.c
+++ b/view.c
@@ -530,7 +530,7 @@ void V_CalcRefdef (void)
 
 	V_DriftPitch ();
 
-	VectorCopy (cl.viewentorigin, r_refdef.vieworg);
+	VectorCopy (ent->render.origin, r_refdef.vieworg);
 	if (!intimerefresh)
 		VectorCopy (cl.viewangles, r_refdef.viewangles);