X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer.cpp;h=8d6ae4a4794afe4fc9660f31e108d277661599ab;hb=bfcf93289d3cf9cfef06ae8bb5b1c2eda0385e0b;hp=24597cf75917bbda5f448b9ebc2ab84044bb3499;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index 24597cf..8d6ae4a 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -1,27 +1,28 @@ -/* === 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" @@ -57,7 +58,7 @@ using namespace etl; using namespace std; -using namespace sinfg; +using namespace synfig; /* === G L O B A L S ======================================================= */ @@ -69,7 +70,7 @@ struct _LayerCounter ~_LayerCounter() { if(counter) - sinfg::error("%d layers not yet deleted!",counter); + synfig::error("%d layers not yet deleted!",counter); } } _layer_counter; @@ -94,8 +95,8 @@ Layer::subsys_init() { _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); @@ -126,18 +127,18 @@ Layer::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()) @@ -145,15 +146,15 @@ sinfg::Layer::~Layer() 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 x) +synfig::Layer::set_canvas(etl::loose_handle x) { if(canvas_!=x) { @@ -167,7 +168,7 @@ sinfg::Layer::set_canvas(etl::loose_handle x) *this, &Layer::set_canvas ), - etl::loose_handle(0) + etl::loose_handle(0) ) ); } @@ -176,12 +177,12 @@ sinfg::Layer::set_canvas(etl::loose_handle x) } void -sinfg::Layer::on_canvas_set() +synfig::Layer::on_canvas_set() { } -etl::loose_handle -sinfg::Layer::get_canvas()const +etl::loose_handle +synfig::Layer::get_canvas()const { return canvas_; } @@ -191,7 +192,7 @@ Layer::get_depth()const { if(!get_canvas()) return -1; - return get_canvas()->get_depth(const_cast(this)); + return get_canvas()->get_depth(const_cast(this)); } void @@ -212,7 +213,7 @@ Layer::set_description(const String& x) if(description_!=x) { description_=x; - signal_description_changed_(); + signal_description_changed_(); } } @@ -223,19 +224,19 @@ Layer::connect_dynamic_param(const String& param, etl::loose_handle v 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; } @@ -280,7 +281,7 @@ Layer::get_transform()const } 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_; @@ -302,16 +303,16 @@ Layer::Handle 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 @@ -320,7 +321,7 @@ Layer::clone(const GUID& deriv_guid) const { 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()) @@ -333,11 +334,11 @@ Layer::clone(const GUID& deriv_guid) const 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) @@ -354,7 +355,7 @@ Layer::clone(const GUID& deriv_guid) const continue; } } - + if(iter->second->is_exported()) ret->connect_dynamic_param(iter->first,iter->second); else @@ -362,7 +363,7 @@ Layer::clone(const GUID& deriv_guid) const } //ret->set_canvas(0); - + return ret; } @@ -456,8 +457,8 @@ Layer::get_color(Context context, const Point &pos)const 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); } @@ -521,10 +522,10 @@ Layer::get_times_vfunc(Node::time_set &set) const { 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()); } } @@ -540,14 +541,14 @@ Layer::add_to_group(const String&x) 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() { @@ -556,7 +557,7 @@ Layer::remove_from_all_groups() signal_removed_from_group()(group_); group_.clear(); } - + String Layer::get_group()const {