relocated the CL_SendMove call to put it at the end of network parsing (and only...

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index 6ab2619a0871efd27893fc29e70590f34689a663..1af462721a73e0e2a233e909c8dc358dd36b57ce 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -1,9 +1,13 @@
+
 #include "quakedef.h"
+#include "cl_collision.h"
 
-cvar_t crosshair_brightness = {CVAR_SAVE, "crosshair_brightness", "1.0"};
-cvar_t crosshair_alpha = {CVAR_SAVE, "crosshair_alpha", "1.0"};
+cvar_t crosshair_brightness = {CVAR_SAVE, "crosshair_brightness", "1"};
+cvar_t crosshair_alpha = {CVAR_SAVE, "crosshair_alpha", "1"};
 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", "1"};
 
 // must match NUMCROSSHAIRS in gl_draw.c
 #define NUMCROSSHAIRS 5
@@ -14,16 +18,16 @@ void R_Crosshairs_Init(void)
        Cvar_RegisterVariable(&crosshair_alpha);
        Cvar_RegisterVariable(&crosshair_flashspeed);
        Cvar_RegisterVariable(&crosshair_flashrange);
+       Cvar_RegisterVariable(&crosshair_size);
+       Cvar_RegisterVariable(&crosshair_static);
 }
 
-void DrawCrosshair(int num)
+void R_GetCrosshairColor(float *out)
 {
        int i;
-       byte *color;
+       qbyte *color;
        float scale, base;
-       if (num < 0 || num >= NUMCROSSHAIRS)
-               num = 0;
-       if (cl.viewentity)
+       if (cl.viewentity >= 1 && cl.viewentity <= cl.maxclients)
        {
                i = (cl.scores[cl.viewentity-1].colors & 0xF) << 4;
                if (i >= 208 && i < 224) // blue
@@ -33,12 +37,84 @@ void DrawCrosshair(int num)
        }
        else
                i = 15;
-       color = (byte *) &d_8to24table[i];
+       color = (qbyte *) &palette_complete[i];
        if (crosshair_flashspeed.value >= 0.01f)
                base = (sin(realtime * crosshair_flashspeed.value * (M_PI*2.0f)) * crosshair_flashrange.value);
        else
                base = 0.0f;
        scale = crosshair_brightness.value * (1.0f / 255.0f);
-       DrawQ_Pic(vid.conwidth * 0.5f - 8.0f, vid.conheight * 0.5f - 8.0f, va("gfx/crosshair%i.tga", num + 1), 16.0f, 16.0f, color[0] * scale + base, color[1] * scale + base, color[2] * scale + base, crosshair_alpha.value, 0);
+       out[0] = color[0] * scale + base;
+       out[1] = color[1] * scale + base;
+       out[2] = color[2] * scale + base;
+       out[3] = crosshair_alpha.value;
+
+       // clamp the colors and alpha
+       out[0] = bound(0, out[0], 1);
+       out[1] = bound(0, out[1], 1);
+       out[2] = bound(0, out[2], 1);
+       out[3] = bound(0, out[3], 1.0f);
+}
+
+void R_DrawWorldCrosshair(void)
+{
+       int num;
+       cachepic_t *pic;
+       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;
+       if (num < 1 || num > NUMCROSSHAIRS || cl.intermission)
+               return;
+       if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
+               return;
+       pic = Draw_CachePic(va("gfx/crosshair%i.tga", num), true);
+       if (!pic)
+               return;
+       R_GetCrosshairColor(color);
+
+       // trace the shot path up to a certain distance
+       VectorCopy(cl_entities[cl.viewentity].render.origin, v1);
+       v1[2] += 16; // HACK: this depends on the QC
+
+       // get the forward vector for the gun (not the view)
+       AngleVectors(cl.viewangles, v2, NULL, NULL);
+       //VectorCopy(r_vieworigin, v1);
+       VectorMA(v1, 8192, v2, v2);
+       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_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;
+       if (num < 1 || num > NUMCROSSHAIRS || cl.intermission)
+               return;
+       if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
+               return;
+       pic = Draw_CachePic(va("gfx/crosshair%i.tga", num), true);
+       if (pic)
+       {
+               R_GetCrosshairColor(color);
+               DrawQ_Pic((vid.conwidth - pic->width * crosshair_size.value) * 0.5f, (vid.conheight - pic->height * crosshair_size.value) * 0.5f, pic->name, pic->width * crosshair_size.value, pic->height * crosshair_size.value, color[0], color[1], color[2], color[3], 0);
+       }
+}
+
+
+
+