projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Type: 'circut' -> 'circuit'.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_linear.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_linear.cpp
b/synfig-core/trunk/src/synfig/valuenode_linear.cpp
index
df82057
..
b017c9a
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_linear.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_linear.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-33,6
+34,7
@@
#include "valuenode_const.h"
#include "general.h"
#include "color.h"
#include "valuenode_const.h"
#include "general.h"
#include "color.h"
+#include <ETL/misc>
#endif
#endif
@@
-86,6
+88,12
@@
ValueNode_Linear::ValueNode_Linear(const ValueBase &value):
DCAST_HACK_ENABLE();
}
DCAST_HACK_ENABLE();
}
+LinkableValueNode*
+ValueNode_Linear::create_new()const
+{
+ return new ValueNode_Linear(get_type());
+}
+
ValueNode_Linear*
ValueNode_Linear::create(const ValueBase &x)
{
ValueNode_Linear*
ValueNode_Linear::create(const ValueBase &x)
{
@@
-107,7
+115,7
@@
ValueNode_Linear::operator()(Time t)const
case ValueBase::TYPE_COLOR:
return (*m_)(t).get( Color())*t+(*b_)(t).get( Color());
case ValueBase::TYPE_INTEGER:
case ValueBase::TYPE_COLOR:
return (*m_)(t).get( Color())*t+(*b_)(t).get( Color());
case ValueBase::TYPE_INTEGER:
- return
static_cast<int>((*m_)(t).get(int())*t+(*b_)(t).get(int()) + 0.5f
);
+ return
round_to_int((*m_)(t).get(int())*t+(*b_)(t).get(int())
);
case ValueBase::TYPE_REAL:
return (*m_)(t).get( Real())*t+(*b_)(t).get( Real());
case ValueBase::TYPE_TIME:
case ValueBase::TYPE_REAL:
return (*m_)(t).get( Real())*t+(*b_)(t).get( Real());
case ValueBase::TYPE_TIME:
@@
-219,9
+227,3
@@
ValueNode_Linear::get_link_index_from_name(const String &name)const
throw Exception::BadLinkName(name);
}
throw Exception::BadLinkName(name);
}
-
-LinkableValueNode*
-ValueNode_Linear::create_new()const
-{
- return new ValueNode_Linear(get_type());
-}