X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=a653f4bf1e5ca0af486b06dd58d6f61aafd143a1;hb=7069dc3f41678554d089db582ccf16da1f8874a5;hp=8c0bf14ea432a2c120f9f6bbb80a8ab381875436;hpb=df2fe9b28cb6210b671bec6d5ae834ff4eb2e2db;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 8c0bf14ea..a653f4bf1 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,8 +1,10 @@ #include "miscfunctions.qh" -#include "hud/all.qh" +#include "autocvars.qh" +#include "hud/_mod.qh" +#include "main.qh" -#include +#include #include @@ -68,11 +70,11 @@ void RemovePlayer(entity player) void MoveToLast(entity e) { AuditLists(); - other = e.sort_next; - while(other) + entity ent = e.sort_next; + while(ent) { - SORT_SWAP(other, e); - other = e.sort_next; + SORT_SWAP(ent, e); + ent = e.sort_next; } AuditLists(); } @@ -119,12 +121,12 @@ 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]; if (!add) - return world; + return NULL; entity tm = new_pure(team); tm.team = Team; teamslots[num] = tm; @@ -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'; @@ -299,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); @@ -350,6 +400,13 @@ void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, f drawcolorcodedstring_expanding(pos, text, '1 1 0' * sz.y, theAlpha, drawflag, fadelerp); } +void update_mousepos() +{ + mousepos += getmousepos() * autocvar_menu_mouse_speed; + mousepos.x = bound(0, mousepos.x, vid_conwidth); + mousepos.y = bound(0, mousepos.y, vid_conheight); +} + // this draws the triangles of a model DIRECTLY. Don't expect high performance, really... float PolyDrawModelSurface(entity e, float i_s) { @@ -364,7 +421,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); @@ -382,20 +439,15 @@ 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'; - - x = cos(f * 2 * M_PI); - y = sin(f * 2 * M_PI); - q = fabs(x) + fabs(y); - x /= q; - y /= q; + centre = HUD_Shift(centre); + ringsize = HUD_Scale(ringsize); 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); @@ -412,23 +464,19 @@ 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); - 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 - 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); @@ -441,7 +489,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); @@ -452,15 +501,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); @@ -473,23 +518,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); @@ -500,40 +541,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 @@ -549,7 +586,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); } } @@ -557,14 +594,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) @@ -602,4 +637,3 @@ vector Accuracy_GetColor(float accuracy) color = color + factor * (acc_col[j+1] - color); return color; } -