X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Fregion.cpp;h=462d30e2d583c1f853d8ab602dd0482060349ad4;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=87d6052294511228f43ec2751e1568a109e1956d;hpb=21bfc670b83d4c45da9ed1b95063b7e6a007168c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_geometry/region.cpp b/synfig-core/trunk/src/modules/mod_geometry/region.cpp
index 87d6052..462d30e 100644
--- a/synfig-core/trunk/src/modules/mod_geometry/region.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/region.cpp
@@ -1,9 +1,12 @@
-/*! ========================================================================
-** Synfig
-** Template File
-** $Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file region.cpp
+**	\brief Implementation of the "Region" layer
 **
+**	$Id$
+**
+**	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -14,6 +17,7 @@
 **	but WITHOUT ANY WARRANTY; without even the implied warranty of
 **	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 **	General Public License for more details.
+**	\endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -56,10 +60,10 @@ using namespace etl;
 
 SYNFIG_LAYER_INIT(Region);
 SYNFIG_LAYER_SET_NAME(Region,"region");
-SYNFIG_LAYER_SET_LOCAL_NAME(Region,_("Region"));
-SYNFIG_LAYER_SET_CATEGORY(Region,_("Geometry"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Region,N_("Region"));
+SYNFIG_LAYER_SET_CATEGORY(Region,N_("Geometry"));
 SYNFIG_LAYER_SET_VERSION(Region,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Region,"$Id: region.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(Region,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -74,15 +78,15 @@ Region::Region()
 	bline_point_list.push_back(BLinePoint());
 	bline_point_list.push_back(BLinePoint());
 	bline_point_list.push_back(BLinePoint());
-	bline_point_list[0].set_vertex(Point(0,1));	
-	bline_point_list[1].set_vertex(Point(0,-1));	
+	bline_point_list[0].set_vertex(Point(0,1));
+	bline_point_list[1].set_vertex(Point(0,-1));
 	bline_point_list[2].set_vertex(Point(1,0));
-	bline_point_list[0].set_tangent(bline_point_list[1].get_vertex()-bline_point_list[2].get_vertex()*0.5f);	
-	bline_point_list[1].set_tangent(bline_point_list[2].get_vertex()-bline_point_list[0].get_vertex()*0.5f);	
-	bline_point_list[2].set_tangent(bline_point_list[0].get_vertex()-bline_point_list[1].get_vertex()*0.5f);	
-	bline_point_list[0].set_width(1.0f);	
-	bline_point_list[1].set_width(1.0f);	
-	bline_point_list[2].set_width(1.0f);	
+	bline_point_list[0].set_tangent(bline_point_list[1].get_vertex()-bline_point_list[2].get_vertex()*0.5f);
+	bline_point_list[1].set_tangent(bline_point_list[2].get_vertex()-bline_point_list[0].get_vertex()*0.5f);
+	bline_point_list[2].set_tangent(bline_point_list[0].get_vertex()-bline_point_list[1].get_vertex()*0.5f);
+	bline_point_list[0].set_width(1.0f);
+	bline_point_list[1].set_width(1.0f);
+	bline_point_list[2].set_width(1.0f);
 	bline=bline_point_list;
 }
 
@@ -90,9 +94,9 @@ void
 Region::sync()
 {
 	if(bline.get_contained_type()==ValueBase::TYPE_BLINEPOINT)
-	{
 		segment_list=convert_bline_to_segment_list(bline);
-	}
+	else if(bline.get_contained_type()==ValueBase::TYPE_SEGMENT)
+		segment_list=vector<synfig::Segment>(bline.get_list().begin(), bline.get_list().end());
 	else
 	{
 		synfig::warning("Region: incorrect type on bline, layer disabled");
@@ -106,7 +110,7 @@ Region::sync()
 		clear();
 		return;
 	}
-	
+
 	bool looped = bline.get_loop();
 
 	Vector::value_type n;
@@ -115,13 +119,13 @@ Region::sync()
 
 	vector<Segment>::const_iterator iter=segment_list.begin();
 	//Vector							last = iter->p1;
-	
+
 	//make sure the shape has a clean slate for writing
 	//clear();
-	
+
 	//and start off at the first point
 	//move_to(last[0],last[1]);
-	
+
 	for(;iter!=segment_list.end();++iter)
 	{
 		//connect them with a line if they aren't already joined
@@ -129,14 +133,14 @@ Region::sync()
 		{
 			line_to(iter->p1[0],iter->p1[1]);
 		}
-		
+
 		//curve to the next end point
 		curve_to(iter->p1[0] + iter->t1[0]/3.0,iter->p1[1] + iter->t1[1]/3.0,
 				 iter->p2[0] - iter->t2[0]/3.0,iter->p2[1] - iter->t2[1]/3.0,
 				 iter->p2[0],iter->p2[1]);
-		
+
 		last = iter->p2;*/
-		
+
 		if(iter->t1.is_equal_to(Vector(0,0)) && iter->t2.is_equal_to(Vector(0,0)))
 		{
 			vector_list.push_back(iter->p2);
@@ -153,16 +157,14 @@ Region::sync()
 				vector_list.push_back(curve(n));
 		}
 	}
-	
-	//add a single point onto the end so it actually fits the shape, so we can be awesome...
+
+	//add the starting point onto the end so it actually fits the shape, so we can be extra awesome...
 	if(!looped)
-	{
-		vector_list.push_back(curve.p2());
-	}
+		vector_list.push_back(segment_list[0].p1);
 
 	clear();
 	add_polygon(vector_list);
-	
+
 	/*close();
 	endpath();*/
 }
@@ -181,12 +183,12 @@ Region::set_param(const String & param, const ValueBase &value)
 		else
 			synfig::warning("Region::set_param(): The parameter \"segment_list\" is deprecated. Use \"bline\" instead.");
 	}
-	
+
 	if(	(param=="segment_list" || param=="bline") && value.get_type()==ValueBase::TYPE_LIST)
 	{
 		//if(value.get_contained_type()!=ValueBase::TYPE_BLINEPOINT)
 		//	return false;
-			
+
 		bline=value;
 
 		return true;
@@ -228,7 +230,7 @@ Region::get_param_vocab()const
 
 	ret.push_back(ParamDesc("bline")
 		.set_local_name(_("Vertices"))
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 
 	return ret;