Pass canvas to draw_object_blob
This commit is contained in:
parent
26e1ce21fe
commit
84faf8aa73
|
@ -204,7 +204,7 @@ extern int Death_sequence_aborted;
|
||||||
extern objnum_t Player_fired_laser_this_frame;
|
extern objnum_t Player_fired_laser_this_frame;
|
||||||
|
|
||||||
// Draw a blob-type object, like a fireball
|
// Draw a blob-type object, like a fireball
|
||||||
void draw_object_blob(const object_base &obj, bitmap_index bitmap);
|
void draw_object_blob(grs_canvas &, const object_base &obj, bitmap_index bitmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef dsx
|
#ifdef dsx
|
||||||
|
|
|
@ -94,7 +94,7 @@ void Laser_render(const object_base &obj)
|
||||||
//Laser_draw_one(obj-Objects, Weapon_info[obj->id].bitmap );
|
//Laser_draw_one(obj-Objects, Weapon_info[obj->id].bitmap );
|
||||||
break;
|
break;
|
||||||
case WEAPON_RENDER_BLOB:
|
case WEAPON_RENDER_BLOB:
|
||||||
draw_object_blob(obj, wi.bitmap);
|
draw_object_blob(*grd_curcanv, obj, wi.bitmap);
|
||||||
break;
|
break;
|
||||||
case WEAPON_RENDER_POLYMODEL:
|
case WEAPON_RENDER_POLYMODEL:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -151,7 +151,7 @@ objptridx_t obj_find_first_of_type(int type)
|
||||||
namespace dcx {
|
namespace dcx {
|
||||||
|
|
||||||
//draw an object that has one bitmap & doesn't rotate
|
//draw an object that has one bitmap & doesn't rotate
|
||||||
void draw_object_blob(const object_base &obj, bitmap_index bmi)
|
void draw_object_blob(grs_canvas &canvas, const object_base &obj, const bitmap_index bmi)
|
||||||
{
|
{
|
||||||
auto &bm = GameBitmaps[bmi.index];
|
auto &bm = GameBitmaps[bmi.index];
|
||||||
PIGGY_PAGE_IN( bmi );
|
PIGGY_PAGE_IN( bmi );
|
||||||
|
@ -172,7 +172,7 @@ void draw_object_blob(const object_base &obj, bitmap_index bmi)
|
||||||
const auto p = (bm_w > bm_h)
|
const auto p = (bm_w > bm_h)
|
||||||
? wh(osize, fixmuldiv(osize, bm_h, bm_w))
|
? wh(osize, fixmuldiv(osize, bm_h, bm_w))
|
||||||
: wh(fixmuldiv(osize, bm_w, bm_h), osize);
|
: wh(fixmuldiv(osize, bm_w, bm_h), osize);
|
||||||
g3_draw_bitmap(*grd_curcanv, pos, p.first, p.second, bm);
|
g3_draw_bitmap(canvas, pos, p.first, p.second, bm);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,7 +121,7 @@ namespace dcx {
|
||||||
void draw_powerup(const object_base &obj)
|
void draw_powerup(const object_base &obj)
|
||||||
{
|
{
|
||||||
auto &vci = obj.rtype.vclip_info;
|
auto &vci = obj.rtype.vclip_info;
|
||||||
draw_object_blob(obj, Vclip[vci.vclip_num].frames[vci.framenum]);
|
draw_object_blob(*grd_curcanv, obj, Vclip[vci.vclip_num].frames[vci.framenum]);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,11 +63,9 @@ void draw_vclip_object(const vobjptridx_t obj,fix timeleft,int lighted, int vcli
|
||||||
draw_object_tmap_rod(*grd_curcanv, obj, Vclip[vclip_num].frames[bitmapnum],lighted);
|
draw_object_tmap_rod(*grd_curcanv, obj, Vclip[vclip_num].frames[bitmapnum],lighted);
|
||||||
else {
|
else {
|
||||||
Assert(lighted==0); //blob cannot now be lighted
|
Assert(lighted==0); //blob cannot now be lighted
|
||||||
|
draw_object_blob(*grd_curcanv, obj, Vclip[vclip_num].frames[bitmapnum] );
|
||||||
draw_object_blob(obj, Vclip[vclip_num].frames[bitmapnum] );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue