X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=a7af09c7c82a146fcc259558ae8c46e9bd789a2c;hp=360305601a8b71cfdd345436f213f9eafb5e50ee;hb=b2108fdf144cd75a50be6fba1d68a642f41a1531;hpb=77ffd30cbf1e94a546f70026e69e56e8d777ba83

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 360305601a..a7af09c7c8 100644
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -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';
@@ -382,7 +404,7 @@ float PolyDrawModelSurface(entity e, float i_s)
 	for(i_t = 0; i_t < n_t; ++i_t)
 	{
 		tri = getsurfacetriangle(e, i_s, i_t);
-		R_BeginPolygon(tex, 0);
+		R_BeginPolygon(tex, 0, false);
 		R_PolygonVertex(getsurfacepoint(e, i_s, tri.x), getsurfacepointattribute(e, i_s, tri.x, SPA_TEXCOORDS0), '1 1 1', 1);
 		R_PolygonVertex(getsurfacepoint(e, i_s, tri.y), getsurfacepointattribute(e, i_s, tri.y, SPA_TEXCOORDS0), '1 1 1', 1);
 		R_PolygonVertex(getsurfacepoint(e, i_s, tri.z), getsurfacepointattribute(e, i_s, tri.z, SPA_TEXCOORDS0), '1 1 1', 1);
@@ -400,7 +422,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);
@@ -415,7 +436,7 @@ void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector
 	if(f >= 1)
 	{
 		// draw full rectangle
-		R_BeginPolygon(pic, drawflag);
+		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';
 			R_PolygonVertex(v, t, rgb, a);
@@ -432,23 +453,12 @@ 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);
-				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
-		R_BeginPolygon(pic, drawflag);
+		// 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';
 			R_PolygonVertex(v, t, rgb, a);
@@ -461,7 +471,8 @@ 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();
-		R_BeginPolygon(pic, drawflag);
+		// 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,15 +483,11 @@ 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
-		R_BeginPolygon(pic, drawflag);
+		// 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';
 			R_PolygonVertex(v, t, rgb, a);
@@ -493,23 +500,19 @@ 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);
-				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
-		R_BeginPolygon(pic, drawflag);
+		// 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 +523,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);
-				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 */