X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmiscfunctions.qc;h=a0d7b8789c2273ad34ed1cbe9750a2eb795e205c;hb=468b023e4b41cbd40bae363aa136b102a63fc811;hp=7983e740f1a0862d90a958fa2b64f214653249ef;hpb=437d67dbc7631d6c49e922990d96461d3ff4b7b2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 7983e740f..a0d7b8789 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,12 +1,12 @@ #include "miscfunctions.qh" -#include "hud.qh" +#include "hud/_mod.qh" -#include "../common/command/generic.qh" +#include -#include "../common/teams.qh" +#include -#include "../lib/csqcmodel/cl_model.qh" +#include void AuditLists() @@ -68,17 +68,18 @@ 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(); } float RegisterTeam(entity Team) { + assert_once(Team.team, eprint(Team)); entity tm; AuditLists(); for(tm = teams.sort_next; tm; tm = tm.sort_next) @@ -118,12 +119,13 @@ void RemoveTeam(entity Team) entity GetTeam(int Team, 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; - entity tm = spawn(); + return NULL; + entity tm = new_pure(team); tm.team = Team; teamslots[num] = tm; RegisterTeam(tm); @@ -155,18 +157,10 @@ float PreviewExists(string name) return false; } -vector rotate(vector v, float a) -{ - vector w = '0 0 0'; - // FTEQCC SUCKS AGAIN - w.x = v.x * cos(a) + v.y * sin(a); - w.y = -1 * v.x * sin(a) + v.y * cos(a); - return w; -} - // decolorizes and team colors the player name when needed string playername(string thename, float teamid) { + TC(int, teamid); string t; if (teamplay) { @@ -198,10 +192,6 @@ vector project_3d_to_2d(vector vec) return vec; } -void dummyfunction(float a1, float a2, float a3, float a4, float a5, float a6, float a7, float a8) -{ -} - float expandingbox_sizefactor_from_fadelerp(float fadelerp) { return 1.2 / (1.2 - fadelerp); @@ -234,6 +224,10 @@ void drawborderlines(float thickness, vector pos, vector dim, vector color, floa void drawpic_tiled(vector pos, string pic, vector sz, vector area, vector color, float theAlpha, float drawflag) { + pos = HUD_Shift(pos); + sz = HUD_Scale(sz); + area = HUD_Scale(area); + vector current_pos = '0 0 0', end_pos, new_size = '0 0 0', ratio = '0 0 0'; end_pos = pos + area; @@ -268,6 +262,43 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theSc drawpic_skin(position, pic, theScale, rgb, theAlpha * fadelerp, flag); } +void HUD_Scale_Disable() +{ + hud_scale = '1 1 0'; + hud_shift = '0 0 0'; + drawfontscale = hud_scale; +} + +void HUD_Scale_Enable() +{ + hud_scale = hud_scale_current; + hud_shift = hud_shift_current; + drawfontscale = hud_scale; +} + +vector HUD_Scale(vector v) +{ + v.x = HUD_ScaleX(v.x); + v.y = HUD_ScaleY(v.y); + return v; +} + +vector HUD_Shift(vector v) +{ + v.x = HUD_ShiftX(v.x); + v.y = HUD_ShiftY(v.y); + return v; +} + +float stringwidth(string text, float handleColors, vector sz) +{ + vector dfs = drawfontscale; + drawfontscale = '1 1 0'; + float r = stringwidth_builtin(text, handleColors, sz); + drawfontscale = dfs; + return r; +} + // 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); @@ -285,13 +316,16 @@ void drawstring_expanding(vector position, string text, vector theScale, vector float sz; sz = expandingbox_sizefactor_from_fadelerp(fadelerp); + drawfontscale = hud_scale * sz; + vector dfs = drawfontscale; drawfontscale = sz * '1 1 0'; - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); - drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, false, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), rgb, theAlpha * (1 - fadelerp), flag); + float textaspect = stringwidth_builtin(text, false, theScale * (sz / drawfontscale.x)) / (theScale.x * sz); + drawfontscale = dfs; + drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, textaspect), text, HUD_Scale(theScale * (sz / drawfontscale.x)), rgb, theAlpha * (1 - fadelerp), flag); // width parameter: - // (scale_x * sz / drawfontscale_x) * drawfontscale_x * SIZE1 / (scale_x * sz) + // (scale_x * sz / drawfontscale.x) * drawfontscale.x * SIZE1 / (scale_x * sz) // SIZE1 - drawfontscale = '1 1 0'; + drawfontscale = hud_scale; } // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box @@ -305,10 +339,10 @@ void drawcolorcodedstring_expanding(vector position, string text, vector theScal float sz; sz = expandingbox_sizefactor_from_fadelerp(fadelerp); - drawfontscale = sz * '1 1 0'; - dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); - drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, true, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), theAlpha * (1 - fadelerp), flag); - drawfontscale = '1 1 0'; + drawfontscale = hud_scale * sz; + // eventually replace with drawcolorcodedstring + drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth_builtin(text, true, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), theAlpha * (1 - fadelerp), flag); + drawfontscale = hud_scale; } void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, float theAlpha, float drawflag, float fadelerp) { @@ -316,6 +350,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) { @@ -348,15 +389,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; + float 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; + 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) { @@ -489,66 +530,17 @@ void DrawCircleClippedPic(vector centre, float radi, string pic, float f, vector 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 += 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(); } } -vector getplayerorigin(int pl) -{ - entity e; - - e = CSQCModel_server2csqc(pl + 1); - if(e) - return e.origin; - - e = entcs_receiver[pl]; - if(e) - return e.origin; - - return GETPLAYERORIGIN_ERROR; -} - -float getplayeralpha(float pl) -{ - entity e; - - e = CSQCModel_server2csqc(pl + 1); - if(e) - return e.alpha; - - return 1; -} - -vector getcsqcplayercolor(float pl) -{ - entity e; - - e = CSQCModel_server2csqc(pl); - if(e) - { - if(e.colormap > 0) - return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, true); - } - - return '1 1 1'; -} - -float getplayerisdead(float pl) -{ - entity e; - - e = CSQCModel_server2csqc(pl + 1); - if(e) - return e.csqcmodel_isdead; - - return false; -} - -void URI_Get_Callback(int id, float status, string data) +/** engine callback */ +void URI_Get_Callback(int id, int status, string data) { + TC(int, id); TC(int, status); if(url_URI_Get_Callback(id, status, data)) { // handled @@ -568,16 +560,6 @@ void URI_Get_Callback(int id, float status, string data) } } -void draw_beginBoldFont() -{ - drawfont = FONT_USER+2; -} - -void draw_endBoldFont() -{ - drawfont = FONT_USER+1; -} - void Accuracy_LoadLevels() { if(autocvar_accuracy_color_levels != acc_color_levels)