projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid a warning from g++ 4.3.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
lyr_std
/
zoom.cpp
diff --git
a/synfig-core/trunk/src/modules/lyr_std/zoom.cpp
b/synfig-core/trunk/src/modules/lyr_std/zoom.cpp
index
6e1795b
..
ff73c4c
100644
(file)
--- a/
synfig-core/trunk/src/modules/lyr_std/zoom.cpp
+++ b/
synfig-core/trunk/src/modules/lyr_std/zoom.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/*! \file zoom.cpp
/* === S Y N F I G ========================================================= */
/*! \file zoom.cpp
-** \brief
writeme
+** \brief
Implementation of the "Zoom" layer
**
**
-** $Id
: zoom.cpp,v 1.2 2005/01/24 03:08:17 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-48,10
+48,10
@@
SYNFIG_LAYER_INIT(Zoom);
SYNFIG_LAYER_SET_NAME(Zoom,"zoom");
SYNFIG_LAYER_INIT(Zoom);
SYNFIG_LAYER_SET_NAME(Zoom,"zoom");
-SYNFIG_LAYER_SET_LOCAL_NAME(Zoom,_("Zoom"));
-SYNFIG_LAYER_SET_CATEGORY(Zoom,_("Transform"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Zoom,
N
_("Zoom"));
+SYNFIG_LAYER_SET_CATEGORY(Zoom,
N
_("Transform"));
SYNFIG_LAYER_SET_VERSION(Zoom,"0.1");
SYNFIG_LAYER_SET_VERSION(Zoom,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Zoom,"$Id
: zoom.cpp,v 1.2 2005/01/24 03:08:17 darco Exp
$");
+SYNFIG_LAYER_SET_CVS_ID(Zoom,"$Id$");
/* === P R O C E D U R E S ================================================= */
/* === P R O C E D U R E S ================================================= */
@@
-64,14
+64,14
@@
Zoom::Zoom():
amount(0)
{
}
amount(0)
{
}
-
+
bool
Zoom::set_param(const String & param, const ValueBase &value)
{
IMPORT(center);
IMPORT(amount);
bool
Zoom::set_param(const String & param, const ValueBase &value)
{
IMPORT(center);
IMPORT(amount);
-
+
return false;
}
return false;
}
@@
-83,15
+83,15
@@
Zoom::get_param(const String ¶m)const
EXPORT_NAME();
EXPORT_VERSION();
EXPORT_NAME();
EXPORT_VERSION();
-
- return ValueBase();
+
+ return ValueBase();
}
Layer::Vocab
Zoom::get_param_vocab()const
{
Layer::Vocab ret;
}
Layer::Vocab
Zoom::get_param_vocab()const
{
Layer::Vocab ret;
-
+
ret.push_back(ParamDesc("amount")
.set_local_name(_("Amount"))
.set_description(_("Amount to zoom in"))
ret.push_back(ParamDesc("amount")
.set_local_name(_("Amount"))
.set_description(_("Amount to zoom in"))
@@
-101,7
+101,7
@@
Zoom::get_param_vocab()const
.set_local_name(_("Center"))
.set_description(_("Point to zoom in to"))
);
.set_local_name(_("Center"))
.set_description(_("Point to zoom in to"))
);
-
+
return ret;
}
return ret;
}
@@
-122,12
+122,12
@@
class Zoom_Trans : public Transform
etl::handle<const Zoom> layer;
public:
Zoom_Trans(const Zoom* x):Transform(x->get_guid()),layer(x) { }
etl::handle<const Zoom> layer;
public:
Zoom_Trans(const Zoom* x):Transform(x->get_guid()),layer(x) { }
-
+
synfig::Vector perform(const synfig::Vector& x)const
{
return (x-layer->center)*exp(layer->amount)+layer->center;
}
synfig::Vector perform(const synfig::Vector& x)const
{
return (x-layer->center)*exp(layer->amount)+layer->center;
}
-
+
synfig::Vector unperform(const synfig::Vector& x)const
{
return (x-layer->center)/exp(layer->amount)+layer->center;
synfig::Vector unperform(const synfig::Vector& x)const
{
return (x-layer->center)/exp(layer->amount)+layer->center;
@@
-158,6
+158,5
@@
Zoom::accelerated_render(Context context,Surface *surface,int quality, const Ren
synfig::Rect
Zoom::get_full_bounding_rect(synfig::Context context)const
{
synfig::Rect
Zoom::get_full_bounding_rect(synfig::Context context)const
{
- return
context.get_full_bounding_rect()
;
+ return
(context.get_full_bounding_rect()-center)*exp(amount)+center
;
}
}
-