this->mwindow = mwindow;
this->thread = thread;
current_operation = 0;
+ span = 1; edge = 0;
}
CWindowToolGUI::~CWindowToolGUI()
return 0;
}
+void CWindowToolGUI::update_auto(Track *track, int idx, CWindowCoord *vp)
+{
+ FloatAuto *float_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
+ track->automation->autos[idx], 1);
+ if( !float_auto ) return;
+ float v = float_auto->get_value(edge);
+ float t = atof(vp->get_text());
+ if( v == t ) return;
+ float_auto->bump_value(t, edge, span);
+ if( idx == AUTOMATION_PROJECTOR_Z || idx == AUTOMATION_CAMERA_Z ) {
+ mwindow->gui->lock_window("CWindowToolGUI::update_auto");
+ mwindow->gui->draw_overlays(1);
+ mwindow->gui->unlock_window();
+ }
+ update();
+ update_preview();
+}
void CWindowToolGUI::update_preview(int changed_edl)
{
const char* tooltip;
};
-const _CVD Camera_Crv_Smooth =
- { FloatAuto::SMOOTH,
- true,
- "tan_smooth",
- N_("\"smooth\" Curve on current Camera Keyframes")
- };
-const _CVD Camera_Crv_Linear =
- { FloatAuto::LINEAR,
- true,
- "tan_linear",
- N_("\"linear\" Curve on current Camera Keyframes")
- };
-const _CVD Projector_Crv_Smooth =
- { FloatAuto::SMOOTH,
- false,
- "tan_smooth",
- N_("\"smooth\" Curve on current Projector Keyframes")
- };
-const _CVD Projector_Crv_Linear =
- { FloatAuto::LINEAR,
- false,
- "tan_linear",
- N_("\"linear\" Curve on current Projector Keyframes")
- };
+const _CVD Camera_Crv_Smooth = { FloatAuto::SMOOTH, true, "tan_smooth",
+ N_("\"smooth\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Linear = { FloatAuto::LINEAR, true, "tan_linear",
+ N_("\"linear\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Tangent = { FloatAuto::TFREE, true, "tan_tangent",
+ N_("\"tangent\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Free = { FloatAuto::FREE, true, "tan_free",
+ N_("\"free\" Curve on current Camera Keyframes") };
+const _CVD Camera_Crv_Bump = { FloatAuto::BUMP, true, "tan_bump",
+ N_("\"bump\" Curve on current Camera Keyframes") };
+
+const _CVD Projector_Crv_Smooth = { FloatAuto::SMOOTH, false, "tan_smooth",
+ N_("\"smooth\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Linear = { FloatAuto::LINEAR, false, "tan_linear",
+ N_("\"linear\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Tangent = { FloatAuto::TFREE, false, "tan_tangent",
+ N_("\"tangent\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Free = { FloatAuto::FREE, false, "tan_free",
+ N_("\"free\" Curve on current Projector Keyframes") };
+const _CVD Projector_Crv_Bump = { FloatAuto::BUMP, false, "tan_bump",
+ N_("\"bump\" Curve on current Projector Keyframes") };
// Implementation Class für Keyframe Curve Mode buttons
//
class CWindowCurveToggle : public BC_Toggle
{
public:
- CWindowCurveToggle(_CVD mode, MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
+ CWindowCurveToggle(const _CVD &mode,
+ MWindow *mwindow, CWindowToolGUI *gui, int x, int y);
void check_toggle_state(FloatAuto *x, FloatAuto *y, FloatAuto *z);
int handle_event();
private:
- _CVD cfg;
+ const _CVD &cfg;
MWindow *mwindow;
CWindowToolGUI *gui;
};
-CWindowCurveToggle::CWindowCurveToggle(_CVD mode, MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
+CWindowCurveToggle::CWindowCurveToggle(const _CVD &mode,
+ MWindow *mwindow, CWindowToolGUI *gui, int x, int y)
: BC_Toggle(x, y, mwindow->theme->get_image_set(mode.icon_id), false),
cfg(mode)
{
FloatAuto *x_auto = 0, *y_auto = 0, *z_auto = 0;
BC_Title *title;
BC_Button *button;
+ span = 1; edge = 0;
lock_window("CWindowCameraGUI::create_objects");
if( track ) {
add_subwindow(button = new CWindowCameraRight(mwindow, this, x1, y));
// additional Buttons to control the curve mode of the "current" keyframe
x1 += button->get_w() + xs15;
- add_subwindow(this->t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
- x1 += button->get_w() + xs10;
- add_subwindow(this->t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
+ add_subwindow(t_smooth = new CWindowCurveToggle(Camera_Crv_Smooth, mwindow, this, x1, y));
+ x1 += t_smooth->get_w() + xs10;
+ add_subwindow(t_linear = new CWindowCurveToggle(Camera_Crv_Linear, mwindow, this, x1, y));
+ x1 += t_linear->get_w() + xs10;
+ add_subwindow(t_tangent = new CWindowCurveToggle(Camera_Crv_Tangent, mwindow, this, x1, y));
+ x1 += t_tangent->get_w() + xs10;
+ add_subwindow(t_free = new CWindowCurveToggle(Camera_Crv_Free, mwindow, this, x1, y));
+ x1 += t_free->get_w() + xs10;
+ add_subwindow(t_bump = new CWindowCurveToggle(Camera_Crv_Bump, mwindow, this, x1, y));
y += button->get_h();
x1 = xs10;
x1 += button->get_w();
add_subwindow(button = new CWindowCameraBottom(mwindow, this, x1, y));
x1 += button->get_w() + xs15;
- add_subwindow(this->add_keyframe = new CWindowCameraAddKeyframe(mwindow, this, x1, y));
- x1 += button->get_w() + xs10;
- add_subwindow(this->reset = new CWindowCameraReset(mwindow, this, x1, y));
+ add_subwindow(add_keyframe = new CWindowCameraAddKeyframe(mwindow, this, x1, y));
+ x1 += add_keyframe->get_w() + xs15;
+ add_subwindow(auto_edge = new CWindowCurveAutoEdge(mwindow, this, x1, y));
+ x1 += auto_edge->get_w() + xs10;
+ add_subwindow(auto_span = new CWindowCurveAutoSpan(mwindow, this, x1, y));
+ x1 += auto_span->get_w() + xs15;
+ add_subwindow(reset = new CWindowCameraReset(mwindow, this, x1, y));
// fill in current auto keyframe values, set toggle states.
this->update();
void CWindowCameraGUI::handle_event()
{
- FloatAuto *x_auto = 0;
- FloatAuto *y_auto = 0;
- FloatAuto *z_auto = 0;
Track *track = mwindow->cwindow->calculate_affected_track();
- if(track)
- {
- mwindow->undo->update_undo_before(_("camera"), this);
- if(event_caller == x)
- {
- x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
- track->automation->autos[AUTOMATION_CAMERA_X], 1);
- if(x_auto)
- {
- x_auto->set_value(atof(x->get_text()));
- update();
- update_preview();
- }
- }
- else
- if(event_caller == y)
- {
- y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
- track->automation->autos[AUTOMATION_CAMERA_Y], 1);
- if(y_auto)
- {
- y_auto->set_value(atof(y->get_text()));
- update();
- update_preview();
- }
- }
- else
- if(event_caller == z)
- {
- z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
- track->automation->autos[AUTOMATION_CAMERA_Z], 1);
- if(z_auto)
- {
- float zoom = atof(z->get_text());
- if(zoom > 100.) zoom = 100.;
- else
- if(zoom < 0.01) zoom = 0.01;
- // Doesn't allow user to enter from scratch
- // if(zoom != atof(z->get_text()))
- // z->update(zoom);
-
- z_auto->set_value(zoom);
- mwindow->gui->lock_window("CWindowCameraGUI::handle_event");
- mwindow->gui->draw_overlays(1);
- mwindow->gui->unlock_window();
- update();
- update_preview();
- }
- }
-
- mwindow->undo->update_undo_after(_("camera"), LOAD_ALL);
- }
+ if( !track ) return;
+ mwindow->undo->update_undo_before(_("camera"), this);
+ if( event_caller == x )
+ update_auto(track, AUTOMATION_CAMERA_X, x);
+ else if( event_caller == y )
+ update_auto(track, AUTOMATION_CAMERA_Y, y);
+ else if( event_caller == z )
+ update_auto(track, AUTOMATION_CAMERA_Z, z);
+ mwindow->undo->update_undo_after(_("camera"), LOAD_ALL);
}
void CWindowCameraGUI::update()
FloatAuto *y_auto = 0;
FloatAuto *z_auto = 0;
Track *track = mwindow->cwindow->calculate_affected_track();
+ int bg_color = get_resources()->text_background;
+ int hi_color = bg_color ^ 0x444444;
if( track ) {
mwindow->cwindow->calculate_affected_autos(track,
&x_auto, &y_auto, &z_auto, 1, 0, 0, 0);
}
if( x_auto ) {
- float xvalue = x_auto->get_value();
+ int color = (edge || span) && x_auto->curve_mode == FloatAuto::BUMP ?
+ hi_color : bg_color;
+ x->get_textbox()->set_back_color(color);
+ float xvalue = x_auto->get_value(edge);
x->update_gui(xvalue);
}
if( y_auto ) {
- float yvalue = y_auto->get_value();
+ int color = (edge || span) && y_auto->curve_mode == FloatAuto::BUMP ?
+ hi_color : bg_color;
+ y->get_textbox()->set_back_color(color);
+ float yvalue = y_auto->get_value(edge);
y->update_gui(yvalue);
}
if( z_auto ) {
- float zvalue = z_auto->get_value();
+ int color = (edge || span) && z_auto->curve_mode == FloatAuto::BUMP ?
+ hi_color : bg_color;
+ z->get_textbox()->set_back_color(color);
+ float zvalue = z_auto->get_value(edge);
z->update_gui(zvalue);
thread->gui->lock_window("CWindowCameraGUI::update");
thread->gui->composite_panel->cpanel_zoom->update(zvalue);
if( x_auto && y_auto && z_auto ) {
t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
t_linear->check_toggle_state(x_auto, y_auto, z_auto);
+ t_tangent->check_toggle_state(x_auto, y_auto, z_auto);
+ t_free->check_toggle_state(x_auto, y_auto, z_auto);
+ t_bump->check_toggle_state(x_auto, y_auto, z_auto);
}
}
return gui->press(&CWindowCanvas::reset_camera);
}
+CWindowCurveAutoEdge::CWindowCurveAutoEdge(MWindow *mwindow,
+ CWindowToolGUI *gui, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("bump_edge"), gui->edge)
+{
+ this->mwindow = mwindow;
+ this->gui = gui;
+ set_tooltip(_("Bump edit edge left/right"));
+}
+
+int CWindowCurveAutoEdge::handle_event()
+{
+ gui->edge = get_value();
+ gui->update();
+ return 1;
+}
+
+CWindowCurveAutoSpan::CWindowCurveAutoSpan(MWindow *mwindow,
+ CWindowToolGUI *gui, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("bump_span"), gui->span)
+{
+ this->mwindow = mwindow;
+ this->gui = gui;
+ set_tooltip(_("Bump spans to next/prev"));
+}
+
+int CWindowCurveAutoSpan::handle_event()
+{
+ gui->span = get_value();
+ gui->update();
+ return 1;
+}
+
CWindowProjectorGUI::CWindowProjectorGUI(MWindow *mwindow, CWindowTool *thread)
: CWindowToolGUI(mwindow, thread, _(PROGRAM_NAME ": Projector"), xS(340), yS(170))
FloatAuto *z_auto = 0;
BC_Title *title;
BC_Button *button;
+ span = 1; edge = 0;
lock_window("CWindowProjectorGUI::create_objects");
if( track ) {
add_subwindow(button = new CWindowProjectorRight(mwindow, this, x1, y));
// additional Buttons to control the curve mode of the "current" keyframe
x1 += button->get_w() + xs15;
- add_subwindow(this->t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
- x1 += button->get_w() + xs10;
- add_subwindow(this->t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
+ add_subwindow(t_smooth = new CWindowCurveToggle(Projector_Crv_Smooth, mwindow, this, x1, y));
+ x1 += t_smooth->get_w() + xs10;
+ add_subwindow(t_linear = new CWindowCurveToggle(Projector_Crv_Linear, mwindow, this, x1, y));
+ x1 += t_linear->get_w() + xs15;
+ add_subwindow(t_tangent = new CWindowCurveToggle(Projector_Crv_Tangent, mwindow, this, x1, y));
+ x1 += t_tangent->get_w() + xs10;
+ add_subwindow(t_free = new CWindowCurveToggle(Projector_Crv_Free, mwindow, this, x1, y));
+ x1 += t_free->get_w() + xs10;
+ add_subwindow(t_bump = new CWindowCurveToggle(Projector_Crv_Bump, mwindow, this, x1, y));
y += button->get_h();
x1 = xs10;
x1 += button->get_w();
add_subwindow(button = new CWindowProjectorBottom(mwindow, this, x1, y));
x1 += button->get_w() + xs15;
- add_subwindow(this->add_keyframe = new CWindowProjectorAddKeyframe(mwindow, this, x1, y));
- x1 += button->get_w() + xs10;
- add_subwindow(this->reset = new CWindowProjectorReset(mwindow, this, x1, y));
+ add_subwindow(add_keyframe = new CWindowProjectorAddKeyframe(mwindow, this, x1, y));
+ x1 += add_keyframe->get_w() + xs15;
+ add_subwindow(auto_span = new CWindowCurveAutoSpan(mwindow, this, x1, y));
+ x1 += auto_span->get_w() + xs10;
+ add_subwindow(auto_edge = new CWindowCurveAutoEdge(mwindow, this, x1, y));
+ x1 += auto_edge->get_w() + xs15;
+ add_subwindow(reset = new CWindowProjectorReset(mwindow, this, x1, y));
// fill in current auto keyframe values, set toggle states.
this->update();
void CWindowProjectorGUI::handle_event()
{
- FloatAuto *x_auto = 0;
- FloatAuto *y_auto = 0;
- FloatAuto *z_auto = 0;
Track *track = mwindow->cwindow->calculate_affected_track();
-
- if(track)
- {
- mwindow->undo->update_undo_before(_("projector"), this);
- if(event_caller == x)
- {
- x_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
- track->automation->autos[AUTOMATION_PROJECTOR_X], 1);
- if(x_auto)
- {
- x_auto->set_value(atof(x->get_text()));
- update();
- update_preview();
- }
- }
- else
- if(event_caller == y)
- {
- y_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
- track->automation->autos[AUTOMATION_PROJECTOR_Y], 1);
- if(y_auto)
- {
- y_auto->set_value(atof(y->get_text()));
- update();
- update_preview();
- }
- }
- else
- if(event_caller == z)
- {
- z_auto = (FloatAuto*)mwindow->cwindow->calculate_affected_auto(
- track->automation->autos[AUTOMATION_PROJECTOR_Z], 1);
- if(z_auto)
- {
- float zoom = atof(z->get_text());
- if(zoom > 100.) zoom = 100.;
- else if(zoom < 0.01) zoom = 0.01;
-// if (zoom != atof(z->get_text()))
-// z->update(zoom);
- z_auto->set_value(zoom);
-
- mwindow->gui->lock_window("CWindowProjectorGUI::handle_event");
- mwindow->gui->draw_overlays(1);
- mwindow->gui->unlock_window();
-
- update();
- update_preview();
- }
- }
- mwindow->undo->update_undo_after(_("projector"), LOAD_ALL);
- }
+ if( !track ) return;
+ mwindow->undo->update_undo_before(_("projector"), this);
+ if( event_caller == x )
+ update_auto(track, AUTOMATION_PROJECTOR_X, x);
+ else if( event_caller == y )
+ update_auto(track, AUTOMATION_PROJECTOR_Y, y);
+ else if( event_caller == z )
+ update_auto(track, AUTOMATION_PROJECTOR_Z, z);
+ mwindow->undo->update_undo_after(_("projector"), LOAD_ALL);
}
void CWindowProjectorGUI::update()
FloatAuto *y_auto = 0;
FloatAuto *z_auto = 0;
Track *track = mwindow->cwindow->calculate_affected_track();
+ int bg_color = get_resources()->text_background;
+ int hi_color = bg_color ^ 0x444444;
if( track ) {
mwindow->cwindow->calculate_affected_autos(track,
&x_auto, &y_auto, &z_auto, 0, 0, 0, 0);
}
if( x_auto ) {
- float xvalue = x_auto->get_value();
+ int color = (edge || span) && x_auto->curve_mode == FloatAuto::BUMP ?
+ hi_color : bg_color;
+ x->get_textbox()->set_back_color(color);
+ float xvalue = x_auto->get_value(edge);
x->update_gui(xvalue);
}
if( y_auto ) {
- float yvalue = y_auto->get_value();
+ int color = (edge || span) && y_auto->curve_mode == FloatAuto::BUMP ?
+ hi_color : bg_color;
+ y->get_textbox()->set_back_color(color);
+ float yvalue = y_auto->get_value(edge);
y->update_gui(yvalue);
}
if( z_auto ) {
- float zvalue = z_auto->get_value();
+ int color = (edge || span) && z_auto->curve_mode == FloatAuto::BUMP ?
+ hi_color : bg_color;
+ z->get_textbox()->set_back_color(color);
+ float zvalue = z_auto->get_value(edge);
z->update_gui(zvalue);
thread->gui->lock_window("CWindowProjectorGUI::update");
thread->gui->composite_panel->cpanel_zoom->update(zvalue);
if( x_auto && y_auto && z_auto ) {
t_smooth->check_toggle_state(x_auto, y_auto, z_auto);
t_linear->check_toggle_state(x_auto, y_auto, z_auto);
+ t_tangent->check_toggle_state(x_auto, y_auto, z_auto);
+ t_free->check_toggle_state(x_auto, y_auto, z_auto);
+ t_bump->check_toggle_state(x_auto, y_auto, z_auto);
}
}
if( k >= 0 ) {
track_item = (CWindowMaskItem *)track_items[k];
Track *track = track_item ? mwindow->edl->tracks->get_track_by_id(track_item->id) : 0;
- if( track && track->record ) track_id = track->get_id();
+ if( track && track->is_armed() ) track_id = track->get_id();
}
else
track_id = mwindow->cwindow->mask_track_id;
for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
if( track->data_type != TRACK_VIDEO ) continue;
MaskAutos *mask_autos = (MaskAutos*)track->automation->autos[AUTOMATION_MASK];
- int color = !track->record ? RED : mask_autos->first ? high_color : -1;
+ int color = !track->is_armed() ? RED : mask_autos->first ? high_color : -1;
MaskAuto *mask_auto = (MaskAuto*)mask_autos->default_auto;
for( int i=0; color<0 && i<mask_auto->masks.size(); ++i )
if( mask_auto->masks[i]->points.size() > 0 ) color = high_color;
track_item = items[0];
}
Track *track = track_item ? mwindow->edl->tracks->get_track_by_id(track_item->id) : 0;
- int track_id = track_item && track && track->record ? track_item->id : -1;
+ int track_id = track_item && track && track->is_armed() ? track_item->id : -1;
gui->mask_on_track->set_back_color(track_id >= 0 ?
gui->get_resources()->text_background :
gui->get_resources()->text_background_disarmed);
//printf("CWindowMaskGUI::update 1\n");
get_keyframe(track, autos, keyframe, mask, point, 0);
mwindow->cwindow->mask_track_id = track ? track->get_id() : -1;
- mask_on_track->set_back_color(!track || track->record ?
+ mask_on_track->set_back_color(!track || track->is_armed() ?
get_resources()->text_background :
get_resources()->text_background_disarmed);
mask_on_track->update_items();
projects / goodguy / cinelerra.git / blobdiff