From 25c36d4b0e3ae9422308970f12f7ee595390e825 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Mar 2017 19:56:27 +0000 Subject: [PATCH] Pass canvas to draw_morph_object --- common/main/morph.h | 2 +- similar/main/morph.cpp | 4 ++-- similar/main/object.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/main/morph.h b/common/main/morph.h index 7ccc7b179..9ede53c00 100644 --- a/common/main/morph.h +++ b/common/main/morph.h @@ -58,7 +58,7 @@ constexpr unsigned MAX_MORPH_OBJECTS = 5; extern array morph_objects; void morph_start(vobjptr_t obj); -void draw_morph_object(vobjptridx_t obj); +void draw_morph_object(grs_canvas &, vobjptridx_t obj); //process the morphing object for one frame void do_morph_frame(vobjptr_t obj); diff --git a/similar/main/morph.cpp b/similar/main/morph.cpp index aa45411f5..c589bf9db 100644 --- a/similar/main/morph.cpp +++ b/similar/main/morph.cpp @@ -400,7 +400,7 @@ static void draw_model(grs_canvas &canvas, polygon_model_points &robot_points, p } -void draw_morph_object(const vobjptridx_t obj) +void draw_morph_object(grs_canvas &canvas, const vobjptridx_t obj) { // int save_light; polymodel *po; @@ -418,7 +418,7 @@ void draw_morph_object(const vobjptridx_t obj) g3_start_instance_matrix(obj->pos,&obj->orient); polygon_model_points robot_points; - draw_model(*grd_curcanv, robot_points, po, 0, obj->rtype.pobj_info.anim_angles, light, md); + draw_model(canvas, robot_points, po, 0, obj->rtype.pobj_info.anim_angles, light, md); g3_done_instance(); diff --git a/similar/main/object.cpp b/similar/main/object.cpp index 9b7700d89..f831b6275 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -665,7 +665,7 @@ void render_object(const vobjptridx_t obj) break; case RT_MORPH: - draw_morph_object(obj); + draw_morph_object(*grd_curcanv, obj); break; case RT_FIREBALL: