Skip to content

Crosshair separation #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robalni wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Crosshair separation #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ab98eb
Make drawpointer easier to read
Sep 5, 2020
a4320bc
Separate cursor from crosshair functions
Sep 5, 2020
3ea544d
Separate cursor from crosshair variables
Sep 5, 2020
aba2642
Always reset crosshair in resetcamera()
Sep 5, 2020
32373f9
Draw crosshair behind command background
Sep 5, 2020
85c8d34
Don't show crosshair if compass is visible
Sep 5, 2020
fd2c8a9
Check pointer type first
Sep 5, 2020
88339ea
Remove unused variable
Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/engine/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ extern int fog;
extern float curfogstart, curfogend;

extern float cursorx, cursory;
extern vec cursordir;
extern float crosshairx, crosshairy;
extern vec crosshairdir;

extern GLenum colormask[3];
#define COLORMASK colormask[0], colormask[1], colormask[2]
Expand Down
3 changes: 2 additions & 1 deletion src/engine/rendergl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,7 +1854,8 @@ void drawfadedslice(float start, float length, float x, float y, float size, flo
}

float cursorx = 0.5f, cursory = 0.5f;
vec cursordir(0, 0, 0);
float crosshairx = 0.5f, crosshairy = 0.5f;
vec crosshairdir(0, 0, 0);

struct framebuffercopy
{
Expand Down
17 changes: 9 additions & 8 deletions src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2228,19 +2228,19 @@ namespace game
if(vectocursor(pos, loc.x, loc.y, loc.z))
{
float amt = curtime/float(thirdpersoninterp);
cursorx = clamp(cursorx+((loc.x-cursorx)*amt), 0.f, 1.f);
cursory = clamp(cursory+((loc.y-cursory)*amt), 0.f, 1.f);
crosshairx = clamp(crosshairx+((loc.x-crosshairx)*amt), 0.f, 1.f);
crosshairy = clamp(crosshairy+((loc.y-crosshairy)*amt), 0.f, 1.f);
}
break;
}
case 2:
{
cursorx = thirdpersoncursorx;
cursory = thirdpersoncursory;
crosshairx = thirdpersoncursorx;
crosshairy = thirdpersoncursory;
break;
}
}
vecfromcursor(cursorx, cursory, 1.f, cursordir);
vecfromcursor(crosshairx, crosshairy, 1.f, crosshairdir);
}
}

Expand Down Expand Up @@ -2802,11 +2802,12 @@ namespace game
}
}

void resetcamera(bool cam, bool input)
void resetcamera(bool cam)
{
lastcamera = 0;
zoomset(false, 0);
if(input && !hud::hasinput(true)) resetcursor();
crosshairx = 0.5f;
crosshairy = 0.5f;
checkcamera();
if(cam || !focus)
{
Expand Down Expand Up @@ -2973,7 +2974,7 @@ namespace game
if(thirdpersoncursor != 1 && pthird)
{
float yaw = camera1->yaw, pitch = camera1->pitch;
vectoyawpitch(cursordir, yaw, pitch);
vectoyawpitch(crosshairdir, yaw, pitch);
findorientation(camera1->o, yaw, pitch, worldpos);
}
else findorientation(focus->o, focus->yaw, focus->pitch, worldpos);
Expand Down
4 changes: 1 addition & 3 deletions src/game/game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,8 +1662,6 @@ namespace hud
extern bool chkcond(int val, bool cond);
extern void drawindicator(int weap, int x, int y, int s);
extern void drawclip(int weap, int x, int y, float s);
extern void drawpointertex(const char *tex, int x, int y, int s, float r = 1, float g = 1, float b = 1, float fade = 1);
extern void drawpointer(int w, int h, int index);
extern int numteamkills();
extern int radarrange();
extern void drawblip(const char *tex, float area, int w, int h, float s, float blend, int style, const vec &pos, const vec &colour = vec(1, 1, 1), const char *font = "reduced", bool rotate = true, const char *text = NULL, ...);
Expand Down Expand Up @@ -1746,7 +1744,7 @@ namespace game
extern float zoom_ratio();
extern void zoomview(bool down);
extern bool tvmode(bool check = true, bool force = true);
extern void resetcamera(bool cam = true, bool input = true);
extern void resetcamera(bool cam = true);
extern void resetworld();
extern void resetstate();
extern void hiteffect(int weap, int flags, int damage, gameent *d, gameent *v, vec &dir, vec &vel, float dist, bool local = false);
Expand Down
182 changes: 103 additions & 79 deletions src/game/hud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,9 +893,9 @@ namespace hud
POINTER_HAIR, POINTER_TEAM, POINTER_ZOOM, POINTER_HIT, POINTER_MAX
};

const char *getpointer(int index, int weap = -1)
const char *getpointer(int pointertype, int weap = -1)
{
switch(index)
switch(pointertype)
{
case POINTER_RELATIVE: return pointertex;
case POINTER_GUI:
Expand Down Expand Up @@ -1310,99 +1310,105 @@ namespace hud
}
}

void drawpointer(int w, int h, int index)
static int choose_pointer_type()
{
int cs = int((index == POINTER_GUI ? cursorsize : crosshairsize)*hudsize);
float fade = index == POINTER_GUI ? cursorblend : crosshairblend;
vec c(1, 1, 1);
if(game::focus->state == CS_ALIVE && index >= POINTER_HAIR)
return hasinput() && !(!hasinput(true) || commandmillis > 0)
? POINTER_GUI
: POINTER_NONE;
}

static void draw_pointer(int w, int h, int pointertype)
Copy link
Copy Markdown
Contributor

@MoonPadUSer MoonPadUSer Sep 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be great if you could use ivec2 dims instead of int w, int h

{
if(pointertype == POINTER_NONE) return;
int size = int(cursorsize * hudsize);
float fade = cursorblend;
vec color(1, 1, 1);
int cx = int(hudwidth * cursorx);
int cy = int(hudheight * cursory);

if(ui_cursor_type == 2)
{
cy -= size / 2;
cx -= size / 2;
}
drawpointertex(getpointer(pointertype, game::focus->weapselect), cx, cy, size, color.r, color.g, color.b, fade*hudblend);
}

static int choose_crosshair_type()
{
if(!showhud || !showcrosshair || game::focus->state == CS_DEAD || !gs_playing(game::gamestate) || client::waiting() || (game::thirdpersonview(true) && game::focus != &game::player1))
return POINTER_NONE;
else if(game::focus->state == CS_EDITING) return POINTER_EDIT;
else if(game::focus->state >= CS_SPECTATOR) return POINTER_SPEC;
else if(game::inzoom()) return POINTER_ZOOM;
else if(m_team(game::gamemode, game::mutators))
{
if(crosshairweapons&2) c = vec::hexcolor(W(game::focus->weapselect, colour));
if(index == POINTER_ZOOM && game::inzoom())
vec pos = game::focus->headpos();
gameent *d = game::intersectclosest(pos, worldpos, game::focus);
if(d && d->actortype < A_ENEMY && d->team == game::focus->team) return POINTER_TEAM;
else return POINTER_HAIR;
}
else return POINTER_HAIR;
}

static void draw_crosshair(int w, int h, int pointertype)
{
if(pointertype == POINTER_NONE) return;
int size = int(crosshairsize * hudsize);
float fade = crosshairblend;
vec color(1, 1, 1);
if(game::focus->state == CS_ALIVE)
{
if(crosshairweapons&2) color = vec::hexcolor(W(game::focus->weapselect, colour));
if(pointertype == POINTER_ZOOM && game::inzoom())
{
int off = int(zoomcrosshairsize*hudsize)-cs;
int off = int(zoomcrosshairsize*hudsize)-size;
// Focused zoom ratio
float zr = game::zoom_ratio();
cs += int(off * zr);
size += int(off * zr);
fade += (zoomcrosshairblend - fade) * zr;
}
if(crosshairtone) skewcolour(c.r, c.g, c.b, crosshairtone);
int heal = m_health(game::gamemode, game::mutators, game::focus->actortype);
if(crosshairflash && game::focus->state == CS_ALIVE && game::focus->health < heal)
if(crosshairtone) skewcolour(color.r, color.g, color.b, crosshairtone);
int full_health = m_health(game::gamemode, game::mutators, game::focus->actortype);
if(crosshairflash && game::focus->state == CS_ALIVE && game::focus->health < full_health)
{
int millis = lastmillis%1000;
float amt = (millis <= 500 ? millis/500.f : 1.f-((millis-500)/500.f))*clamp(float(heal-game::focus->health)/float(heal), 0.f, 1.f);
flashcolour(c.r, c.g, c.b, 1.f, 0.f, 0.f, amt);
int millis = lastmillis % 1000;
float amt_ratio = millis <= 500 ? millis / 500.f : 1.f - ((millis - 500) / 500.f);
float health_ratio = clamp(float(full_health - game::focus->health) / float(full_health), 0.f, 1.f);
float amt = amt_ratio * health_ratio;
flashcolour(color.r, color.g, color.b, 1.f, 0.f, 0.f, amt);
}
if(crosshairthrob > 0 && regentime && game::focus->lastregen && lastmillis-game::focus->lastregen <= regentime)
{
float skew = clamp((lastmillis-game::focus->lastregen)/float(regentime/2), 0.f, 2.f);
cs += int(cs*(skew > 1.f ? 1.f-skew : skew)*(crosshairthrob*(game::focus->lastregenamt >= 0 ? 1 : -1)));
float skew = clamp((lastmillis - game::focus->lastregen) / float(regentime / 2), 0.f, 2.f);
size += int(size*(skew > 1.f ? 1.f-skew : skew)*(crosshairthrob*(game::focus->lastregenamt >= 0 ? 1 : -1)));
}
if(showcrosshair >= 2)
{
float accskew = weapons::accmod(game::focus, physics::secondaryweap(game::focus))*crosshairaccamt;
if(accskew > 0) fade /= accskew;
}
}
int cx = int(hudwidth*cursorx), cy = int(hudheight*cursory);
if(index != POINTER_GUI)
int cx = int(hudwidth * crosshairx);
int cy = int(hudheight * crosshairy);

drawpointertex(getpointer(pointertype, game::focus->weapselect), cx-size/2, cy-size/2, size, color.r, color.g, color.b, fade*hudblend);
if(pointertype > POINTER_GUI)
{
drawpointertex(getpointer(index, game::focus->weapselect), cx-cs/2, cy-cs/2, cs, c.r, c.g, c.b, fade*hudblend);
if(index > POINTER_GUI)
if(minimal(showcirclebar)) drawcirclebar(cx, cy, hudsize);
if(game::focus->state == CS_ALIVE && game::focus->hasweap(game::focus->weapselect, m_weapon(game::focus->actortype, game::gamemode, game::mutators)))
{
if(minimal(showcirclebar)) drawcirclebar(cx, cy, hudsize);
if(game::focus->state == CS_ALIVE && game::focus->hasweap(game::focus->weapselect, m_weapon(game::focus->actortype, game::gamemode, game::mutators)))
{
if(minimal(showclips, true)) drawclip(game::focus->weapselect, cx, cy, hudsize);
if(showindicator) drawindicator(game::focus->weapselect, cx, cy, int(indicatorsize*hudsize), physics::secondaryweap(game::focus));
}
if(crosshairhitspeed && totalmillis-game::focus->lasthit <= crosshairhitspeed)
{
vec c2(1, 1, 1);
if(hitcrosshairtone) skewcolour(c2.r, c2.g, c2.b, hitcrosshairtone);
else c2 = c;
drawpointertex(getpointer(POINTER_HIT, game::focus->weapselect), cx-cs/2, cy-cs/2, cs, c2.r, c2.g, c2.b, crosshairblend*hudblend);
}
if(crosshairdistance && game::focus->state == CS_EDITING) draw_textf("\fa%.1f\fwm", cx+crosshairdistancex, cy+crosshairdistancey, 0, 0, 255, 255, 255, int(hudblend*255), TEXT_RIGHT_JUSTIFY, -1, -1, 1, game::focus->o.dist(worldpos)/8.f);
if(minimal(showclips, true)) drawclip(game::focus->weapselect, cx, cy, hudsize);
if(showindicator) drawindicator(game::focus->weapselect, cx, cy, int(indicatorsize*hudsize), physics::secondaryweap(game::focus));
}
}
else
{
if(ui_cursor_type == 2)
if(crosshairhitspeed && totalmillis-game::focus->lasthit <= crosshairhitspeed)
{
cy -= cs/2;
cx -= cs/2;
vec color2(1, 1, 1);
if(hitcrosshairtone) skewcolour(color2.r, color2.g, color2.b, hitcrosshairtone);
else color2 = color;
drawpointertex(getpointer(POINTER_HIT, game::focus->weapselect), cx-size/2, cy-size/2, size, color2.r, color2.g, color2.b, crosshairblend*hudblend);
}
drawpointertex(getpointer(index, game::focus->weapselect), cx, cy, cs, c.r, c.g, c.b, fade*hudblend);
}
}

void drawpointers(int w, int h)
{
int index = POINTER_NONE;
if(hasinput()) index = !hasinput(true) || commandmillis > 0 ? POINTER_NONE : POINTER_GUI;
else if(!showhud || !showcrosshair || game::focus->state == CS_DEAD || !gs_playing(game::gamestate) || client::waiting() || (game::thirdpersonview(true) && game::focus != &game::player1))
index = POINTER_NONE;
else if(game::focus->state == CS_EDITING) index = POINTER_EDIT;
else if(game::focus->state >= CS_SPECTATOR) index = POINTER_SPEC;
else if(game::inzoom()) index = POINTER_ZOOM;
else if(m_team(game::gamemode, game::mutators))
{
vec pos = game::focus->headpos();
gameent *d = game::intersectclosest(pos, worldpos, game::focus);
if(d && d->actortype < A_ENEMY && d->team == game::focus->team) index = POINTER_TEAM;
else index = POINTER_HAIR;
}
else index = POINTER_HAIR;
if(index > POINTER_NONE)
{
hudmatrix.ortho(0, hudwidth, hudheight, 0, -1, 1);
flushhudmatrix();
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
drawpointer(w, h, index);
glDisable(GL_BLEND);
if(crosshairdistance && game::focus->state == CS_EDITING) draw_textf("\fa%.1f\fwm", cx+crosshairdistancex, cy+crosshairdistancey, 0, 0, 255, 255, 255, int(hudblend*255), TEXT_RIGHT_JUSTIFY, -1, -1, 1, game::focus->o.dist(worldpos)/8.f);
}
}

Expand Down Expand Up @@ -1757,7 +1763,17 @@ namespace hud
glDisable(GL_BLEND);
}
if(progressing || (commandmillis <= 0 && !curcompass)) UI::render();
if(!progressing) drawpointers(hudwidth, hudheight);

