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

Pass canvas to g3_draw_poly

Browse source
This commit is contained in:
Kp 2017-02-11 21:42:41 +00:00
parent 66ee668e48
commit c732c35916
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/include/3d.h
View file

@ -194,9 +194,9 @@ ubyte g3_add_delta_vec(g3s_point &dest,const g3s_point &src,const vms_vector &de
//returns 1 if off screen, 0 if drew
void _g3_draw_poly(grs_canvas &, uint_fast32_t nv, cg3s_point *const *pointlist, uint8_t color);
template <std::size_t N>
static inline void g3_draw_poly(uint_fast32_t nv, const array<cg3s_point *, N> &pointlist, const uint8_t color)
static inline void g3_draw_poly(grs_canvas &canvas, const uint_fast32_t nv, const array<cg3s_point *, N> &pointlist, const uint8_t color)
{
_g3_draw_poly(*grd_curcanv, nv, &pointlist[0], color);
_g3_draw_poly(canvas, nv, &pointlist[0], color);
}
constexpr std::size_t MAX_POINTS_PER_POLY = 25;
@ -246,7 +246,7 @@ bool do_facing_check(const array<cg3s_point *, 3> &vertlist);
static inline void g3_check_and_draw_poly(const array<cg3s_point *, 3> &pointlist, const uint8_t color)
{
if (do_facing_check(pointlist))
g3_draw_poly(pointlist.size(), pointlist, color);
g3_draw_poly(*grd_curcanv, pointlist.size(), pointlist, color);
}
template <std::size_t N>

2
similar/3d/interp.cpp
View file

@ -303,7 +303,7 @@ public:
: gr_find_closest_color_15bpp(w(p + 28));
#endif
const auto point_list = prepare_point_list<MAX_POINTS_PER_POLY>(nv, p);
g3_draw_poly(nv,point_list, color);
g3_draw_poly(*grd_curcanv, nv, point_list, color);
}
}
}

4
similar/main/render.cpp
View file

@ -249,7 +249,7 @@ static void render_face(const segment &segp, const unsigned sidenum, const unsig
const uint8_t color = BM_XRGB(0, 0, 0);
// set to black (matters for s3)
g3_draw_poly(nv, pointlist, color); // draw as flat poly
g3_draw_poly(*grd_curcanv, nv, pointlist, color); // draw as flat poly
gr_settransblend(*grd_curcanv, GR_FADE_OFF, GR_BLEND_NORMAL);
return;
@ -409,7 +409,7 @@ static void check_face(const vsegidx_t segnum, const unsigned sidenum, const uns
save_lighting = Lighting_on;
Lighting_on = 2;
#if DXX_USE_OGL
g3_draw_poly(nv,pointlist, color);
g3_draw_poly(*grd_curcanv, nv, pointlist, color);
#else
(void)color;
g3_draw_tmap(*grd_curcanv, nv, pointlist, uvl_copy, dyn_light, *bm);