X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_bline.cpp;h=8c4ec08cb400ecbd862db3ec24a5599860282b25;hb=58575b7ece3fabec0c0ffa2633590819c8812e7b;hp=61a30b2e2a1a129cd93a1f7c85ebd6ec490aceb0;hpb=587d6ca07e817b7a98e8eb4833492b2388184df4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index 61a30b2..8c4ec08 100644
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -64,6 +64,9 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
+// if defined, show the first duck as green while drawing
+#define DISTINGUISH_FIRST_DUCK
+
 /* === G L O B A L S ======================================================= */
 
 StateBLine studio::state_bline;
@@ -214,15 +217,15 @@ public:
 StateBLine::StateBLine():
 	Smach::state<StateBLine_Context>("bline")
 {
-	insert(event_def(EVENT_LAYER_SELECTION_CHANGED,&StateBLine_Context::event_layer_selection_changed_handler));
-	insert(event_def(EVENT_STOP,&StateBLine_Context::event_stop_handler));
-	insert(event_def(EVENT_REFRESH,&StateBLine_Context::event_refresh_handler));
-	insert(event_def(EVENT_REFRESH_DUCKS,&StateBLine_Context::event_hijack));
-	insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DOWN,&StateBLine_Context::event_mouse_click_handler));
-	insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_UP,&StateBLine_Context::event_mouse_release_handler));
-	insert(event_def(EVENT_WORKAREA_MOUSE_MOTION,&StateBLine_Context::event_mouse_motion_handler));
-	insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,&StateBLine_Context::event_mouse_motion_handler));
-	insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateBLine_Context::event_refresh_tool_options));
+	insert(event_def(EVENT_LAYER_SELECTION_CHANGED,		&StateBLine_Context::event_layer_selection_changed_handler));
+	insert(event_def(EVENT_STOP,						&StateBLine_Context::event_stop_handler));
+	insert(event_def(EVENT_REFRESH,						&StateBLine_Context::event_refresh_handler));
+	insert(event_def(EVENT_REFRESH_DUCKS,				&StateBLine_Context::event_hijack));
+	insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DOWN,	&StateBLine_Context::event_mouse_click_handler));
+	insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_UP,	&StateBLine_Context::event_mouse_release_handler));
+	insert(event_def(EVENT_WORKAREA_MOUSE_MOTION,		&StateBLine_Context::event_mouse_motion_handler));
+	insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,	&StateBLine_Context::event_mouse_motion_handler));
+	insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,		&StateBLine_Context::event_refresh_tool_options));
 }
 
 StateBLine::~StateBLine()
@@ -324,7 +327,7 @@ StateBLine_Context::increment_id()
 		String str_number;
 		str_number=String(id,id.size()-digits,id.size());
 		id=String(id,0,id.size()-digits);
-		synfig::info("---------------- \"%s\"",str_number.c_str());
+		// synfig::info("---------------- \"%s\"",str_number.c_str());
 
 		number=atoi(str_number.c_str());
 	}
@@ -475,7 +478,7 @@ StateBLine_Context::~StateBLine_Context()
 Smach::event_result
 StateBLine_Context::event_stop_handler(const Smach::event& /*x*/)
 {
-	synfig::info("STATE RotoBLine: Received Stop Event");
+//	synfig::info("STATE RotoBLine: Received Stop Event");
 //	run();
 	reset();
 //	throw Smach::egress_exception();
@@ -486,7 +489,7 @@ StateBLine_Context::event_stop_handler(const Smach::event& /*x*/)
 Smach::event_result
 StateBLine_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
-	synfig::info("STATE RotoBLine: Received Refresh Event");
+//	synfig::info("STATE RotoBLine: Received Refresh Event");
 	refresh_ducks();
 	return Smach::RESULT_ACCEPT;
 }
@@ -600,7 +603,14 @@ StateBLine_Context::run_()
 		if(!canvas)
 			canvas=get_canvas_view()->get_canvas();
 
+		value_node_bline->set_member_canvas(canvas);
+
 		synfigapp::SelectionManager::LayerList layer_selection;
+		if (!getenv("SYNFIG_TOOLS_CLEAR_SELECTION"))
+			layer_selection = get_canvas_view()->get_selection_manager()->get_selected_layers();
+
+		// count how many layers we're going to be creating
+		int layers_to_create = this->layers_to_create();
 
 		///////////////////////////////////////////////////////////////////////////
 		//   C U R V E   G R A D I E N T
@@ -637,7 +647,8 @@ StateBLine_Context::run_()
 				}
 			}
 
-			if (get_layer_link_offsets_flag())
+			// only link the curve gradient's offset parameter if the option is selected and we're creating more than one layer
+			if (get_layer_link_offsets_flag() && layers_to_create > 1)
 			{
 				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
 				assert(action);
@@ -695,8 +706,8 @@ StateBLine_Context::run_()
 				}
 			}
 
