-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file layer.cpp
** \brief Layer class implementation
**
-** $Id: layer.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $
+** $Id$
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned 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.
**
-** 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 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
*/
/* ========================================================================= */
/* === H E A D E R S ======================================================= */
-#define SINFG_NO_ANGLE
+#define SYNFIG_NO_ANGLE
#ifdef USING_PCH
# include "pch.h"
using namespace etl;
using namespace std;
-using namespace sinfg;
+using namespace synfig;
/* === G L O B A L S ======================================================= */
~_LayerCounter()
{
if(counter)
- sinfg::error("%d layers not yet deleted!",counter);
+ synfig::error("%d layers not yet deleted!",counter);
}
} _layer_counter;
{
_layer_book=new Book();
-#define INCLUDE_LAYER(class) sinfg::Layer::book()[sinfg::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__)
-#define LAYER_ALIAS(class,alias) sinfg::Layer::book()[sinfg::String(alias)]=sinfg::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__);
+#define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__)
+#define LAYER_ALIAS(class,alias) synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__);
- INCLUDE_LAYER(Layer_SolidColor);
- INCLUDE_LAYER(Layer_PasteCanvas);
- INCLUDE_LAYER(Layer_Polygon);
- LAYER_ALIAS(Layer_Polygon,"Polygon");
- INCLUDE_LAYER(Layer_MotionBlur);
+ INCLUDE_LAYER(Layer_SolidColor); LAYER_ALIAS(Layer_SolidColor,"SolidColor");
+ INCLUDE_LAYER(Layer_PasteCanvas); LAYER_ALIAS(Layer_PasteCanvas,"PasteCanvas");
+ INCLUDE_LAYER(Layer_Polygon); LAYER_ALIAS(Layer_Polygon,"Polygon");
+ INCLUDE_LAYER(Layer_MotionBlur); LAYER_ALIAS(Layer_MotionBlur,"MotionBlur");
#undef INCLUDE_LAYER
}
Layer::LooseHandle
-sinfg::Layer::create(const String &name)
+synfig::Layer::create(const String &name)
{
if(!book().count(name))
{
return Layer::LooseHandle(new Layer_Mime(name));
}
-
+
Layer* layer(book()[name].factory());
return Layer::LooseHandle(layer);
}
-sinfg::Layer::~Layer()
+synfig::Layer::~Layer()
{
_LayerCounter::counter--;
while(!dynamic_param_list_.empty())
remove_child(dynamic_param_list_.begin()->second.get());
dynamic_param_list_.erase(dynamic_param_list_.begin());
}
-
+
remove_from_all_groups();
-
+
parent_death_connect_.disconnect();
begin_delete();
}
void
-sinfg::Layer::set_canvas(etl::loose_handle<sinfg::Canvas> x)
+synfig::Layer::set_canvas(etl::loose_handle<Canvas> x)
{
if(canvas_!=x)
{
*this,
&Layer::set_canvas
),
- etl::loose_handle<sinfg::Canvas>(0)
+ etl::loose_handle<synfig::Canvas>(0)
)
);
}
}
void
-sinfg::Layer::on_canvas_set()
+synfig::Layer::on_canvas_set()
{
}
-etl::loose_handle<sinfg::Canvas>
-sinfg::Layer::get_canvas()const
+etl::loose_handle<synfig::Canvas>
+synfig::Layer::get_canvas()const
{
return canvas_;
}
{
if(!get_canvas())
return -1;
- return get_canvas()->get_depth(const_cast<sinfg::Layer*>(this));
+ return get_canvas()->get_depth(const_cast<synfig::Layer*>(this));
}
void
if(description_!=x)
{
description_=x;
- signal_description_changed_();
+ signal_description_changed_();
}
}
if(previous==value_node)
return true;
-
+
dynamic_param_list_[param]=ValueNode::Handle(value_node);
-
+
if(previous)
remove_child(previous.get());
-
+
add_child(value_node.get());
-
+
if(!value_node->is_exported() && get_canvas())
{
value_node->set_parent_canvas(get_canvas());
}
-
+
changed();
return true;
}
bool
Layer::set_param(const String ¶m, const ValueBase &value)
{
- if(param=="z_depth" && value.same_as(z_depth_))
+ if(param=="z_depth" && value.same_type_as(z_depth_))
{
z_depth_=value.get(z_depth_);
return true;
}
float
-Layer::get_z_depth(const sinfg::Time& t)const
+Layer::get_z_depth(const synfig::Time& t)const
{
if(!dynamic_param_list().count("z_depth"))
return z_depth_;
Layer::clone(const GUID& deriv_guid) const
{
if(!book().count(get_name())) return 0;
-
+
//Layer *ret = book()[get_name()].factory();//create(get_name()).get();
Handle ret = create(get_name()).get();
-
+
ret->group_=group_;
//ret->set_canvas(get_canvas());
ret->set_description(get_description());
ret->set_active(active());
ret->set_guid(get_guid()^deriv_guid);
-
+
//ret->set_param_list(get_param_list());
// Process the parameter list sothat
// we can duplicate any inlinecanvases
{
if(dynamic_param_list().count(iter->first)==0 && iter->second.get_type()==ValueBase::TYPE_CANVAS)
{
-
+
// This parameter is a canvas. We need a close look.
Canvas::Handle canvas(iter->second.get(Canvas::Handle()));
- if(canvas->is_inline())
+ if(canvas && canvas->is_inline())
{
// This parameter is an inlinecanvas! we need to clone it
// before we set it as aparameter.
continue;
}
}
-
+
// This is a normal parameter,go ahead and set it.
ret->set_param(iter->first, iter->second);
}
-
+
// Duplicate the dynamic paramlist, but only the exported data nodes
DynamicParamList::const_iterator iter;
for(iter=dynamic_param_list().begin();iter!=dynamic_param_list().end();++iter)
continue;
}
}
-
+
if(iter->second->is_exported())
ret->connect_dynamic_param(iter->first,iter->second);
else
}
//ret->set_canvas(0);
-
+
return ret;
}
}
bool
-Layer::set_version(const String &ver)
+Layer::set_version(const String &/*ver*/)
{
return false;
}
return context.get_color(pos);
}
-sinfg::Layer::Handle
-Layer::hit_check(sinfg::Context context, const sinfg::Point &pos)const
+synfig::Layer::Handle
+Layer::hit_check(synfig::Context context, const synfig::Point &pos)const
{
return context.hit_check(pos);
}
** is anything but accelerated...
*/
bool
-Layer::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb) const
+Layer::accelerated_render(Context context,Surface *surface,int /*quality*/, const RendDesc &renddesc, ProgressCallback *cb) const
{
handle<Target> target=surface_target(surface);
if(!target)
{
DynamicParamList::const_iterator i = dynamic_param_list_.begin(),
end = dynamic_param_list_.end();
-
+
for(; i != end; ++i)
{
- const Node::time_set &tset = i->second->get_times();
+ const Node::time_set &tset = i->second->get_times();
set.insert(tset.begin(),tset.end());
}
}
group_=x;
signal_added_to_group()(group_);
}
-
+
void
Layer::remove_from_group(const String&x)
{
if(group_==x)
remove_from_all_groups();
}
-
+
void
Layer::remove_from_all_groups()
{
signal_removed_from_group()(group_);
group_.clear();
}
-
+
String
Layer::get_group()const
{
projects / synfig.git / blobdiff