X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Fstar.cpp;h=cb1d8e6efe678963aa4522cb2a39508fc3176804;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=2e5bac0bedc3600850ecdc9f29cb142593f92d4c;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_geometry/star.cpp b/synfig-core/trunk/src/modules/mod_geometry/star.cpp
index 2e5bac0..cb1d8e6 100644
--- a/synfig-core/trunk/src/modules/mod_geometry/star.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/star.cpp
@@ -1,18 +1,23 @@
-/*! ========================================================================
-** Sinfg
-** Template File
-** $Id: star.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file star.cpp
+**	\brief Implementation of the "Star" layer
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	$Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007-2008 Chris Moore
 **
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
+**
+**	This package is distributed in the hope that it will be useful,
+**	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 ===========================================================
 **
@@ -32,15 +37,15 @@
 #include <ETL/bezier>
 #include <ETL/hermite>
 
-#include <sinfg/string.h>
-#include <sinfg/time.h>
-#include <sinfg/context.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/renddesc.h>
-#include <sinfg/surface.h>
-#include <sinfg/value.h>
-#include <sinfg/valuenode.h>
-#include <sinfg/segment.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/segment.h>
 
 #endif
 
@@ -52,12 +57,12 @@ using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(Star);
-SINFG_LAYER_SET_NAME(Star,"star");
-SINFG_LAYER_SET_LOCAL_NAME(Star,_("Star"));
-SINFG_LAYER_SET_CATEGORY(Star,_("Geometry"));
-SINFG_LAYER_SET_VERSION(Star,"0.1");
-SINFG_LAYER_SET_CVS_ID(Star,"$Id: star.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_INIT(Star);
+SYNFIG_LAYER_SET_NAME(Star,"star");
+SYNFIG_LAYER_SET_LOCAL_NAME(Star,N_("Star"));
+SYNFIG_LAYER_SET_CATEGORY(Star,N_("Geometry"));
+SYNFIG_LAYER_SET_VERSION(Star,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Star,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -69,7 +74,8 @@ Star::Star():
 	radius1(1.0),
 	radius2(0.38),
 	points(5),
-	angle(Angle::deg(90))
+	angle(Angle::deg(90)),
+	regular_polygon(false)
 {
 	sync();
 }
@@ -79,14 +85,15 @@ Star::sync()
 {
 	Angle dist_between_points(Angle::rot(1)/float(points));
 	std::vector<Point> vector_list;
-	
+
 	int i;
 	for(i=0;i<points;i++)
 	{
 		Angle dist1(dist_between_points*i+angle);
 		Angle dist2(dist_between_points*i+dist_between_points/2+angle);
 		vector_list.push_back(Point(Angle::cos(dist1).get()*radius1,Angle::sin(dist1).get()*radius1));
-		vector_list.push_back(Point(Angle::cos(dist2).get()*radius2,Angle::sin(dist2).get()*radius2));
+		if (!regular_polygon)
+			vector_list.push_back(Point(Angle::cos(dist2).get()*radius2,Angle::sin(dist2).get()*radius2));
 	}
 	clear();
 	add_polygon(vector_list);
@@ -95,21 +102,21 @@ Star::sync()
 bool
 Star::set_param(const String & param, const ValueBase &value)
 {
-	if(	param=="radius1" && value.same_as(radius1))
+	if(	param=="radius1" && value.same_type_as(radius1))
 	{
 		value.put(&radius1);
 		sync();
 		return true;
 	}
 
-	if(	param=="radius2" && value.same_as(radius2))
+	if(	param=="radius2" && value.same_type_as(radius2))
 	{
 		value.put(&radius2);
 		sync();
 		return true;
 	}
 
-	if(	param=="points" && value.same_as(points))
+	if(	param=="points" && value.same_type_as(points))
 	{
 		value.put(&points);
 		if(points<2)points=2;
@@ -117,13 +124,20 @@ Star::set_param(const String & param, const ValueBase &value)
 		return true;
 	}
 
-	if(	param=="angle" && value.same_as(angle))
+	if(	param=="angle" && value.same_type_as(angle))
 	{
 		value.put(&angle);
 		sync();
 		return true;
 	}
 
+	if(param=="regular_polygon" && value.same_type_as(regular_polygon))
+	{
+		value.put(&regular_polygon);
+		sync();
+		return true;
+	}
+
 	if(param=="vector_list")
 		return false;
 
@@ -137,12 +151,13 @@ Star::get_param(const String& param)const
 	EXPORT(radius2);
 	EXPORT(points);
 	EXPORT(angle);
+	EXPORT(regular_polygon);
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
 
 	if(param=="vector_list")
-		return ValueBase();	
+		return ValueBase();
 
 	return Layer_Polygon::get_param(param);
 }
@@ -159,20 +174,20 @@ Star::get_param_vocab()const
 		.set_local_name(_("Outer Radius"))
 		.set_description(_("The radius of the outer points in the star"))
 		.set_is_distance()
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 
 	ret.push_back(ParamDesc("radius2")
 		.set_local_name(_("Inner Radius"))
 		.set_description(_("The radius of the inner points in the star"))
 		.set_is_distance()
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 
 	ret.push_back(ParamDesc("angle")
 		.set_local_name(_("Angle"))
 		.set_description(_("The orientation of the star"))
-		.set_origin("offset")
+		.set_origin("origin")
 	);
 
 	ret.push_back(ParamDesc("points")
@@ -180,5 +195,10 @@ Star::get_param_vocab()const
 		.set_description(_("The number of points in the star"))
 	);
 
+	ret.push_back(ParamDesc("regular_polygon")
+		.set_local_name(_("Regular Polygon"))
+		.set_description(_("Whether to draw a star or a regular polygon"))
+	);
+
 	return ret;
 }