-			// plants don't have offsets?
-			if (get_layer_link_offsets_flag())
+			// only link the plant's offset parameter if the option is selected and we're creating more than one layer
+			if (get_layer_link_offsets_flag() && layers_to_create > 1)
 			{
 				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
 				assert(action);
@@ -765,7 +776,8 @@ StateBLine_Context::run_()
 				}
 			}
 
-			if (get_layer_link_offsets_flag())
+			// only link the region's offset parameter if the option is selected and we're creating more than one layer
+			if (get_layer_link_offsets_flag() && layers_to_create > 1)
 			{
 				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
 				assert(action);
@@ -828,7 +840,8 @@ StateBLine_Context::run_()
 				}
 			}
 
-			if (get_layer_link_offsets_flag())
+			// only link the outline's offset parameter if the option is selected and we're creating more than one layer
+			if (get_layer_link_offsets_flag() && layers_to_create > 1)
 			{
 				synfigapp::Action::Handle action(synfigapp::Action::create("layer_param_connect"));
 				assert(action);
@@ -906,7 +919,7 @@ StateBLine_Context::event_mouse_release_handler(const Smach::event& /*x*/)
 Smach::event_result
 StateBLine_Context::event_mouse_click_handler(const Smach::event& x)
 {
-	synfig::info("STATE BLINE: Received mouse button down Event");
+	// synfig::info("STATE BLINE: Received mouse button down Event");
 	const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
 	switch(event.button)
 	{
@@ -988,7 +1001,12 @@ StateBLine_Context::refresh_ducks(bool button_down)
 		// First add the duck associated with this vertex
 		duck=new WorkArea::Duck(bline_point.get_vertex());
 		duck->set_editable(true);
+#ifdef DISTINGUISH_FIRST_DUCK
+		if (iter!=bline_point_list.begin())
+			duck->set_type(Duck::TYPE_VERTEX);
+#else
 		duck->set_type(Duck::TYPE_VERTEX);
+#endif
 		duck->set_name(strprintf("%x-vertex",value_node.get()));
 		duck->signal_edited().connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),value_node)
@@ -996,7 +1014,7 @@ StateBLine_Context::refresh_ducks(bool button_down)
 		duck->signal_user_click(2).connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_vertex_menu),value_node)
 		);
-		duck->set_guid(value_node->get_guid()^GUID::hasher(0));
+		duck->set_guid(value_node->get_guid()^synfig::GUID::hasher(0));
 
 		get_work_area()->add_duck(duck);
 
@@ -1007,7 +1025,7 @@ StateBLine_Context::refresh_ducks(bool button_down)
 		tduck->set_origin(duck);
 		tduck->set_scalar(-0.33333333333333333);
 		tduck->set_tangent(true);
-		tduck->set_guid(value_node->get_guid()^GUID::hasher(3));
+		tduck->set_guid(value_node->get_guid()^synfig::GUID::hasher(3));
 		tduck->signal_edited().connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
 		);
@@ -1070,7 +1088,7 @@ StateBLine_Context::refresh_ducks(bool button_down)
 				sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_tangent1_change),value_node)
 			);
 		}
-		tduck->set_guid(value_node->get_guid()^GUID::hasher(4));
+		tduck->set_guid(value_node->get_guid()^synfig::GUID::hasher(4));
 		tduck->signal_user_click(2).connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::popup_handle_menu),value_node)
 		);
@@ -1091,6 +1109,9 @@ StateBLine_Context::refresh_ducks(bool button_down)
 
 		duck=new WorkArea::Duck(bline_point.get_vertex());
 		duck->set_editable(true);
+#ifndef DISTINGUISH_FIRST_DUCK
+		duck->set_type(Duck::TYPE_VERTEX);
+#endif
 		duck->set_name(strprintf("%x-vertex",bline_point_list.front().get()));
 		duck->signal_edited().connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),bline_point_list.front())
@@ -1152,8 +1173,8 @@ StateBLine_Context::refresh_ducks(bool button_down)
 		//get_work_area()->add_duck(bezier->c2);
 		get_work_area()->add_bezier(bezier);
 
-		duck->set_guid(GUID());
-		tduck->set_guid(GUID());
+		duck->set_guid(synfig::GUID());
+		tduck->set_guid(synfig::GUID());
 
 		next_duck=duck;
 	}
@@ -1293,11 +1314,7 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no
 
 			bline_point.set_vertex(curve(origin));
 			bline_point.set_width((next_bline_point.get_width()-prev_bline_point.get_width())*origin+prev_bline_point.get_width());
-#ifdef ETL_FIXED_DERIVATIVE
 			bline_point.set_tangent1(deriv(origin)*std::min(1.0f-origin,origin));
-#else
-			bline_point.set_tangent1(-deriv(origin)*std::min(1.0f-origin,origin));
-#endif
 			bline_point.set_tangent2(bline_point.get_tangent1());
 			bline_point.set_split_tangent_flag(false);
 			bline_point.set_origin(origin);