projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve the derivative class for hermites. Compare http://synfig.org/images/a/a8...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_blinecalctangent.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
b/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
index
671ce59
..
0d27157
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
@@
-127,21
+127,12
@@
ValueNode_BLineCalcTangent::operator()(Time t)const
blinepoint0.get_tangent2(), blinepoint1.get_tangent1());
etl::derivative< etl::hermite<Vector> > deriv(curve);
blinepoint0.get_tangent2(), blinepoint1.get_tangent1());
etl::derivative< etl::hermite<Vector> > deriv(curve);
-#ifdef ETL_FIXED_DERIVATIVE
switch (get_type())
{
switch (get_type())
{
- case ValueBase::TYPE_ANGLE: return
(deriv(amount-from_vertex)*(0.5)
).angle();
- case ValueBase::TYPE_VECTOR: return deriv(amount-from_vertex)
*(0.5)
;
+ case ValueBase::TYPE_ANGLE: return
deriv(amount-from_vertex
).angle();
+ case ValueBase::TYPE_VECTOR: return deriv(amount-from_vertex);
default: assert(0); return ValueBase();
}
default: assert(0); return ValueBase();
}
-#else
- switch (get_type())
- {
- case ValueBase::TYPE_ANGLE: return (deriv(amount-from_vertex)*(-0.5)).angle();
- case ValueBase::TYPE_VECTOR: return deriv(amount-from_vertex)*(-0.5);
- default: assert(0); return ValueBase();
- }
-#endif
}
String
}
String