X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Ftwirl.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Ftwirl.cpp;h=0000000000000000000000000000000000000000;hb=a095981e18cc37a8ecc7cd237cc22b9c10329264;hp=38d209728dfe81d8b601bbfe6c051b4d0446989d;hpb=9459638ad6797b8139f1e9f0715c96076dbf0890;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/twirl.cpp b/synfig-core/trunk/src/modules/lyr_std/twirl.cpp
deleted file mode 100644
index 38d2097..0000000
--- a/synfig-core/trunk/src/modules/lyr_std/twirl.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file twirl.cpp
-**	\brief Implementation of the "Twirl" layer
-**
-**	$Id$
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**
-**	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 <synfig/string.h>
-#include <synfig/time.h>
-#include <synfig/context.h>
-#include <synfig/paramdesc.h>
-#include <synfig/renddesc.h>
-#include <synfig/surface.h>
-#include <synfig/value.h>
-#include <synfig/valuenode.h>
-#include <synfig/transform.h>
-#include "twirl.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(Twirl);
-SYNFIG_LAYER_SET_NAME(Twirl,"twirl");
-SYNFIG_LAYER_SET_LOCAL_NAME(Twirl,N_("Twirl"));
-SYNFIG_LAYER_SET_CATEGORY(Twirl,N_("Distortions"));
-SYNFIG_LAYER_SET_VERSION(Twirl,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Twirl,"$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 ================================================= */
-
-Twirl::Twirl():
-	Layer_Composite(1.0,Color::BLEND_STRAIGHT),
-	center(0,0),
-	radius(1.0),
-	rotations(Angle::zero()),
-	distort_inside(true),
-	distort_outside(false)
-{
-}
-
-bool
-Twirl::set_param(const String & param, const ValueBase &value)
-{
-	IMPORT(center);
-	IMPORT(radius);
-	IMPORT(rotations);
-	IMPORT(distort_inside);
-	IMPORT(distort_outside);
-
-	return Layer_Composite::set_param(param,value);
-}
-
-ValueBase
-Twirl::get_param(const String &param)const
-{
-	EXPORT(center);
-	EXPORT(radius);
-	EXPORT(rotations);
-	EXPORT(distort_inside);
-	EXPORT(distort_outside);
-
-	EXPORT_NAME();
-	EXPORT_VERSION();
-
-	return false;
-}
-
-Layer::Vocab
-Twirl::get_param_vocab()const
-{
-	Layer::Vocab ret;
-
-	ret.push_back(ParamDesc("center")
-		.set_local_name(_("Center"))
-	);
-
-	ret.push_back(ParamDesc("radius")
-		.set_local_name(_("Radius"))
-		.set_description(_("This is the radius of the circle"))
-		.set_is_distance()
-		.set_origin("center")
-	);
-
-	ret.push_back(ParamDesc("rotations")
-		.set_local_name(_("Rotations"))
-		.set_origin("center")
-	);
-
-	ret.push_back(ParamDesc("distort_inside")
-		.set_local_name(_("Distort Inside"))
-	);
-
-	ret.push_back(ParamDesc("distort_outside")
-		.set_local_name(_("Distort Outside"))
-	);
-
-	return ret;
-}
-
-synfig::Point
-Twirl::distort(const synfig::Point &pos,bool reverse)const
-{
-	Point centered(pos-center);
-	Real mag(centered.mag());
-
-	Angle a;
-
-	if((distort_inside || mag>radius) && (distort_outside || mag<radius))
-		a=rotations*((centered.mag()-radius)/radius);
-	else
-		return pos;
-
-	if(reverse)	a=-a;
-
-	const Real sin(Angle::sin(a).get());
-	const Real cos(Angle::cos(a).get());
-
-	Point twirled;
-	twirled[0]=cos*centered[0]-sin*centered[1];
-	twirled[1]=sin*centered[0]+cos*centered[1];
-
-	return twirled+center;
-}
-
-synfig::Layer::Handle
-Twirl::hit_check(synfig::Context context, const synfig::Point &pos)const
-{
-	return context.hit_check(distort(pos));
-}
-
-Color
-Twirl::get_color(Context context, const Point &pos)const
-{
-	return context.get_color(distort(pos));
-}
-
-class Twirl_Trans : public Transform
-{
-	etl::handle<const Twirl> layer;
-public:
-	Twirl_Trans(const Twirl* x):Transform(x->get_guid()),layer(x) { }
-
-	synfig::Vector perform(const synfig::Vector& x)const
-	{
-		return layer->distort(x,true);
-	}
-
-	synfig::Vector unperform(const synfig::Vector& x)const
-	{
-		return layer->distort(x,false);
-	}
-};
-etl::handle<Transform>
-Twirl::get_transform()const
-{
-	return new Twirl_Trans(this);
-}
-
-/*
-bool
-Twirl::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
-{
-	SuperCallback supercb(cb,0,9500,10000);
-
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-	{
-		surface->set_wh(renddesc.get_w(),renddesc.get_h());
-	}
-	else
-	{
-		if(!context.accelerated_render(surface,quality,renddesc,&supercb))
-			return false;
-		if(get_amount()==0)
-			return true;
-	}
-
-
-	int x,y;
-
-	Surface::pen pen(surface->begin());
-	const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
-	Point pos;
-	Point tl(renddesc.get_tl());
-	const int w(surface->get_w());
-	const int h(surface->get_h());
-
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-	{
-		for(y=0,pos[1]=tl[1];y<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)
-			for(x=0,pos[0]=tl[0];x<w;x++,pen.inc_x(),pos[0]+=pw)
-				pen.put_value(color_func(pos));
-	}
-	else
-	{
-		for(y=0,pos[1]=tl[1];y<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)
-			for(x=0,pos[0]=tl[0];x<w;x++,pen.inc_x(),pos[0]+=pw)
-				pen.put_value(Color::blend(color_func(pos),pen.get_value(),get_amount(),get_blend_method()));
-	}
-
-	// Mark our progress as finished
-	if(cb && !cb->amount_complete(10000,10000))
-		return false;
-
-	return true;
-}
-*/