From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 18 Oct 2006 03:45:23 +0000 (+0000)
Subject: some clean up of math used to generate trace start/end in prydon cursor code
X-Git-Tag: xonotic-v0.1.0preview~3790
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=03f0248dbb4582f9135c47e5f1fcb1e15f9a5158;ds=sidebyside

some clean up of math used to generate trace start/end in prydon cursor code


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

diff --git a/cl_input.c b/cl_input.c
index c4b05acc..a2a0106e 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -520,7 +520,7 @@ void CL_Move (void)
 extern void V_CalcRefdef(void);
 void CL_UpdatePrydonCursor(void)
 {
-	vec3_t temp, scale;
+	vec3_t temp;
 
 	if (!cl_prydoncursor.integer)
 		VectorClear(cl.cmd.cursor_screen);
@@ -551,18 +551,11 @@ void CL_UpdatePrydonCursor(void)
 	cl.cmd.cursor_screen[1] = bound(-1, cl.cmd.cursor_screen[1], 1);
 	cl.cmd.cursor_screen[2] = 1;
 
-	scale[0] = -r_view.frustum_x;
-	scale[1] = -r_view.frustum_y;
-	scale[2] = 1;
-
-	// trace distance
-	VectorScale(scale, 1000000, scale);
-
 	// calculate current view matrix
 	//V_CalcRefdef();
-	VectorClear(temp);
-	Matrix4x4_Transform(&r_view.matrix, temp, cl.cmd.cursor_start);
-	VectorSet(temp, cl.cmd.cursor_screen[2] * scale[2], cl.cmd.cursor_screen[0] * scale[0], cl.cmd.cursor_screen[1] * scale[1]);
+	Matrix4x4_OriginFromMatrix(&r_view.matrix, cl.cmd.cursor_start);
+	// calculate direction vector of cursor in viewspace by using frustum slopes
+	VectorSet(temp, cl.cmd.cursor_screen[2] * 1000000, cl.cmd.cursor_screen[0] * -r_view.frustum_x * 1000000, cl.cmd.cursor_screen[1] * -r_view.frustum_y * 1000000);
 	Matrix4x4_Transform(&r_view.matrix, temp, cl.cmd.cursor_end);
 	// trace from view origin to the cursor
 	cl.cmd.cursor_fraction = CL_SelectTraceLine(cl.cmd.cursor_start, cl.cmd.cursor_end, cl.cmd.cursor_impact, cl.cmd.cursor_normal, &cl.cmd.cursor_entitynumber, (chase_active.integer || cl.intermission) ? &cl.entities[cl.playerentity].render : NULL, false);