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

Pass canvas to draw_morph_object

Browse source
This commit is contained in:
Kp 2017-03-11 19:56:27 +00:00
parent 2d9cfbd9ab
commit 25c36d4b0e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/morph.h
View file

@ -58,7 +58,7 @@ constexpr unsigned MAX_MORPH_OBJECTS = 5;
extern array<morph_data, MAX_MORPH_OBJECTS> morph_objects; extern array<morph_data, MAX_MORPH_OBJECTS> morph_objects;
void morph_start(vobjptr_t obj); 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 //process the morphing object for one frame
void do_morph_frame(vobjptr_t obj); void do_morph_frame(vobjptr_t obj);

4
similar/main/morph.cpp
View file

@ -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; // int save_light;
polymodel *po; polymodel *po;
@ -418,7 +418,7 @@ void draw_morph_object(const vobjptridx_t obj)
g3_start_instance_matrix(obj->pos,&obj->orient); g3_start_instance_matrix(obj->pos,&obj->orient);
polygon_model_points robot_points; 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(); g3_done_instance();

2
similar/main/object.cpp
View file

@ -665,7 +665,7 @@ void render_object(const vobjptridx_t obj)
break; break;
case RT_MORPH: case RT_MORPH:
draw_morph_object(obj); draw_morph_object(*grd_curcanv, obj);
break; break;
case RT_FIREBALL: case RT_FIREBALL: