if(cvar("viewsize") < 120)
CSQC_common_hud();
-
- // ring around crosshair representing velocity-dependent damage for the nex
- if (activeweapon == WEP_NEX)
- {
- float x, y, q, d;
- vector ringorigin, ringsize, t;
- ringorigin = '0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight;
- ringsize = 64 * '1 1 0'; // testing only
-
- // TODO send from server
- float maxvel, minvel, curvel;
- minvel = 400;
- maxvel = 1000;
- curvel = vlen(pmove_vel);
-
- f = bound(0, (curvel - minvel) / (maxvel - minvel), 1);
- x = cos(f * 2 * M_PI);
- y = sin(f * 2 * M_PI);
- q = fabs(x) + fabs(y);
- x /= q;
- y /= q;
-
- if(f >= 1)
- {
- // draw full rectangle
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- v_x += 0.5 * ringsize_x; t += '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_y += 0.5 * ringsize_y; t += '0.5 -0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x -= 0.5 * ringsize_y; t -= '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_y -= 0.5 * ringsize_y; t -= '0.5 -0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
- R_EndPolygon();
-
- d = q - 1;
- if(d > 0)
- {
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x += 0.5 * ringsize_x; t += '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
- }
- }
- else if(f > 0.75)
- {
- // draw upper and first triangle
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- v_x += 0.5 * ringsize_x; t += '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_y += 0.5 * ringsize_y; t += '0.5 -0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x -= 0.5 * ringsize_y; t -= '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
- R_EndPolygon();
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x -= 0.5 * ringsize_y; t -= '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_y -= 0.5 * ringsize_y; t -= '0.5 -0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- d = q - 0.75;
- if(d <= 0)
- R_EndPolygon();
- }
- else if(f > 0.5)
- {
- // draw upper triangle
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- v_x += 0.5 * ringsize_x; t += '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_y += 0.5 * ringsize_y; t += '0.5 -0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x -= 0.5 * ringsize_y; t -= '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
- R_EndPolygon();
-
- d = q - 0.5;
- if(d > 0)
- {
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x -= 0.5 * ringsize_x; t -= '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
- }
- }
- else if(f > 0.25)
- {
- // draw first triangle
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x += 0.5 * ringsize_y; t += '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_y += 0.5 * ringsize_y; t += '0.5 -0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- d = q - 0.25;
- if(d <= 0)
- R_EndPolygon();
- }
- else
- {
- d = q;
- if(d > 0)
- {
- R_BeginPolygon("gfx/nex_ring.tga", DRAWFLAG_ADDITIVE);
- v = ringorigin; t = '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
-
- v = ringorigin; t = '0.5 0.5 0';
- v_x += 0.5 * ringsize_x; t += '0.5 0.5 0';
- R_PolygonVertex(v, t, '1 1 1', 1);
- }
- }
-
- if(d > 0)
- {
- v = ringorigin; 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';
- R_PolygonVertex(v, t, '1 1 1', 1);
- R_EndPolygon();
- }
- }
-
// crosshair goes VERY LAST
if(!scoreboard_active && !camera_active && intermission != 2) {
// TrueAim check
wcross_scale *= 1 - cvar("_menu_alpha");
wcross_alpha *= 1 - cvar("_menu_alpha");
+ ring_scale = cvar("crosshair_ring_size");
+
+ float f, a;
+ wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
// ring around crosshair representing bullets left in camping rifle clip
- if (activeweapon == WEP_CAMPINGRIFLE)
+ if (activeweapon == WEP_CAMPINGRIFLE && cr_maxbullets)
{
- ring_scale = cvar("crosshair_campingrifle_ring_size");
- bullets = bound(0, getstati(STAT_BULLETS_LOADED), 4);
+ bullets = getstati(STAT_BULLETS_LOADED);
+ a = cvar("crosshair_campingrifle_bulletcounter_alpha");
+ f = bound(0, bullets / cr_maxbullets, 1);
+
+ DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
}
- else
- bullets = 0;
+ else if (activeweapon == WEP_NEX) // ring around crosshair representing velocity-dependent damage for the nex
+ {
+ float curvel;
+ a = cvar("crosshair_nexvelocity_alpha");
+ curvel = vlen('1 0 0' * pmove_vel_x + '0 1 0' * pmove_vel_y);
+ f = bound(0, (curvel - nex_minvelocity) / (nex_maxvelocity - nex_minvelocity), 1);
-#define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
- drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+ DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE);
+ }
#define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
do \
}
wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
- if(bullets)
- {
- CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha);
- }
CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
+
+ if(cvar("crosshair_dot"))
+ CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha"));
+
wcross_name_alpha_goal_prev = f;
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff