X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Fstar.cpp;h=b4898c46084da1f11c9a315ad4f16a265eb53876;hb=6542407861e99a0ed76bd1ba9d03ca164ec7269b;hp=e317d0cff56075913608902226df2611a9333642;hpb=c74ce4738eff208de3bef4b63929b6975a896e93;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 e317d0c..b4898c4 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/star.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/star.cpp @@ -1,6 +1,6 @@ /* === S Y N F I G ========================================================= */ /*! \file star.cpp -** \brief Template Header +** \brief Implementation of the "Star" layer ** ** $Id$ ** @@ -58,8 +58,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Star); SYNFIG_LAYER_SET_NAME(Star,"star"); -SYNFIG_LAYER_SET_LOCAL_NAME(Star,_("Star")); -SYNFIG_LAYER_SET_CATEGORY(Star,_("Geometry")); +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$"); @@ -73,7 +73,8 @@ Star::Star(): radius1(1.0), radius2(0.38), points(5), - angle(Angle::deg(90)) + angle(Angle::deg(90)), + regular_polygon(false) { sync(); } @@ -90,7 +91,8 @@ Star::sync() 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); @@ -128,6 +130,13 @@ Star::set_param(const String & param, const ValueBase &value) return true; } + if(param=="regular_polygon" && value.same_type_as(regular_polygon)) + { + value.put(®ular_polygon); + sync(); + return true; + } + if(param=="vector_list") return false; @@ -141,6 +150,7 @@ Star::get_param(const String& param)const EXPORT(radius2); EXPORT(points); EXPORT(angle); + EXPORT(regular_polygon); EXPORT_NAME(); EXPORT_VERSION(); @@ -184,5 +194,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; }