From: terencehill <piuntn@gmail.com>
Date: Sun, 1 Nov 2020 10:23:37 +0000 (+0100)
Subject: Shownames: calculate distance only when really needed to avoid wasting a vlen call... 
X-Git-Tag: xonotic-v0.8.5~704
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a3dc0d4cd30024ecb162bdd9e2dca64f7f61832;p=xonotic%2Fxonotic-data.pk3dir.git

Shownames: calculate distance only when really needed to avoid wasting a vlen call; also reduce cvar calls in WarpZone_FixView
---

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index e81dd5b87..ed0d95c5f 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -125,20 +125,33 @@ void Draw_ShowNames(entity this)
 	}
 	if (MUTATOR_CALLHOOK(ShowNames_Draw, this, a)) return;
 	a = M_ARGV(1, float);
-	if (vdist(this.origin - view_origin, >=, max_shot_distance)) return;
-	float dist = vlen(this.origin - view_origin);
+	float dist = -1; // dist will be calculated only when really needed to avoid wasting a vlen call
 	if (autocvar_hud_shownames_maxdistance)
 	{
-		if (dist >= autocvar_hud_shownames_maxdistance) return;
-		float f = autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance;
-		a *= (f - max(0, dist - autocvar_hud_shownames_mindistance)) / f;
+		float max_dist = max(autocvar_hud_shownames_maxdistance, max_shot_distance);
+		if (vdist(this.origin - view_origin, >=, max_dist))
+			return;
+		if (vdist(this.origin - view_origin, >=, autocvar_hud_shownames_mindistance))
+		{
+			float f = autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance;
+			if (dist == -1)
+				dist = vlen(this.origin - view_origin);
+			a *= (f - max(0, dist - autocvar_hud_shownames_mindistance)) / f;
+		}
 	}
+	else if (vdist(this.origin - view_origin, >=, max_shot_distance))
+		return;
 	if (!a) return;
 	float resize = 1;
 	if (autocvar_hud_shownames_resize)  // limit resize so its never smaller than 0.5... gets unreadable
 	{
-		float f = autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance;
-		resize = 0.5 + 0.5 * (f - max(0, dist - autocvar_hud_shownames_mindistance)) / f;
+		if (vdist(this.origin - view_origin, >=, autocvar_hud_shownames_mindistance))
+		{
+			float f = autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance;
+			if (dist == -1)
+				dist = vlen(this.origin - view_origin);
+			resize = 0.5 + 0.5 * (f - max(0, dist - autocvar_hud_shownames_mindistance)) / f;
+		}
 	}
 	// draw the sprite image
 	if (o.z >= 0)
diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc
index 26304b4f3..95c78e389 100644
--- a/qcsrc/lib/warpzone/client.qc
+++ b/qcsrc/lib/warpzone/client.qc
@@ -275,11 +275,13 @@ void WarpZone_FixView()
 	setproperty(VF_ORIGIN, org);
 	setproperty(VF_ANGLES, ang);
 
+	vector width = '1 0 0' * cvar("vid_conwidth");
+	vector height = '0 1 0' * cvar("vid_conheight");
 	nearclip = '0 0 1' * (cvar("r_nearclip") * 1.125);
 	corner0 = cs_unproject('0 0 0' + nearclip);
-	corner1 = cs_unproject('1 0 0' * cvar("vid_conwidth") + nearclip);
-	corner2 = cs_unproject('0 1 0' * cvar("vid_conheight") + nearclip);
-	corner3 = cs_unproject('1 0 0' * cvar("vid_conwidth") + '0 1 0' * cvar("vid_conheight") + nearclip);
+	corner1 = cs_unproject(width + nearclip);
+	corner2 = cs_unproject(height + nearclip);
+	corner3 = cs_unproject(width + height + nearclip);
 	o = WarpZone_FixNearClip(org, corner0, corner1, corner2, corner3);
 	if(o != '0 0 0')
 		setproperty(VF_ORIGIN, org + o);