From 808d9ddb065765ffdcbcc2f565d525d377028515 Mon Sep 17 00:00:00 2001 From: Laurent Le Goff Date: Fri, 20 May 2011 18:05:10 +0200 Subject: [PATCH] modify test --- draw2d/curve/cubic_float64.go | 9 +-------- draw2d/curve/curve_test.go | 2 +- draw2d/curve/quad_float64.go | 9 +-------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/draw2d/curve/cubic_float64.go b/draw2d/curve/cubic_float64.go index b972c74..70f1f8b 100644 --- a/draw2d/curve/cubic_float64.go +++ b/draw2d/curve/cubic_float64.go @@ -47,9 +47,6 @@ func (curve *CubicCurveFloat64) Segment(t LineTracer, flattening_threshold float var c *CubicCurveFloat64 var dx, dy, d2, d3 float64 - var lx, ly float64 - distance_threshold := flattening_threshold * 5 - lx, ly = curve.X1, curve.Y1 for i >= 0 { c = &curves[i] @@ -60,11 +57,7 @@ func (curve *CubicCurveFloat64) Segment(t LineTracer, flattening_threshold float d3 = math.Fabs(((c.X3-c.X4)*dy - (c.Y3-c.Y4)*dx)) if (d2+d3)*(d2+d3) < flattening_threshold*(dx*dx+dy*dy) || i == len(curves)-1 { - if !(math.Fabs(lx - c.X4) < distance_threshold && math.Fabs(ly - c.Y4)< distance_threshold ) { - t.LineTo(c.X4, c.Y4) - lx, ly = c.X4, c.Y4 - } - + t.LineTo(c.X4, c.Y4) i-- } else { // second half of bezier go lower onto the stack diff --git a/draw2d/curve/curve_test.go b/draw2d/curve/curve_test.go index 9439a8e..94e3227 100644 --- a/draw2d/curve/curve_test.go +++ b/draw2d/curve/curve_test.go @@ -14,7 +14,7 @@ import ( var ( - flattening_threshold float64 = 0.25 + flattening_threshold float64 = 0.5 testsCubicFloat64 = []CubicCurveFloat64{ CubicCurveFloat64{100, 100, 200, 100, 100, 200, 200, 200}, CubicCurveFloat64{100, 100, 300, 200, 200, 200, 300, 100}, diff --git a/draw2d/curve/quad_float64.go b/draw2d/curve/quad_float64.go index 29f651e..09786cd 100644 --- a/draw2d/curve/quad_float64.go +++ b/draw2d/curve/quad_float64.go @@ -34,9 +34,6 @@ func (curve *QuadCurveFloat64) Segment(t LineTracer, flattening_threshold float6 // current curve var c *QuadCurveFloat64 var dx, dy, d float64 - var lx, ly float64 - distance_threshold := flattening_threshold * 5 - lx, ly = curve.X1, curve.Y1 for i >= 0 { c = &curves[i] @@ -46,11 +43,7 @@ func (curve *QuadCurveFloat64) Segment(t LineTracer, flattening_threshold float6 d = math.Fabs(((c.X2-c.X3)*dy - (c.Y2-c.Y3)*dx)) if (d*d) < flattening_threshold*(dx*dx+dy*dy) || i == len(curves)-1 { - if !(math.Fabs(lx - c.X3) <= distance_threshold && math.Fabs(ly - c.Y3)<= distance_threshold ) { - t.LineTo(c.X3, c.Y3) - lx, ly = c.X3, c.Y3 - } - + t.LineTo(c.X3, c.Y3) i-- } else { // second half of bezier go lower onto the stack