X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=a653f4bf1e5ca0af486b06dd58d6f61aafd143a1;hb=71dcc1f8c6018dc2a4b3db8dfc9322e8e75211e3;hp=bb0bfe12c7642bc09bc595d4982a80fb9913e581;hpb=ae458cf44e1264534a20514f2f451c3d06ff135b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index bb0bfe12c..a653f4bf1 100644
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,8 +1,8 @@
 #include "miscfunctions.qh"
 
 #include "autocvars.qh"
-#include "defs.qh"
 #include "hud/_mod.qh"
+#include "main.qh"
 
 #include <common/command/_mod.qh>
 
@@ -214,6 +214,28 @@ vector expandingbox_resize_centered_box_offset(float sz, vector boxsize, float b
 	return boxsize * (0.5 * (1 - sz));
 }
 
+// NOTE base is the central value
+// freq: circle frequency, = 2*pi*frequency in hertz
+// start_pos:
+//  -1 start from the lower value
+//   0 start from the base value
+//   1 start from the higher value
+float blink_synced(float base, float range, float freq, float start_time, int start_pos)
+{
+	// note:
+	//   RMS = sqrt(base^2 + 0.5 * range^2)
+	// thus
+	//   base = sqrt(RMS^2 - 0.5 * range^2)
+	// ensure RMS == 1
+
+	return base + range * sin((time - start_time - (M_PI / 2) * start_pos) * freq);
+}
+
+float blink(float base, float range, float freq)
+{
+	return blink_synced(base, range, freq, 0, 0);
+}
+
 void drawborderlines(float thickness, vector pos, vector dim, vector color, float theAlpha, float drawflag)
 {
 	vector line_dim = '0 0 0';
@@ -310,6 +332,23 @@ float stringwidth(string text, float handleColors, vector sz)
 	return r;
 }
 
+#define SET_POS_AND_SZ_Y_ASPECT(allow_colors) MACRO_BEGIN \
+	float textaspect, oldsz; \
+	vector dfs = drawfontscale; \
+	drawfontscale = '1 1 0'; \
+	textaspect = stringwidth(text, allow_colors, '1 1 1' * sz.y) / sz.y; \
+	drawfontscale = dfs; \
+	if(sz.x/sz.y > textaspect) { \
+		oldsz = sz.x; \
+		sz.x = sz.y * textaspect; \
+		pos.x += (oldsz - sz.x) * 0.5; \
+	} else { \
+		oldsz = sz.y; \
+		sz.y = sz.x / textaspect; \
+		pos.y += (oldsz - sz.y) * 0.5; \
+	} \
+MACRO_END
+
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
 void drawstring_aspect(vector pos, string text, vector sz, vector color, float theAlpha, float drawflag) {
 	SET_POS_AND_SZ_Y_ASPECT(false);
@@ -400,18 +439,11 @@ 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);
 	ringsize = HUD_Scale(ringsize);
 
-	float co = cos(f * 2 * M_PI);
-	float si = sin(f * 2 * M_PI);
-	float q = fabs(co) + fabs(si);
-	co /= q;
-	si /= q;
-
 	if(f >= 1)
 	{
 		// draw full rectangle
@@ -432,22 +464,18 @@ 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();
+		return;  // Complete rectangle, nothing more needed.
+	}
 
-		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);
+	float co = cos(f * 2 * M_PI);
+	float si = sin(f * 2 * M_PI);
+	float q = fabs(co) + fabs(si);
+	co /= q;
+	si /= q;
 
-				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.75)
+	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 +489,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 +501,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 +518,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 +541,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 */