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

Pass object_base &to draw_player

Browse source
This commit is contained in:
Kp 2016-05-21 17:24:51 +00:00
parent c61a3d5e0f
commit 7e3ea961c1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
similar/main/automap.cpp
View file

@ -456,29 +456,29 @@ void automap_clear_visited()
ClearMarkers(); ClearMarkers();
} }
static void draw_player(const vcobjptr_t obj, const uint8_t color) static void draw_player(const object_base &obj, const uint8_t color)
{ {
// Draw Console player -- shaped like a ellipse with an arrow. // Draw Console player -- shaped like a ellipse with an arrow.
auto sphere_point = g3_rotate_point(obj->pos); auto sphere_point = g3_rotate_point(obj.pos);
const auto obj_size = obj->size; const auto obj_size = obj.size;
g3_draw_sphere(sphere_point, obj_size, color); g3_draw_sphere(sphere_point, obj_size, color);
// Draw shaft of arrow // Draw shaft of arrow
const auto &&head_pos = vm_vec_scale_add(obj->pos, obj->orient.fvec, obj_size * 2); const auto &&head_pos = vm_vec_scale_add(obj.pos, obj.orient.fvec, obj_size * 2);
{ {
auto &&arrow_point = g3_rotate_point(vm_vec_scale_add(obj->pos, obj->orient.fvec, obj_size * 3)); auto &&arrow_point = g3_rotate_point(vm_vec_scale_add(obj.pos, obj.orient.fvec, obj_size * 3));
automap_draw_line(sphere_point, arrow_point, color); automap_draw_line(sphere_point, arrow_point, color);
// Draw right head of arrow // Draw right head of arrow
{ {
const auto &&rhead_pos = vm_vec_scale_add(head_pos, obj->orient.rvec, obj_size); const auto &&rhead_pos = vm_vec_scale_add(head_pos, obj.orient.rvec, obj_size);
auto head_point = g3_rotate_point(rhead_pos); auto head_point = g3_rotate_point(rhead_pos);
automap_draw_line(arrow_point, head_point, color); automap_draw_line(arrow_point, head_point, color);
} }
// Draw left head of arrow // Draw left head of arrow
{ {
const auto &&lhead_pos = vm_vec_scale_add(head_pos, obj->orient.rvec, -obj_size); const auto &&lhead_pos = vm_vec_scale_add(head_pos, obj.orient.rvec, -obj_size);
auto head_point = g3_rotate_point(lhead_pos); auto head_point = g3_rotate_point(lhead_pos);
automap_draw_line(arrow_point, head_point, color); automap_draw_line(arrow_point, head_point, color);
} }
@ -486,7 +486,7 @@ static void draw_player(const vcobjptr_t obj, const uint8_t color)
// Draw player's up vector // Draw player's up vector
{ {
const auto &&arrow_pos = vm_vec_scale_add(obj->pos, obj->orient.uvec, obj_size * 2); const auto &&arrow_pos = vm_vec_scale_add(obj.pos, obj.orient.uvec, obj_size * 2);
auto arrow_point = g3_rotate_point(arrow_pos); auto arrow_point = g3_rotate_point(arrow_pos);
automap_draw_line(sphere_point, arrow_point, color); automap_draw_line(sphere_point, arrow_point, color);
} }