X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fplayback3d.h;h=cd7aab02c552a01fc3ac51dcc37240587d047076;hp=4388624a88bb4c8135c38c976010927c1cd19dff;hb=03fa86e6dc495f9444ae14dad401b1ad6de793fe;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1 diff --git a/cinelerra-5.1/cinelerra/playback3d.h b/cinelerra-5.1/cinelerra/playback3d.h index 4388624a..cd7aab02 100644 --- a/cinelerra-5.1/cinelerra/playback3d.h +++ b/cinelerra-5.1/cinelerra/playback3d.h @@ -29,7 +29,7 @@ #include "bcwindowbase.inc" #include "canvas.inc" #include "condition.inc" -#include "maskauto.inc" +#include "maskauto.h" #include "maskautos.inc" #include "mutex.inc" #include "mwindow.inc" @@ -281,13 +281,9 @@ public: void do_fade(Canvas *canvas, VFrame *frame, float fade); void convert_cmodel(Canvas *canvas, VFrame *output, int dst_cmodel); - void do_mask(Canvas *canvas, - VFrame *output, - int64_t start_position_project, - MaskAutos *keyframe_set, - MaskAuto *keyframe, - MaskAuto *default_auto); - + void draw_spots(MaskSpots &spots, int ix1,int iy1, int ix2,int iy2); + void do_mask(Canvas *canvas, VFrame *output, int64_t start_position_project, + MaskAutos *keyframe_set, MaskAuto *keyframe, MaskAuto *default_auto); // Overlay a virtual node on the framebuffer void overlay(Canvas *canvas, @@ -325,7 +321,8 @@ public: private: // Called by write_buffer and clear_frame to initialize OpenGL flags - void init_frame(Playback3DCommand *command, int is_yuv=0); + void color_frame(Playback3DCommand *command, + float r, float g, float b, float a); void write_buffer_sync(Playback3DCommand *command); void draw_output(Playback3DCommand *command, int flip_y); void clear_output_sync(Playback3DCommand *command);