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

Pass canvas to gr_upoly_tmap_ylr

Browse source
This commit is contained in:
Kp 2017-02-11 21:42:39 +00:00
parent 742c463858
commit 2a403f74a0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/texmap/tmapflat.cpp
View file

@ -45,7 +45,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
namespace dcx {
static void gr_upoly_tmap_ylr(uint_fast32_t nverts, const int *vert, uint8_t color);
static void gr_upoly_tmap_ylr(grs_canvas &, uint_fast32_t nverts, const int *vert, uint8_t color);
// -------------------------------------------------------------------------------------
// Texture map current scanline.
@ -178,7 +178,7 @@ static void texture_map_flat(grs_canvas &canvas, const g3ds_tmap &t, int color)
// (ie, avoids cracking) edge/delta computation.
void gr_upoly_tmap(uint_fast32_t nverts, const array<fix, MAX_POINTS_IN_POLY*2> &vert, const uint8_t color)
{
gr_upoly_tmap_ylr(nverts, vert.data(), color);
gr_upoly_tmap_ylr(*grd_curcanv, nverts, vert.data(), color);
}
struct pnt2d {
@ -215,13 +215,13 @@ void draw_tmap_flat(const grs_bitmap &bp,uint_fast32_t nverts,const g3s_point *c
points[i].x = vertbuf[i]->p3_sx;
points[i].y = vertbuf[i]->p3_sy;
}
gr_upoly_tmap_ylr(nverts, ipoints.data(), color);
gr_upoly_tmap_ylr(*grd_curcanv, nverts, ipoints.data(), color);
}
// -----------------------------------------------------------------------------------------
//This is like gr_upoly_tmap() but instead of drawing, it calls the specified
//function with ylr values
static void gr_upoly_tmap_ylr(uint_fast32_t nverts, const int *vert, const uint8_t color)
static void gr_upoly_tmap_ylr(grs_canvas &canvas, uint_fast32_t nverts, const int *vert, const uint8_t color)
{
g3ds_tmap my_tmap;
my_tmap.nv = nverts;
@ -231,7 +231,7 @@ static void gr_upoly_tmap_ylr(uint_fast32_t nverts, const int *vert, const uint8
i.x2d = *vert++;
i.y2d = *vert++;
}
texture_map_flat(*grd_curcanv, my_tmap, color);
texture_map_flat(canvas, my_tmap, color);
}
}