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

Combine draw_object_blob calls to g3_draw_bitmap

Browse source
This commit is contained in:
Kp 2016-04-06 03:34:13 +00:00
parent 608467161b
commit b5afcc4605
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
similar/main/object.cpp
View file

@ -149,11 +149,12 @@ objptridx_t obj_find_first_of_type(int type)
//draw an object that has one bitmap & doesn't rotate
void draw_object_blob(const vobjptr_t obj,bitmap_index bmi)
{
grs_bitmap * bm = &GameBitmaps[bmi.index];
auto &bm = GameBitmaps[bmi.index];
vms_vector pos = obj->pos;
PIGGY_PAGE_IN( bmi );
const auto osize = obj->size;
// draw these with slight offset to viewer preventing too much ugly clipping
if (obj->type == OBJ_FIREBALL && get_fireball_id(obj) == VCLIP_VOLATILE_WALL_HIT)
{
@ -162,10 +163,13 @@ void draw_object_blob(const vobjptr_t obj,bitmap_index bmi)
vm_vec_scale_add2(pos,offs_vec,F1_0);
}
if (bm->bm_w > bm->bm_h)
g3_draw_bitmap(pos,obj->size,fixmuldiv(obj->size,bm->bm_h,bm->bm_w),*bm);
else
g3_draw_bitmap(pos,fixmuldiv(obj->size,bm->bm_w,bm->bm_h),obj->size,*bm);
using wh = std::pair<fix, fix>;
const auto bm_w = bm.bm_w;
const auto bm_h = bm.bm_h;
const auto p = (bm_w > bm_h)
? wh(osize, fixmuldiv(osize, bm_h, bm_w))
: wh(fixmuldiv(osize, bm_w, bm_h), osize);
g3_draw_bitmap(pos, p.first, p.second, bm);
}
//draw an object that is a texture-mapped rod