TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass canvas to show_mousefs_indicator

Browse source
This commit is contained in:
Kp 2017-03-11 19:56:22 +00:00
parent 4b6f42a962
commit a19286437a
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/gauges.h
View file

@ -65,7 +65,7 @@ void show_reticle(grs_canvas &canvas, const player_info &, int reticle_type, int
void show_HUD_names(grs_canvas &);
}
#endif
void show_mousefs_indicator(int mx, int my, int mz, int x, int y, int size);
void show_mousefs_indicator(grs_canvas &canvas, int mx, int my, int mz, int x, int y, int size);
void player_dead_message(grs_canvas &);
//extern void say_afterburner_status(void);

2
similar/main/automap.cpp
View file

@ -766,7 +766,7 @@ static void draw_automap(automap *am)
const auto gwidth = canvas.cv_bitmap.bm_w;
const auto gheight = canvas.cv_bitmap.bm_h;
auto &raw_mouse_axis = am->controls.raw_mouse_axis;
show_mousefs_indicator(raw_mouse_axis[0], raw_mouse_axis[1], raw_mouse_axis[2], gwidth - (gheight / 8), gheight - (gheight / 8), gheight / 5);
show_mousefs_indicator(canvas, raw_mouse_axis[0], raw_mouse_axis[1], raw_mouse_axis[2], gwidth - (gheight / 8), gheight - (gheight / 8), gheight / 5);
}
am->t2 = timer_query();

18
similar/main/gauges.cpp
View file

@ -2834,20 +2834,20 @@ void show_reticle(grs_canvas &canvas, const player_info &player_info, int reticl
}
}
void show_mousefs_indicator(int mx, int my, int mz, int x, int y, int size)
void show_mousefs_indicator(grs_canvas &canvas, int mx, int my, int mz, int x, int y, int size)
{
int axscale = (MOUSEFS_DELTA_RANGE*2)/size, xaxpos = x+(mx/axscale), yaxpos = y+(my/axscale), zaxpos = y+(mz/axscale);
gr_settransblend(*grd_curcanv, PlayerCfg.ReticleRGBA[3], GR_BLEND_NORMAL);
gr_settransblend(canvas, PlayerCfg.ReticleRGBA[3], GR_BLEND_NORMAL);
auto &rgba = PlayerCfg.ReticleRGBA;
const auto color = BM_XRGB(rgba[0], rgba[1], rgba[2]);
gr_uline(*grd_curcanv, i2f(xaxpos), i2f(y-(size/2)), i2f(xaxpos), i2f(y-(size/4)), color);
gr_uline(*grd_curcanv, i2f(xaxpos), i2f(y+(size/2)), i2f(xaxpos), i2f(y+(size/4)), color);
gr_uline(*grd_curcanv, i2f(x-(size/2)), i2f(yaxpos), i2f(x-(size/4)), i2f(yaxpos), color);
gr_uline(*grd_curcanv, i2f(x+(size/2)), i2f(yaxpos), i2f(x+(size/4)), i2f(yaxpos), color);
gr_uline(canvas, i2f(xaxpos), i2f(y-(size/2)), i2f(xaxpos), i2f(y-(size/4)), color);
gr_uline(canvas, i2f(xaxpos), i2f(y+(size/2)), i2f(xaxpos), i2f(y+(size/4)), color);
gr_uline(canvas, i2f(x-(size/2)), i2f(yaxpos), i2f(x-(size/4)), i2f(yaxpos), color);
gr_uline(canvas, i2f(x+(size/2)), i2f(yaxpos), i2f(x+(size/4)), i2f(yaxpos), color);
const local_multires_gauge_graphic multires_gauge_graphic{};
gr_uline(*grd_curcanv, i2f(x+(size/2)+HUD_SCALE_X_AR(multires_gauge_graphic, 2)), i2f(y), i2f(x+(size/2)+HUD_SCALE_X_AR(multires_gauge_graphic, 2)), i2f(zaxpos), color);
gr_settransblend(*grd_curcanv, GR_FADE_OFF, GR_BLEND_NORMAL);
gr_uline(canvas, i2f(x+(size/2)+HUD_SCALE_X_AR(multires_gauge_graphic, 2)), i2f(y), i2f(x+(size/2)+HUD_SCALE_X_AR(multires_gauge_graphic, 2)), i2f(zaxpos), color);
gr_settransblend(canvas, GR_FADE_OFF, GR_BLEND_NORMAL);
}
static void hud_show_kill_list(grs_canvas &canvas)
@ -3268,7 +3268,7 @@ void draw_hud(const object &plrobj)
const auto gwidth = grd_curcanv->cv_bitmap.bm_w;
const auto gheight = grd_curcanv->cv_bitmap.bm_h;
auto &raw_mouse_axis = Controls.raw_mouse_axis;
show_mousefs_indicator(raw_mouse_axis[0], raw_mouse_axis[1], raw_mouse_axis[2], gwidth / 2, gheight / 2, gheight / 4);
show_mousefs_indicator(*grd_curcanv, raw_mouse_axis[0], raw_mouse_axis[1], raw_mouse_axis[2], gwidth / 2, gheight / 2, gheight / 4);
}
}