projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commented the "Adjust for time" code in valuenode_animated.cpp while trying to unders...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_shape.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer_shape.cpp
b/synfig-core/trunk/src/synfig/layer_shape.cpp
index
3a9c52d
..
27ba691
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_shape.cpp
+++ b/
synfig-core/trunk/src/synfig/layer_shape.cpp
@@
-233,7
+233,7
@@
struct MonoSegment
int intersect(Real x,Real y) const
{
int intersect(Real x,Real y) const
{
- if((y < aabb.miny) || (y > aabb.maxy) || (x < aabb.minx)) return 0;
+ if((y < aabb.miny
+EPSILON
) || (y > aabb.maxy) || (x < aabb.minx)) return 0;
if(x > aabb.maxx) return ydir;
//int i = 0;
if(x > aabb.maxx) return ydir;
//int i = 0;
@@
-1327,7
+1327,7
@@
void Layer_Shape::PolySpan::line_to(Real x, Real y)
//generate data for the ending clipped info
if(y > window.maxy)
{
//generate data for the ending clipped info
if(y > window.maxy)
{
- //intial line to intersection (and degenerate)
+ //in
i
tial line to intersection (and degenerate)
n[2] = x + (window.maxy - y) * dx / dy;
//intersect coords
n[2] = x + (window.maxy - y) * dx / dy;
//intersect coords
@@
-1351,7
+1351,7
@@
void Layer_Shape::PolySpan::line_to(Real x, Real y)
//generate data for the ending clipped info
if(y < window.miny)
{
//generate data for the ending clipped info
if(y < window.miny)
{
- //intial line to intersection (and degenerate)
+ //in
i
tial line to intersection (and degenerate)
n[2] = x + (window.miny - y) * dx / dy;
//intersect coords
n[2] = x + (window.miny - y) * dx / dy;
//intersect coords
@@
-1401,7
+1401,7
@@
void Layer_Shape::PolySpan::line_to(Real x, Real y)
//generate data for the ending clipped info
if(x > window.maxx)
{
//generate data for the ending clipped info
if(x > window.maxx)
{
- //intial line to intersection (and degenerate)
+ //in
i
tial line to intersection (and degenerate)
n[2] = y + (window.maxx - x) * dy / dx;
n[0] = window.maxx;
n[2] = y + (window.maxx - x) * dy / dx;
n[0] = window.maxx;
@@
-1430,7
+1430,7
@@
void Layer_Shape::PolySpan::line_to(Real x, Real y)
//generate data for the ending clipped info
if(x < window.minx)
{
//generate data for the ending clipped info
if(x < window.minx)
{
- //intial line to intersection (and degenerate)
+ //in
i
tial line to intersection (and degenerate)
n[2] = y + (window.minx - x) * dy / dx;
n[0] = window.minx;
n[2] = y + (window.minx - x) * dy / dx;
n[0] = window.minx;