X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.h;h=4f2fb10dc7bcb4b4947e397aa54d0dcdbd4374ec;hb=75a589f5db5821fc10dd67941e4ca587b32a69d0;hp=67894f3ca24b7212e3a161731f5bd0299988d364;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer.h b/synfig-core/trunk/src/synfig/layer.h index 67894f3..4f2fb10 100644 --- a/synfig-core/trunk/src/synfig/layer.h +++ b/synfig-core/trunk/src/synfig/layer.h @@ -2,7 +2,7 @@ /*! \file layer.h ** \brief Layer Class Header ** -** $Id: layer.h,v 1.2 2005/01/24 03:08:18 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -62,10 +62,10 @@ #define SYNFIG_LAYER_INIT(class) synfig::Layer* class::create() { return new class(); } //! \writeme -#define IMPORT_PLUS(x,y) if(param==#x && value.same_as(x)) { value.put(&x);{y;}return true;} +#define IMPORT_PLUS(x,y) if(param==#x && value.same_type_as(x)) { value.put(&x);{y;}return true;} //! \writeme -#define IMPORT_AS(x,y) if(param==y && value.same_as(x)) { value.put(&x); return true;} +#define IMPORT_AS(x,y) if(param==y && value.same_type_as(x)) { value.put(&x); return true;} //! \writeme #define IMPORT(x) IMPORT_AS(x,#x) @@ -168,7 +168,7 @@ public: private: - /*! \c true if the layer is visible, \c is it is to be skipped + /*! \c true if the layer is visible, \c false if it is to be skipped ** \see set_active(), enable(), disable, active() */ bool active_; @@ -268,7 +268,7 @@ public: //! Gets the name of the group that this layer belongs to String get_group()const; - //! \todo writeme + //! writeme //DynamicParamList &dynamic_param_list() { return dynamic_param_list_; } //! \todo writeme @@ -390,24 +390,23 @@ public: ** \todo \a point should be of the type const Point \& */ virtual void set_time(Context context, Time time, const Point &point)const; - //! Gets the color of the Canvas at \a point + //! Gets the color of the Canvas at \a pos /*! \param context Context iterator refering to next Layer. - ** \param point Point which indicates where the desired Color should come from - ** \todo \a point should be of the type const Point \& + ** \param pos Point which indicates where the Color should come from ** \see Handle::get_color() */ - virtual Color get_color(Context context, const Point &point)const; + virtual Color get_color(Context context, const Point &pos)const; //! Renders the Canvas to the given Surface in an accelerated manner /*! \param context Context iterator refering to next Layer. ** \param surface Pointer to Surface to render to. ** \param quality The requested quality-level to render at. - ** \param rend_desc The associated RendDesc. - ** \param callback Pointer to callback object. May be NULL if there is no callback. + ** \param renddesc The associated RendDesc. + ** \param cb Pointer to callback object. May be NULL if there is no callback. ** \return \c true on success, \c false on failure ** \see Handle::accelerated_render() */ - virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &rend_desc, ProgressCallback *callback)const; + virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const; //! Checks to see if a part of the layer is directly under \a point /*! \param context Context iterator refering to next Layer.