X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_solidcolor.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_solidcolor.cpp;h=0000000000000000000000000000000000000000;hb=a095981e18cc37a8ecc7cd237cc22b9c10329264;hp=0b520adcf7ed824926acd5c815c5c40804b18c71;hpb=9459638ad6797b8139f1e9f0715c96076dbf0890;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp
deleted file mode 100644
index 0b520ad..0000000
--- a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file layer_solidcolor.cpp
-**	\brief Implementation of the "Solid Color" layer
-**
-**	$Id$
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007, 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
-**	published by the Free Software Foundation; either version 2 of
-**	the License, or (at your option) any later version.
-**
-**	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 ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include "layer_solidcolor.h"
-#include "string.h"
-#include "time.h"
-#include "context.h"
-#include "paramdesc.h"
-#include "renddesc.h"
-#include "surface.h"
-#include "value.h"
-#include "valuenode.h"
-
-#endif
-
-/* === U S I N G =========================================================== */
-
-using namespace etl;
-using namespace std;
-using namespace synfig;
-
-/* === G L O B A L S ======================================================= */
-
-SYNFIG_LAYER_INIT(Layer_SolidColor);
-SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"SolidColor"); // todo: use solid_color
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,N_("Solid Color"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_SolidColor,N_("Geometry"));
-SYNFIG_LAYER_SET_VERSION(Layer_SolidColor,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Layer_SolidColor,"$Id$");
-
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-/* === E N T R Y P O I N T ================================================= */
-
-Layer_SolidColor::Layer_SolidColor():
-	Layer_Composite(1.0,Color::BLEND_STRAIGHT),
-	color(Color::black())
-{
-}
-
-bool
-Layer_SolidColor::set_param(const String & param, const ValueBase &value)
-{
-	IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
-					set_blend_method(Color::BLEND_ALPHA_OVER);
-					color.set_a(1); } else transparent_color_ = true; } });
-
-	return Layer_Composite::set_param(param,value);
-}
-
-ValueBase
-Layer_SolidColor::get_param(const String &param)const
-{
-	EXPORT(color);
-
-	EXPORT_NAME();
-	EXPORT_VERSION();
-
-	return Layer_Composite::get_param(param);
-}
-
-Layer::Vocab
-Layer_SolidColor::get_param_vocab()const
-{
-	Layer::Vocab ret(Layer_Composite::get_param_vocab());
-
-	ret.push_back(ParamDesc("color")
-		.set_local_name(_("Color"))
-	);
-
-	return ret;
-}
-
-synfig::Layer::Handle
-Layer_SolidColor::hit_check(synfig::Context context, const synfig::Point &point)const
-{
-	if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5)
-		return const_cast<Layer_SolidColor*>(this);
-	else
-	if(get_blend_method()==Color::BLEND_COMPOSITE && get_amount()*color.get_a()>=0.5)
-		return const_cast<Layer_SolidColor*>(this);
-
-	Layer::Handle layer(context.hit_check(point));
-
-	return layer?layer:const_cast<Layer_SolidColor*>(this);
-}
-
-Color
-Layer_SolidColor::get_color(Context context, const Point &pos)const
-{
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-		return color;
-	else
-		return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
-}
-
-bool
-Layer_SolidColor::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
-{
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-	{
-		// Mark our progress as starting
-		if(cb && !cb->amount_complete(0,1000))
-			return false;
-
-		surface->set_wh(renddesc.get_w(),renddesc.get_h());
-		surface->fill(color);
-
-		// Mark our progress as finished
-		if(cb && !cb->amount_complete(1000,1000))
-			return false;
-
-		return true;
-	}
-
-	SuperCallback supercb(cb,0,9500,10000);
-
-	if(!context.accelerated_render(surface,quality,renddesc,&supercb))
-		return false;
-
-	int x,y;
-
-	Surface::alpha_pen apen(surface->begin());
-
-	apen.set_value(color);
-	apen.set_alpha(get_amount());
-	apen.set_blend_method(get_blend_method());
-
-	for(y=0;y<renddesc.get_h();y++,apen.inc_y(),apen.dec_x(x))
-		for(x=0;x<renddesc.get_w();x++,apen.inc_x())
-			apen.put_value();
-
-	// Mark our progress as finished
-	if(cb && !cb->amount_complete(10000,10000))
-		return false;
-
-	return true;
-}