X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=12f78522020b2e1d94e20249a41ac9198d91ed13;hb=be64ed76fa9770eb88714e6ce21ddb4563560a82;hp=de56efa7ef7d5966e11e85a81e02e98031f7add1;hpb=ba0988ca930f50286f8cf3b6c114ebc6584964af;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index de56efa7e..12f785220 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -1,46 +1,16 @@ -#if defined(CSQC) - #include "../dpdefs/csprogsdefs.qc" - #include "Defs.qc" - #include "../common/util.qh" - #include "autocvars.qh" - #include "../csqcmodellib/interpolate.qh" - #include "teamradar.qh" - #include "hud.qh" - #include "main.qh" - #include "../csqcmodellib/cl_model.qh" -#elif defined(MENUQC) -#elif defined(SVQC) -#endif - -float teamradar_angle; // player yaw angle -vector teamradar_origin3d_in_texcoord; // player origin -vector teamradar_origin2d; // 2D origin -vector teamradar_size2d; // 2D size -vector teamradar_extraclip_mins, teamradar_extraclip_maxs; // for non-centered radar display -float teamradar_size; // 2D scale factor -float v_flipped; - -float vlen2d(vector v) -{ - return sqrt(v.x * v.x + v.y * v.y); -} - -float vlen_maxnorm2d(vector v) -{ - return max(v.x, v.y, -v.x, -v.y); -} +#include "teamradar.qh" -float vlen_minnorm2d(vector v) -{ - return min(max(v.x, -v.x), max(v.y, -v.y)); -} +#include +#include +#include +#include vector teamradar_3dcoord_to_texcoord(vector in) { vector out; - out_x = (in.x - mi_picmin.x) / (mi_picmax.x - mi_picmin.x); - out_y = (in.y - mi_picmin.y) / (mi_picmax.y - mi_picmin.y); - out_z = 0; + out.x = (in.x - mi_picmin.x) / (mi_picmax.x - mi_picmin.x); + out.y = (in.y - mi_picmin.y) / (mi_picmax.y - mi_picmin.y); + out.z = 0; return out; } @@ -49,20 +19,42 @@ vector teamradar_texcoord_to_2dcoord(vector in) vector out; in -= teamradar_origin3d_in_texcoord; - out = rotate(in, teamradar_angle * DEG2RAD); - out_y = - out.y; // screen space is reversed + out = Rotate(in, teamradar_angle * DEG2RAD); + out.y = - out.y; // screen space is reversed out = out * teamradar_size; if(v_flipped) - out_x = -out.x; + out.x = -out.x; out += teamradar_origin2d; return out; } -vector yinvert(vector v) + +vector teamradar_2dcoord_to_texcoord(vector in) { - v_y = 1 - v.y; - return v; + vector out; + out = in; + + out -= teamradar_origin2d; + if(v_flipped) + out_x = -out_x; + out = out / teamradar_size; + + out_y = - out_y; // screen space is reversed + out = Rotate(out, -teamradar_angle * DEG2RAD); + + out += teamradar_origin3d_in_texcoord; + + return out; +} + +vector teamradar_texcoord_to_3dcoord(vector in,float oz) +{ + vector out; + out_x = in_x * (mi_picmax_x - mi_picmin_x) + mi_picmin_x; + out_y = in_y * (mi_picmax_y - mi_picmin_y) + mi_picmin_y; + out_z = oz; + return out; } void draw_teamradar_background(float fg) @@ -74,7 +66,7 @@ void draw_teamradar_background(float fg) { fga = 1; fgc = '1 1 1' * fg; - R_BeginPolygon(minimapname, DRAWFLAG_SCREEN | DRAWFLAG_MIPMAP); + R_BeginPolygon(minimapname, DRAWFLAG_SCREEN | DRAWFLAG_MIPMAP, true); if(v_flipped) { R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord3), yinvert(mi_pictexcoord3), fgc, fga); @@ -99,80 +91,78 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb) coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(coord3d)); - makevectors(pangles - '0 1 0' * teamradar_angle); + vector forward, right, up; + MAKE_VECTORS(pangles - '0 1 0' * teamradar_angle, forward, right, up); if(v_flipped) { - v_forward_x = -v_forward.x; - v_right_x = -v_right.x; - v_up_x = -v_up.x; + forward.x = -forward.x; + right.x = -right.x; + up.x = -up.x; // TODO: unused! } - v_forward_z = 0; - v_forward = normalize(v_forward); - v_forward.y *= -1.0; - v_right_x = -v_forward.y; - v_right_y = v_forward.x; + forward.z = 0; + forward = normalize(forward); + forward.y *= -1.0; + right.x = -forward.y; + right.y = forward.x; if(rgb == '1 1 1') rgb2 = '0 0 0'; else rgb2 = '1 1 1'; - R_BeginPolygon("", 0); - R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, panel_fg_alpha); - R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, panel_fg_alpha); - R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, panel_fg_alpha); - R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, panel_fg_alpha); + R_BeginPolygon("", 0, true); + R_PolygonVertex(coord+forward*3, '0 0 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord+right*4-forward*2.5, '0 1 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord-forward*2, '1 0 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord-right*4-forward*2.5, '1 1 0', rgb2, panel_fg_alpha); R_EndPolygon(); - R_BeginPolygon("", 0); - R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, panel_fg_alpha); - R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, panel_fg_alpha); - R_PolygonVertex(coord-v_forward, '1 0 0', rgb, panel_fg_alpha); - R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, panel_fg_alpha); + R_BeginPolygon("", 0, true); + R_PolygonVertex(coord+forward*2, '0 0 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord+right*3-forward*2, '0 1 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord-forward, '1 0 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord-right*3-forward*2, '1 1 0', rgb, panel_fg_alpha); R_EndPolygon(); } -void draw_teamradar_icon(vector coord, float icon, entity pingdata, vector rgb, float a) +void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb, float a) { - float dt; - vector v; - float i; - coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(coord)); - drawpic(coord - '4 4 0', strcat("gfx/teamradar_icon_", ftos(icon)), '8 8 0', rgb, a, 0); + drawpic_builtin(coord - '4 4 0', strcat("gfx/teamradar_icon_", ftos(icon.m_radaricon)), '8 8 0', rgb, a, 0); if(pingdata) { - for(i = 0; i < MAX_TEAMRADAR_TIMES; ++i) + for(int i = 0; i < MAX_TEAMRADAR_TIMES; ++i) { - dt = pingdata.(teamradar_times[i]); + float dt = pingdata.(teamradar_times[i]); if(dt == 0) continue; dt = time - dt; if(dt >= 1 || dt <= 0) continue; - v = '2 2 0' * teamradar_size * dt; - drawpic(coord - 0.5 * v, "gfx/teamradar_ping", v, '1 1 1', (1 - dt) * a, DRAWFLAG_ADDITIVE); + vector v = '2 2 0' * teamradar_size * dt; + drawpic_builtin(coord - 0.5 * v, "gfx/teamradar_ping", v, '1 1 1', (1 - dt) * a, DRAWFLAG_ADDITIVE); } } } void draw_teamradar_link(vector start, vector end, int colors) { + TC(int, colors); vector c0, c1, norm; start = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(start)); end = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(end)); norm = normalize(start - end); - norm_z = norm.x; - norm_x = -norm.y; - norm_y = norm.z; - norm_z = 0; + norm.z = norm.x; + norm.x = -norm.y; + norm.y = norm.z; + norm.z = 0; c0 = colormapPaletteColor(colors & 0x0F, false); c1 = colormapPaletteColor((colors & 0xF0) / 0x10, false); - R_BeginPolygon("", 0); + R_BeginPolygon("", 0, true); R_PolygonVertex(start - norm, '0 0 0', c0, panel_fg_alpha); R_PolygonVertex(start + norm, '0 1 0', c0, panel_fg_alpha); R_PolygonVertex(end + norm, '1 1 0', c1, panel_fg_alpha); @@ -180,14 +170,6 @@ void draw_teamradar_link(vector start, vector end, int colors) R_EndPolygon(); } -float hud_panel_radar_scale; // window size = ...qu -float hud_panel_radar_foreground_alpha; -float hud_panel_radar_rotation; -vector hud_panel_radar_size; -float hud_panel_radar_zoommode; -float hud_panel_radar_maximized_zoommode; -float hud_panel_radar_maximized_rotation; - void teamradar_loadcvars() { v_flipped = autocvar_v_flipped; @@ -204,43 +186,41 @@ void teamradar_loadcvars() hud_panel_radar_maximized_zoommode = autocvar_hud_panel_radar_maximized_zoommode; // others default to 0 - // match this to defaultXonotic.cfg! + // match this to default hud cfg file! if(!hud_panel_radar_scale) hud_panel_radar_scale = 4096; if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * panel_fg_alpha; - if(!hud_panel_radar_size.x) hud_panel_radar_size_x = 128; - if(!hud_panel_radar_size.y) hud_panel_radar_size_y = hud_panel_radar_size.x; + if(!hud_panel_radar_size.x) hud_panel_radar_size.x = 128; + if(!hud_panel_radar_size.y) hud_panel_radar_size.y = hud_panel_radar_size.x; } // radar links -void Ent_RadarLink() +NET_HANDLE(ENT_CLIENT_RADARLINK, bool isnew) { int sendflags = ReadByte(); - InterpolateOrigin_Undo(); + InterpolateOrigin_Undo(this); - self.iflags = IFLAG_VELOCITY | IFLAG_ORIGIN; - self.classname = "radarlink"; + this.iflags = IFLAG_VELOCITY | IFLAG_ORIGIN; + if (isnew) IL_PUSH(g_radarlinks, this); if(sendflags & 1) { - self.origin_x = ReadCoord(); - self.origin_y = ReadCoord(); - self.origin_z = ReadCoord(); - setorigin(self, self.origin); + this.origin = ReadVector(); + setorigin(this, this.origin); } if(sendflags & 2) { - self.velocity_x = ReadCoord(); - self.velocity_y = ReadCoord(); - self.velocity_z = ReadCoord(); + this.velocity = ReadVector(); } if(sendflags & 4) { - self.team = ReadByte(); + this.team = ReadByte(); } - InterpolateOrigin_Note(); + return = true; + + InterpolateOrigin_Note(this); }