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

Pass canvas to g3_check_and_draw_tmap

Browse source
This commit is contained in:
Kp 2017-02-11 21:42:40 +00:00
parent cd8f408269
commit 59b57bd7dc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/include/3d.h
View file

@ -250,16 +250,16 @@ static inline void g3_check_and_draw_poly(const array<cg3s_point *, 3> &pointlis
}
template <std::size_t N>
static inline void g3_check_and_draw_tmap(unsigned nv, const array<cg3s_point *, N> &pointlist, const array<g3s_uvl, N> &uvl_list, const array<g3s_lrgb, N> &light_rgb, grs_bitmap &bm)
static inline void g3_check_and_draw_tmap(grs_canvas &canvas, unsigned nv, const array<cg3s_point *, N> &pointlist, const array<g3s_uvl, N> &uvl_list, const array<g3s_lrgb, N> &light_rgb, grs_bitmap &bm)
{
if (do_facing_check(pointlist))
g3_draw_tmap(*grd_curcanv, nv, pointlist, uvl_list, light_rgb, bm);
g3_draw_tmap(canvas, nv, pointlist, uvl_list, light_rgb, bm);
}
template <std::size_t N>
static inline void g3_check_and_draw_tmap(const array<cg3s_point *, N> &pointlist, const array<g3s_uvl, N> &uvl_list, const array<g3s_lrgb, N> &light_rgb, grs_bitmap &bm)
static inline void g3_check_and_draw_tmap(grs_canvas &canvas, const array<cg3s_point *, N> &pointlist, const array<g3s_uvl, N> &uvl_list, const array<g3s_lrgb, N> &light_rgb, grs_bitmap &bm)
{
g3_check_and_draw_tmap(N, pointlist, uvl_list, light_rgb, bm);
g3_check_and_draw_tmap(canvas, N, pointlist, uvl_list, light_rgb, bm);
}
//draws a line. takes two points.

4
similar/main/terrain.cpp
View file

@ -86,7 +86,7 @@ static void draw_cell(int i,int j,g3s_point *p0,g3s_point *p1,g3s_point *p2,g3s_
uvl_list1[1].u = (i)*f1_0/4; uvl_list1[1].v = (j+1)*f1_0/4;
uvl_list1[2].u = (i+1)*f1_0/4; uvl_list1[2].v = (j)*f1_0/4;
g3_check_and_draw_tmap(pointlist,uvl_list1,lrgb_list1,*terrain_bm);
g3_check_and_draw_tmap(*grd_curcanv, pointlist, uvl_list1, lrgb_list1, *terrain_bm);
if (terrain_outline) {
int lsave=Lighting_on;
Lighting_on=0;
@ -108,7 +108,7 @@ static void draw_cell(int i,int j,g3s_point *p0,g3s_point *p1,g3s_point *p2,g3s_
uvl_list2[1].u = (i+1)*f1_0/4; uvl_list2[1].v = (j+1)*f1_0/4;
uvl_list2[2].u = (i+1)*f1_0/4; uvl_list2[2].v = (j)*f1_0/4;
g3_check_and_draw_tmap(pointlist,uvl_list2,lrgb_list2,*terrain_bm);
g3_check_and_draw_tmap(*grd_curcanv, pointlist, uvl_list2, lrgb_list2, *terrain_bm);
if (terrain_outline) {
int lsave=Lighting_on;
Lighting_on=0;