From: Rudolf Polzer <divVerent@gmail.com>
Date: Fri, 17 Jan 2020 01:26:07 +0000 (+0100)
Subject: Simplify clipped circle pictures (e.g. crosshair ring).
X-Git-Tag: xonotic-v0.8.5~1105^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0c5b06b8592d343353d624764c6b440edb44ebc3

Simplify clipped circle pictures (e.g. crosshair ring).

Should not change what is rendered, just simpler to understand. Removes useless comparisons (value q is always >= 1).
---

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index bb0bfe12c7..684224c710 100644
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -400,7 +400,6 @@ void PolyDrawModel(entity e)
 
 void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector rgb, float a, float drawflag)
 {
-	float d;
 	vector ringsize, v, t;
 	ringsize = radi * '1 1 0';
 	centre = HUD_Shift(centre);
@@ -432,22 +431,11 @@ void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector
 			v.y -= 0.5 * ringsize.y;	t -= '0.5 -0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
 		R_EndPolygon();
-
-		d = q - 1;
-		if(d > 0)
-		{
-			R_BeginPolygon(pic, drawflag, true);
-				v = centre;			t = '0.5 0.5 0';
-				R_PolygonVertex(v, t, rgb, a);
-
-				v = centre;			t = '0.5 0.5 0';
-				v.x += 0.5 * ringsize.x;	t += '0.5 0.5 0';
-				R_PolygonVertex(v, t, rgb, a);
-		}
+		return;  // Complete rectangle, nothing more needed.
 	}
 	else if(f > 0.75)
 	{
-		// draw upper and first triangle
+		// draw upper half in full
 		R_BeginPolygon(pic, drawflag, true);
 			v = centre;			t = '0.5 0.5 0';
 			v.x += 0.5 * ringsize.x;	t += '0.5 0.5 0';
@@ -461,6 +449,7 @@ void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector
 			v.x -= 0.5 * ringsize.x;	t -= '0.5 0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
 		R_EndPolygon();
+		// draw clipped lower half as a quad
 		R_BeginPolygon(pic, drawflag, true);
 			v = centre;			t = '0.5 0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
@@ -472,14 +461,10 @@ void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector
 			v = centre;			t = '0.5 0.5 0';
 			v.y -= 0.5 * ringsize.y;	t -= '0.5 -0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
-
-		d = q - 0.75;
-		if(d <= 0)
-			R_EndPolygon();
 	}
 	else if(f > 0.5)
 	{
-		// draw upper triangle
+		// draw upper half in full
 		R_BeginPolygon(pic, drawflag, true);
 			v = centre;			t = '0.5 0.5 0';
 			v.x += 0.5 * ringsize.x;	t += '0.5 0.5 0';
@@ -493,22 +478,18 @@ void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector
 			v.x -= 0.5 * ringsize.x;	t -= '0.5 0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
 		R_EndPolygon();
+		// draw clipped lower half as a triangle
+		R_BeginPolygon(pic, drawflag, true);
+			v = centre;			t = '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
 
-		d = q - 0.5;
-		if(d > 0)
-		{
-			R_BeginPolygon(pic, drawflag, true);
-				v = centre;			t = '0.5 0.5 0';
-				R_PolygonVertex(v, t, rgb, a);
-
-				v = centre;			t = '0.5 0.5 0';
-				v.x -= 0.5 * ringsize.x;	t -= '0.5 0.5 0';
-				R_PolygonVertex(v, t, rgb, a);
-		}
+			v = centre;			t = '0.5 0.5 0';
+			v.x -= 0.5 * ringsize.x;	t -= '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
 	}
 	else if(f > 0.25)
 	{
-		// draw first triangle
+		// draw clipped lower half as a quad
 		R_BeginPolygon(pic, drawflag, true);
 			v = centre;			t = '0.5 0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
@@ -520,34 +501,30 @@ void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector
 			v = centre;			t = '0.5 0.5 0';
 			v.y += 0.5 * ringsize.y;	t += '0.5 -0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
-
-		d = q - 0.25;
-		if(d <= 0)
-			R_EndPolygon();
 	}
-	else
+	else if (f > 0)
 	{
-		d = q;
-		if(d > 0)
-		{
-			R_BeginPolygon(pic, drawflag, true);
-				v = centre;			t = '0.5 0.5 0';
-				R_PolygonVertex(v, t, rgb, a);
-
-				v = centre;			t = '0.5 0.5 0';
-				v.x += 0.5 * ringsize.x;	t += '0.5 0.5 0';
-				R_PolygonVertex(v, t, rgb, a);
-		}
-	}
+		// draw clipped lower half as a triangle
+		R_BeginPolygon(pic, drawflag, true);
+			v = centre;			t = '0.5 0.5 0';
+			R_PolygonVertex(v, t, rgb, a);
 
-	if(d > 0)
-	{
 			v = centre;			t = '0.5 0.5 0';
-			v.x += co * 0.5 * ringsize.x;	t += co * '0.5 0.5 0';
-			v.y += si * 0.5 * ringsize.y;	t += si * '0.5 -0.5 0';
+			v.x += 0.5 * ringsize.x;	t += '0.5 0.5 0';
 			R_PolygonVertex(v, t, rgb, a);
-		R_EndPolygon();
 	}
+	else
+	{
+		// Nothing to draw.
+		return;
+	}
+
+	// The last, moving vertex.
+		v = centre;			t = '0.5 0.5 0';
+		v.x += co * 0.5 * ringsize.x;	t += co * '0.5 0.5 0';
+		v.y += si * 0.5 * ringsize.y;	t += si * '0.5 -0.5 0';
+		R_PolygonVertex(v, t, rgb, a);
+	R_EndPolygon();
 }
 
 /** engine callback */