/* === S Y N F I G ========================================================= */
/*! \file filledrect.cpp
-** \brief Template Header
+** \brief Implementation of the "Rectangle" layer
**
-** $Id: filledrect.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 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
/* === G L O B A L S ======================================================= */
SYNFIG_LAYER_INIT(FilledRect);
-SYNFIG_LAYER_SET_NAME(FilledRect,"rectangle");
-SYNFIG_LAYER_SET_LOCAL_NAME(FilledRect,_("Rectangle"));
-SYNFIG_LAYER_SET_CATEGORY(FilledRect,_("Geometry"));
+SYNFIG_LAYER_SET_NAME(FilledRect,"filled_rectangle");
+SYNFIG_LAYER_SET_LOCAL_NAME(FilledRect,N_("Filled Rectangle"));
+SYNFIG_LAYER_SET_CATEGORY(FilledRect,N_("Example"));
SYNFIG_LAYER_SET_VERSION(FilledRect,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(FilledRect,"$Id: filledrect.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(FilledRect,"$Id$");
/* === P R O C E D U R E S ================================================= */
IMPORT(color);
IMPORT(point1);
IMPORT(point2);
- IMPORT(feather_x);
- IMPORT(feather_y);
+ IMPORT_PLUS(feather_x, if(feather_x<0)feather_x=0;);
+ IMPORT_PLUS(feather_y, if(feather_y<0)feather_y=0;);
IMPORT(bevel);
IMPORT(bevCircle);
//the bounds of the rectangle
Point p[2] = {point1,point2};
- if((p[0][0] > p[1][0]) ^ wpp < 0)
+ if((p[0][0] > p[1][0]) ^ (wpp < 0))
{
swap(p[0][0],p[1][0]);
}
- if((p[0][1] > p[1][1]) ^ hpp < 0)
+ if((p[0][1] > p[1][1]) ^ (hpp < 0))
{
swap(p[0][1],p[1][1]);
}