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

Merge https://github.com/ziplantil/dxx-rebirth.git branch 'exithatchfix'

Browse source
This commit is contained in:
Kp 2019-08-06 02:59:41 +00:00
parent a4d3cbe5e5 bea2eaaec9
commit 7f4c57b614
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
similar/main/endlevel.cpp
View file

@ -139,6 +139,7 @@ static void draw_stars(grs_canvas &, const d_unique_endlevel_state::starfield_ty
static int find_exit_side(const object_base &obj);
static void generate_starfield(d_unique_endlevel_state::starfield_type &stars);
static void start_endlevel_flythrough(flythrough_data *flydata,const vmobjptr_t obj,fix speed);
static void draw_mine_exit_cover(grs_canvas &);
#if defined(DXX_BUILD_DESCENT_II)
constexpr array<const char, 24> movie_table{{
@ -897,11 +898,49 @@ static int find_exit_side(const object_base &obj)
return best_side;
}
inline void prepare_mine_exit_cover_point(g3s_point& p, const vms_vector &v, fix u, fix r)
{
vms_vector tv;
vm_vec_scale_add(tv,v,mine_exit_orient.uvec,u);
vm_vec_scale_add2(tv,mine_exit_orient.rvec,r);
p = g3_rotate_point(tv);
}
void draw_mine_exit_cover(grs_canvas &canvas)
{
int of=10;
fix u=i2f(6),d=i2f(9),ur=i2f(14),dr=i2f(17);
const uint8_t color = BM_XRGB(0, 0, 0);
array<cg3s_point *, 4> pointlist;
vms_vector v;
g3s_point p0, p1, p2, p3;
vm_vec_scale_add(v,mine_exit_point,mine_exit_orient.fvec,i2f(of));
prepare_mine_exit_cover_point(p0,v,+u,+ur);
prepare_mine_exit_cover_point(p1,v,+u,-ur);
prepare_mine_exit_cover_point(p2,v,-d,-dr);
prepare_mine_exit_cover_point(p3,v,-d,+dr);
pointlist[0] = &p0;
pointlist[1] = &p1;
pointlist[2] = &p2;
pointlist[3] = &p3;
g3_draw_poly(canvas, pointlist.size(), pointlist, color);
}
void draw_exit_model(grs_canvas &canvas)
{
int f=15,u=0; //21;
g3s_lrgb lrgb = { f1_0, f1_0, f1_0 };
if (mine_destroyed)
{
// draw black shape to mask out terrain in exit hatch
draw_mine_exit_cover(canvas);
}
auto model_pos = vm_vec_scale_add(mine_exit_point,mine_exit_orient.fvec,i2f(f));
vm_vec_scale_add2(model_pos,mine_exit_orient.uvec,i2f(u));
draw_polygon_model(canvas, model_pos, mine_exit_orient, nullptr, mine_destroyed ? destroyed_exit_modelnum : exit_modelnum, 0, lrgb, nullptr, nullptr);