#include "edl.h"
#include "edlsession.h"
#include "filexml.h"
+#include "keyframes.h"
#include "overlayframe.h"
#include "pluginserver.h"
#include "preferences.h"
#include "sketcher.h"
#include "sketcherwindow.h"
+#include "transportque.inc"
#include "language.h"
#include "vframe.h"
SketcherConfig::SketcherConfig()
{
drag = 1;
+ aliasing = 0;
cv_selected = 0;
pt_selected = 0;
}
int SketcherConfig::equivalent(SketcherConfig &that)
{
if( this->drag != that.drag ) return 0;
+ if( this->aliasing != that.aliasing ) return 0;
if( this->cv_selected != that.cv_selected ) return 0;
if( this->pt_selected != that.pt_selected ) return 0;
if( this->curves.size() != that.curves.size() ) return 0;
void SketcherConfig::copy_from(SketcherConfig &that)
{
this->drag = that.drag;
+ this->aliasing = that.aliasing;
this->cv_selected = that.cv_selected;
this->pt_selected = that.pt_selected;
int m = curves.size(), n = that.curves.size();
this->cv_selected = prev.cv_selected;
this->pt_selected = prev.pt_selected;
this->drag = prev.drag;
+ this->aliasing = prev.aliasing;
double next_scale = (double)(current_frame - prev_frame) / (next_frame - prev_frame);
double prev_scale = (double)(next_frame - current_frame) / (next_frame - prev_frame);
NEW_WINDOW_MACRO(Sketcher, SketcherWindow);
LOAD_CONFIGURATION_MACRO(Sketcher, SketcherConfig)
-void Sketcher::save_data(KeyFrame *keyframe)
+void SketcherConfig::save_data(KeyFrame *keyframe)
{
FileXML output;
// cause data to be stored directly in text
output.set_shared_output(keyframe->xbuf);
output.tag.set_title("SKETCHER");
- output.tag.set_property("DRAG", config.drag);
- output.tag.set_property("CV_SELECTED", config.cv_selected);
- output.tag.set_property("PT_SELECTED", config.pt_selected);
+ output.tag.set_property("DRAG", drag);
+ output.tag.set_property("ALIASING", aliasing);
+ output.tag.set_property("CV_SELECTED", cv_selected);
+ output.tag.set_property("PT_SELECTED", pt_selected);
output.append_tag();
output.append_newline();
- for( int i=0,n=config.curves.size(); i<n; ++i ) {
- config.curves[i]->save_data(output);
+ for( int i=0,n=curves.size(); i<n; ++i ) {
+ curves[i]->save_data(output);
}
output.tag.set_title("/SKETCHER");
output.append_tag();
output.terminate_string();
}
-void Sketcher::read_data(KeyFrame *keyframe)
+void Sketcher::save_data(KeyFrame *keyframe)
+{
+ config.save_data(keyframe);
+}
+
+void SketcherConfig::read_data(KeyFrame *keyframe)
{
FileXML input;
input.set_shared_input(keyframe->xbuf);
- config.curves.remove_all_objects();
+ curves.remove_all_objects();
int result = 0;
SketcherCurve *cv = 0;
while( !(result=input.read_tag()) ) {
if( input.tag.title_is("SKETCHER") ) {
- config.drag = input.tag.get_property("DRAG", config.drag);
- config.cv_selected = input.tag.get_property("CV_SELECTED", 0);
- config.pt_selected = input.tag.get_property("PT_SELECTED", 0);
+ drag = input.tag.get_property("DRAG", drag);
+ aliasing = input.tag.get_property("ALIASING", aliasing);
+ cv_selected = input.tag.get_property("CV_SELECTED", 0);
+ pt_selected = input.tag.get_property("PT_SELECTED", 0);
}
else if( !strncmp(input.tag.get_title(),"CURVE_",6) ) {
cv = new SketcherCurve();
cv->read_data(input);
- config.curves.append(cv);
+ curves.append(cv);
}
else if( !strncmp(input.tag.get_title(),"/CURVE_",7) )
cv = 0;
cv->points.append(pt);
}
else
- printf("Sketcher::read_data: no curve for point\n");
+ printf("SketcherConfig::read_data: no curve for point\n");
}
}
+ limits();
+}
+
+void Sketcher::read_data(KeyFrame *keyframe)
+{
+ config.read_data(keyframe);
if( !config.curves.size() )
new_curve();
- config.limits();
+}
+
+
+void SketcherPoint::update_parameter(SketcherPoint *prev, SketcherPoint *src)
+{
+ if( prev->arc != src->arc ) arc = src->arc;
+ if( prev->x != src->x ) x = src->x;
+ if( prev->y != src->y ) y = src->y;
+}
+
+void SketcherCurve::update_parameter(SketcherCurve *prev, SketcherCurve *src)
+{
+ if( prev->pen != src->pen ) pen = src->pen;
+ if( prev->width != src->width ) width = src->width;
+ if( prev->color != src->color ) color = src->color;
+ int prev_points = prev->points.size();
+ int src_points = src->points.size();
+ int dst_points = this->points.size();
+ int npoints = bmin(prev_points, bmin(src_points, dst_points));
+ for( int i=0; i<npoints; ++i ) {
+ SketcherPoint *prev_point = prev->points[i];
+ SketcherPoint *src_point = src->points[i];
+ SketcherPoint *dst_point = this->points[i];
+ dst_point->update_parameter(prev_point, src_point);
+ }
+}
+
+void Sketcher::span_keyframes(KeyFrame *src, int64_t start, int64_t end)
+{
+ SketcherConfig src_config;
+ src_config.read_data(src);
+ KeyFrames *keyframes = (KeyFrames *)src->autos;
+ KeyFrame *prev = keyframes->get_prev_keyframe(start, PLAY_FORWARD);
+ SketcherConfig prev_config;
+ prev_config.read_data(prev);
+// Always update the first one
+ update_parameter(prev_config, src_config, prev);
+ KeyFrame *curr = (KeyFrame*)prev->next;
+ while( curr && curr->position < end ) {
+ update_parameter(prev_config, src_config, curr);
+ curr = (KeyFrame*)curr->next;
+ }
+}
+
+void Sketcher::update_parameter(SketcherConfig &prev_config, SketcherConfig &src_config,
+ KeyFrame *keyframe)
+{
+ SketcherConfig dst_config;
+ dst_config.read_data(keyframe);
+ if( prev_config.drag != src_config.drag )
+ dst_config.drag = src_config.drag;
+ if( prev_config.aliasing != src_config.aliasing )
+ dst_config.aliasing = src_config.aliasing;
+ if( prev_config.cv_selected != src_config.cv_selected )
+ dst_config.cv_selected = src_config.cv_selected;
+ if( prev_config.pt_selected != src_config.pt_selected )
+ dst_config.pt_selected = src_config.pt_selected;
+ int src_curves = src_config.curves.size();
+ int dst_curves = dst_config.curves.size();
+ int prev_curves = prev_config.curves.size();
+ int ncurves = bmin(prev_curves, bmin(src_curves, dst_curves));
+ for( int i=0; i<ncurves; ++i ) {
+ SketcherCurve *prev_curve = prev_config.curves[i];
+ SketcherCurve *src_curve = src_config.curves[i];
+ SketcherCurve *dst_curve = dst_config.curves[i];
+ dst_curve->update_parameter(prev_curve, src_curve);
+ }
+ dst_config.save_data(keyframe);
}
void Sketcher::update_gui()
}
-int SketcherVPen::draw_pixel(int x, int y)
+int SketcherVPen::draw_mask(int x, int y)
{
- if( x >= 0 && x < vfrm->get_w() &&
- y >= 0 && y < vfrm->get_h() )
- msk[vfrm->get_w()*y + x] = 0xff;
+ int w = vfrm->get_w(), h = vfrm->get_h();
+ if( x < 0 || x >= w ) return 1;
+ if( y < 0 || y >= h ) return 1;
+ msk[w * y + x] = 0xff;
return 0;
}
-int SketcherPenSquare::draw_pixel(int x, int y)
+int SketcherVPen::draw_pixel(float x, float y, float frac, int axis)
{
+ draw_mask(x, y);
+ return VFrame::draw_pixel(x, y, frac, axis);
+}
+
+int SketcherPenSquare::draw_pixel(float x, float y, float a)
+{
+ vfrm->set_draw_alpha(a);
vfrm->draw_line(x-n, y, x+n, y);
for( int i=-n; i<n; ++i )
vfrm->draw_line(x-n, y+i, x+n, y+i);
- return SketcherVPen::draw_pixel(x, y);
+ return 0;
}
-int SketcherPenPlus::draw_pixel(int x, int y)
+int SketcherPenPlus::draw_pixel(float x, float y, float a)
{
+ vfrm->set_draw_alpha(a);
if( n > 1 ) {
vfrm->draw_line(x-n, y, x+n, y);
vfrm->draw_line(x, y-n, x, y+n);
}
else
vfrm->draw_pixel(x, y);
- return SketcherVPen::draw_pixel(x, y);
+ return 0;
}
-int SketcherPenSlant::draw_pixel(int x, int y)
+int SketcherPenSlant::draw_pixel(float x, float y, float a)
{
+ vfrm->set_draw_alpha(a);
vfrm->draw_line(x-n, y+n, x+n, y-n);
vfrm->draw_line(x-n+1, y+n, x+n+1, y-n);
vfrm->draw_line(x-n, y+n+1, x+n, y-n+1);
- return SketcherVPen::draw_pixel(x, y);
+ return 0;
}
-int SketcherPenXlant::draw_pixel(int x, int y)
+int SketcherPenXlant::draw_pixel(float x, float y, float a)
{
+ vfrm->set_draw_alpha(a);
vfrm->draw_line(x-n, y+n, x+n, y-n);
vfrm->draw_line(x-n+1, y+n, x+n+1, y-n);
vfrm->draw_line(x-n, y+n+1, x+n, y-n+1);
vfrm->draw_line(x-n, y-n, x+n, y+n);
vfrm->draw_line(x-n+1, y-n, x+n+1, y+n);
vfrm->draw_line(x-n, y-n+1, x+n, y-n+1);
- return SketcherVPen::draw_pixel(x, y);
+ return 0;
}
public:
SketcherPoint *next();
bool exists() { return stack.size() > 0; }
+ void draw_pixel(int x, int y) { img->draw_pixel(x, y); }
void start_at(int x, int y);
void run();
FillRegion(SketcherPoints &pts, SketcherVPen *vpen);
void FillRegion::run()
{
+ img->set_draw_alpha(1);
while( stack.size() > 0 ) {
int y, ilt, irt;
pop(y, ilt, irt);
int ofs = y*w + ilt;
for( int x=ilt; x<=irt; ++x,++ofs ) {
+ draw_pixel(x, y);
if( msk[ofs] ) continue;
msk[ofs] = 0xff;
- img->draw_pixel(x, y);
int lt = x, rt = x;
int lofs = ofs;
for( int i=lt; --i>=0; ) {
+ draw_pixel(i, y);
if( msk[--lofs] ) break;
- img->draw_pixel(i, y);
msk[lofs] = 0xff; lt = i;
}
int rofs = ofs;
for( int i=rt; ++i< w; ) {
+ draw_pixel(i, y);
if( msk[++rofs] ) break;
- img->draw_pixel(i, y);
msk[rofs] = 0xff; rt = i;
}
if( y+1 < h ) push(y+1, lt, rt);
return 0;
}
-
-void SketcherCurve::draw(VFrame *img)
+void SketcherCurve::draw(VFrame *img, int alias)
{
if( !points.size() ) return;
+ img->set_pixel_color(color, (~color>>24)&0xff);
const float fmx = 16383;
SketcherVPen *vpen = new_vpen(img);
+ vpen->set_draw_flags(alias);
FillRegion fill(points, vpen);
SketcherPoint *pnt0 = fill.next();
SketcherPoint *pnt1 = pnt0 ? fill.next() : 0;
vpen->draw_line(pnt0->x, pnt0->y, pnt1->x, pnt1->y);
}
else if( pnt0 ) {
- vpen->draw_pixel(pnt0->x, pnt0->y);
+ vpen->draw_pixel(pnt0->x, pnt0->y, 1);
}
delete vpen;
}
int m = cv->points.size();
if( !m ) continue;
img->clear_frame();
- img->set_pixel_color(cv->color, (~cv->color>>24)&0xff);
- cv->draw(img);
+ int alias = config.aliasing < 0 ? ALIAS_OFF :
+ config.aliasing > 0 ? ALIAS_DBL : ALIAS_NRM;
+ cv->draw(img, alias);
overlay_frame->overlay(out, img, 0,0,w,h, 0,0,w,h,
- 1.f, TRANSFER_NORMAL, NEAREST_NEIGHBOR);
+ 1.f, TRANSFER_SRC_OVER, NEAREST_NEIGHBOR);
}
if( config.drag ) {