X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_bline.cpp;h=cee1d8d5ef1676778312504bf20630871503c212;hb=003520b8158176c1509825eef09f46cd417dcc16;hp=f1f2221b947781de5cd70349ad1c84659878599b;hpb=a1373cb0b813709f46c5d688b554ef5db7ea59ff;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index f1f2221..cee1d8d 100644
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -65,7 +65,7 @@ using namespace studio;
 /* === M A C R O S ========================================================= */
 
 // if defined, show the first duck as green while drawing
-//#define DISTINGUISH_FIRST_DUCK
+#define DISTINGUISH_FIRST_DUCK
 
 /* === G L O B A L S ======================================================= */
 
@@ -327,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());
 	}
@@ -478,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();
@@ -489,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;
 }
@@ -603,6 +603,8 @@ StateBLine_Context::run_()
 		if(!canvas)
 			canvas=get_canvas_view()->get_canvas();
 
+		value_node_bline->set_member_canvas(canvas);
+
 		synfigapp::SelectionManager::LayerList layer_selection;
 
 		///////////////////////////////////////////////////////////////////////////
@@ -909,7 +911,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)
 	{
@@ -1004,7 +1006,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);
 
@@ -1015,7 +1017,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)
 		);
@@ -1078,7 +1080,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)
 		);
@@ -1163,8 +1165,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;
 	}
@@ -1304,11 +1306,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);