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=0e88cd5a51043107b2d2246e79351151dccc538e;hb=b2108fdf144cd75a50be6fba1d68a642f41a1531;hpb=8c965aa90470cfa8cbfaff88db71b6b5899a90ce diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 0e88cd5a51..a7af09c7c8 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,5 +1,7 @@ #include "miscfunctions.qh" +#include "autocvars.qh" +#include "defs.qh" #include "hud/_mod.qh" #include @@ -119,7 +121,7 @@ void RemoveTeam(entity Team) entity GetTeam(int Team, bool add) { - TC(int, Team); TC(bool, add); + TC(int, Team); TC(bool, add); int num = (Team == NUM_SPECTATOR) ? 16 : Team; if(teamslots[num]) return teamslots[num]; @@ -192,6 +194,15 @@ vector project_3d_to_2d(vector vec) return vec; } +bool projected_on_screen(vector screen_pos) +{ + return screen_pos.z >= 0 + && screen_pos.x >= 0 + && screen_pos.y >= 0 + && screen_pos.x < vid_conwidth + && screen_pos.y < vid_conheight; +} + float expandingbox_sizefactor_from_fadelerp(float fadelerp) { return 1.2 / (1.2 - fadelerp); @@ -203,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'; @@ -371,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); @@ -389,20 +422,21 @@ void PolyDrawModel(entity e) void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector rgb, float a, float drawflag) { - float x, y, q, d; vector ringsize, v, t; ringsize = radi * '1 1 0'; + centre = HUD_Shift(centre); + ringsize = HUD_Scale(ringsize); - x = cos(f * 2 * M_PI); - y = sin(f * 2 * M_PI); - q = fabs(x) + fabs(y); - x /= q; - y /= q; + 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 - 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); @@ -419,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); @@ -448,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); @@ -459,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); @@ -480,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); @@ -507,40 +523,36 @@ 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 += x * 0.5 * ringsize.x; t += x * '0.5 0.5 0'; - v.y += y * 0.5 * ringsize.y; t += y * '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 */ void URI_Get_Callback(int id, int status, string data) { - TC(int, id); TC(int, status); + TC(int, id); TC(int, status); if(url_URI_Get_Callback(id, status, data)) { // handled @@ -556,7 +568,7 @@ void URI_Get_Callback(int id, int status, string data) } else { - LOG_INFOF("Received HTTP request data for an invalid id %d.\n", id); + LOG_INFOF("Received HTTP request data for an invalid id %d.", id); } } @@ -564,14 +576,12 @@ void Accuracy_LoadLevels() { if(autocvar_accuracy_color_levels != acc_color_levels) { - if(acc_color_levels) - strunzone(acc_color_levels); - acc_color_levels = strzone(autocvar_accuracy_color_levels); + strcpy(acc_color_levels, autocvar_accuracy_color_levels); acc_levels = tokenize_console(acc_color_levels); if(acc_levels > MAX_ACCURACY_LEVELS) acc_levels = MAX_ACCURACY_LEVELS; if(acc_levels < 2) - LOG_INFO("Warning: accuracy_color_levels must contain at least 2 values\n"); + LOG_INFO("Warning: accuracy_color_levels must contain at least 2 values"); int i; for(i = 0; i < acc_levels; ++i) @@ -609,4 +619,3 @@ vector Accuracy_GetColor(float accuracy) color = color + factor * (acc_col[j+1] - color); return color; } -