cvar_t crosshair_flashspeed = {CVAR_SAVE, "crosshair_flashspeed", "2"};
cvar_t crosshair_flashrange = {CVAR_SAVE, "crosshair_flashrange", "0.1"};
cvar_t crosshair_size = {CVAR_SAVE, "crosshair_size", "1"};
-cvar_t crosshair_static = {CVAR_SAVE, "crosshair_static", "0"};
+cvar_t crosshair_static = {CVAR_SAVE, "crosshair_static", "1"};
// must match NUMCROSSHAIRS in gl_draw.c
#define NUMCROSSHAIRS 5
Cvar_RegisterVariable(&crosshair_static);
}
-void R_DrawCrosshairSprite(rtexture_t *texture, vec3_t origin, vec_t scale, float cr, float cg, float cb, float ca)
-{
- rmeshstate_t m;
- float diff[3];
-
- if (fogenabled)
- {
- VectorSubtract(origin, r_origin, diff);
- ca *= 1 - exp(fogdensity/DotProduct(diff,diff));
- }
-
- memset(&m, 0, sizeof(m));
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- m.depthdisable = true;
- m.tex[0] = R_GetTexture(texture);
- R_Mesh_Matrix(&r_identitymatrix);
- R_Mesh_State(&m);
-
- GL_Color(cr * r_colorscale, cg * r_colorscale, cb * r_colorscale, ca);
- R_Mesh_GetSpace(4);
- varray_texcoord[0][ 0] = 0;varray_texcoord[0][ 1] = 0;
- varray_texcoord[0][ 4] = 0;varray_texcoord[0][ 5] = 1;
- varray_texcoord[0][ 8] = 1;varray_texcoord[0][ 9] = 1;
- varray_texcoord[0][12] = 1;varray_texcoord[0][13] = 0;
- varray_vertex[0] = origin[0] - vright[0] * scale - vup[0] * scale;
- varray_vertex[1] = origin[1] - vright[1] * scale - vup[1] * scale;
- varray_vertex[2] = origin[2] - vright[2] * scale - vup[2] * scale;
- varray_vertex[4] = origin[0] - vright[0] * scale + vup[0] * scale;
- varray_vertex[5] = origin[1] - vright[1] * scale + vup[1] * scale;
- varray_vertex[6] = origin[2] - vright[2] * scale + vup[2] * scale;
- varray_vertex[8] = origin[0] + vright[0] * scale + vup[0] * scale;
- varray_vertex[9] = origin[1] + vright[1] * scale + vup[1] * scale;
- varray_vertex[10] = origin[2] + vright[2] * scale + vup[2] * scale;
- varray_vertex[12] = origin[0] + vright[0] * scale - vup[0] * scale;
- varray_vertex[13] = origin[1] + vright[1] * scale - vup[1] * scale;
- varray_vertex[14] = origin[2] + vright[2] * scale - vup[2] * scale;
- R_Mesh_Draw(4, 2, polygonelements);
-}
-
void R_GetCrosshairColor(float *out)
{
int i;
vec3_t v1, v2, spriteorigin;
vec_t spritescale;
vec4_t color;
+ trace_t trace;
+ if (r_letterbox.value)
+ return;
if (crosshair_static.integer)
return;
num = crosshair.integer;
return;
if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
return;
- pic = Draw_CachePic(va("gfx/crosshair%i.tga", num));
+ pic = Draw_CachePic(va("gfx/crosshair%i.tga", num), true);
if (!pic)
return;
R_GetCrosshairColor(color);
// get the forward vector for the gun (not the view)
AngleVectors(cl.viewangles, v2, NULL, NULL);
- //VectorCopy(r_origin, v1);
+ //VectorCopy(r_vieworigin, v1);
VectorMA(v1, 8192, v2, v2);
- spritescale = CL_TraceLine(v1, v2, spriteorigin, NULL, 0, true, NULL) * (8192.0f / 40.0f) * crosshair_size.value;
+ trace = CL_TraceBox(v1, vec3_origin, vec3_origin, v2, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false);
+ spritescale = trace.fraction * (8192.0f / 40.0f) * crosshair_size.value;
+ VectorCopy(trace.endpos, spriteorigin);
// draw the sprite
- R_DrawCrosshairSprite(pic->tex, spriteorigin, spritescale, color[0], color[1], color[2], color[3]);
+ R_DrawSprite(GL_SRC_ALPHA, GL_ONE, pic->tex, true, spriteorigin, r_viewright, r_viewup, spritescale, -spritescale, -spritescale, spritescale, color[0], color[1], color[2], color[3]);
}
void R_Draw2DCrosshair(void)
int num;
cachepic_t *pic;
vec4_t color;
+ if (r_letterbox.value)
+ return;
if (!crosshair_static.integer)
return;
num = crosshair.integer;
return;
if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
return;
- pic = Draw_CachePic(va("gfx/crosshair%i.tga", num));
+ pic = Draw_CachePic(va("gfx/crosshair%i.tga", num), true);
if (pic)
{
R_GetCrosshairColor(color);