int pointertype = choose_pointer_type();
if(!progressing && pointertype != POINTER_NONE)
{
hudmatrix.ortho(0, hudwidth, hudheight, 0, -1, 1);
flushhudmatrix();
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
draw_pointer(hudwidth, hudheight, pointertype);
glDisable(GL_BLEND);
}
}

void drawconsole(int type, int w, int h, int x, int y, int s, float fade)
Expand Down Expand Up @@ -2604,8 +2620,8 @@ namespace hud
Texture *t = tex && *tex ? textureload(tex, 3, true, false) : NULL;
if(t == notexture) t = NULL;
float q = clamp(skew, 0.f, 1.f), cr = left ? r : r*q, cg = left ? g : g*q, cb = left ? b : b*q, s = size*skew, w = t ? float(t->w)/float(t->h)*s : s;
int heal = m_health(game::gamemode, game::mutators, game::focus->actortype), sy = int(s), cx = x, cy = y, cs = int(s), cw = int(w);
bool pulse = inventoryflash && game::focus->state == CS_ALIVE && game::focus->health < heal;
int full_health = m_health(game::gamemode, game::mutators, game::focus->actortype), sy = int(s), cx = x, cy = y, cs = int(s), cw = int(w);
bool pulse = inventoryflash && game::focus->state == CS_ALIVE && game::focus->health < full_health;
if(bg && sub == 0 && inventorybg)
{
Texture *u = textureload(inventorybg == 2 ? inventorybigtex : inventorytex, 3);
Expand All @@ -2615,7 +2631,7 @@ namespace hud
if(pulse)
{
int millis = lastmillis%1000;
float amt = (millis <= 500 ? millis/500.f : 1.f-((millis-500)/500.f))*clamp(float(heal-game::focus->health)/float(heal), 0.f, 1.f);
float amt = (millis <= 500 ? millis/500.f : 1.f-((millis-500)/500.f))*clamp(float(full_health-game::focus->health)/float(full_health), 0.f, 1.f);
flashcolourf(gr, gg, gb, gf, 1.f, 0.f, 0.f, 1.f, amt);
glow += int(s*inventoryglow*amt);
}
Expand Down Expand Up @@ -2880,11 +2896,11 @@ namespace hud
if(inventoryhealth)
{
float fade = blend*inventoryhealthblend;
int heal = m_health(game::gamemode, game::mutators, game::focus->actortype);
float pulse = inventoryhealthflash ? clamp((heal-game::focus->health)/float(heal), 0.f, 1.f) : 0.f,
int full_health = m_health(game::gamemode, game::mutators, game::focus->actortype);
float pulse = inventoryhealthflash ? clamp((full_health-game::focus->health)/float(full_health), 0.f, 1.f) : 0.f,
throb = inventoryhealththrob > 0 && regentime && game::focus->lastregen && lastmillis-game::focus->lastregen <= regentime ? clamp((lastmillis-game::focus->lastregen)/float(regentime), 0.f, 1.f) : -1.f;
if(inventoryhealth&2)
sy += drawbar(x, y, s, size, 1, inventoryhealthbartop, inventoryhealthbarbottom, fade, clamp(game::focus->health/float(heal), 0.f, 1.f), healthtex, healthbgtex, inventorytone, inventoryhealthbgglow, inventoryhealthbgblend, pulse, throb, inventoryhealththrob, inventoryhealthflash >= 2 ? (game::focus->lastregenamt <= 0 ? 0xFF0000 : 0x00FF00) : -1, game::focus->lastregenamt <= 0);
sy += drawbar(x, y, s, size, 1, inventoryhealthbartop, inventoryhealthbarbottom, fade, clamp(game::focus->health/float(full_health), 0.f, 1.f), healthtex, healthbgtex, inventorytone, inventoryhealthbgglow, inventoryhealthbgblend, pulse, throb, inventoryhealththrob, inventoryhealthflash >= 2 ? (game::focus->lastregenamt <= 0 ? 0xFF0000 : 0x00FF00) : -1, game::focus->lastregenamt <= 0);
if(inventoryhealth&1)
{
float gr = 1, gg = 1, gb = 1;
Expand Down Expand Up @@ -3520,6 +3536,14 @@ namespace hud
float fade = hudblend, consolefade = hudblend;
if(!progressing)
{
if(compassmillis <= 0)
{
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
draw_crosshair(hudwidth, hudheight, choose_crosshair_type());
glDisable(GL_BLEND);
}

vec colour = vec(1, 1, 1);
if(commandfade && (commandmillis > 0 || totalmillis-abs(commandmillis) <= commandfade))
{
Expand Down