diff --git a/draw2d/Makefile b/draw2d/Makefile index d4873bd..063d4c6 100644 --- a/draw2d/Makefile +++ b/draw2d/Makefile @@ -16,5 +16,6 @@ GOFILES=\ path_storage.go\ stroker.go\ advanced_path.go\ + vertex2d.go\ include $(GOROOT)/src/Make.pkg diff --git a/draw2d/curves.go b/draw2d/curves.go index b562a31..885d7fa 100644 --- a/draw2d/curves.go +++ b/draw2d/curves.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 21/11/2010 by Laurent Le Goff - package draw2d import ( diff --git a/draw2d/dasher.go b/draw2d/dasher.go index 5210299..102635c 100644 --- a/draw2d/dasher.go +++ b/draw2d/dasher.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 13/12/2010 by Laurent Le Goff - package draw2d type DashVertexConverter struct { diff --git a/draw2d/demux_converter.go b/draw2d/demux_converter.go index b5c871d..fd9ea4c 100644 --- a/draw2d/demux_converter.go +++ b/draw2d/demux_converter.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 13/12/2010 by Laurent Le Goff - package draw2d type DemuxConverter struct { diff --git a/draw2d/draw2d.go b/draw2d/draw2d.go index de35300..dae675d 100644 --- a/draw2d/draw2d.go +++ b/draw2d/draw2d.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 21/11/2010 by Laurent Le Goff - package draw2d import ( diff --git a/draw2d/font.go b/draw2d/font.go index 57025bb..f0322aa 100644 --- a/draw2d/font.go +++ b/draw2d/font.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 13/12/2010 by Laurent Le Goff - package draw2d diff --git a/draw2d/math.go b/draw2d/math.go index 2fdbe36..703d9ed 100644 --- a/draw2d/math.go +++ b/draw2d/math.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 21/11/2010 by Laurent Le Goff - package draw2d import ( diff --git a/draw2d/path.go b/draw2d/path.go index 8d6f7d3..558b433 100644 --- a/draw2d/path.go +++ b/draw2d/path.go @@ -1,9 +1,9 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 21/11/2010 by Laurent Le Goff - package draw2d type Path interface { + LastPoint() (x, y float64) MoveTo(x, y float64) RMoveTo(dx, dy float64) LineTo(x, y float64) @@ -16,19 +16,3 @@ type Path interface { RArcTo(dcx, dcy, rx, ry, startAngle, angle float64) Close() } - - -type VertexCommand byte - -const ( - VertexNoCommand VertexCommand = iota - VertexStartCommand - VertexJoinCommand - VertexCloseCommand - VertexStopCommand -) - -type VertexConverter interface { - NextCommand(cmd VertexCommand) - Vertex(x, y float64) -} diff --git a/draw2d/path_adder.go b/draw2d/path_adder.go index 19adb5e..3f9fed6 100644 --- a/draw2d/path_adder.go +++ b/draw2d/path_adder.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 13/12/2010 by Laurent Le Goff - package draw2d diff --git a/draw2d/stroker.go b/draw2d/stroker.go index e017535..983dde3 100644 --- a/draw2d/stroker.go +++ b/draw2d/stroker.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 13/12/2010 by Laurent Le Goff - package draw2d type Cap int diff --git a/draw2d/transform.go b/draw2d/transform.go index 0605c3d..ff22ca2 100644 --- a/draw2d/transform.go +++ b/draw2d/transform.go @@ -1,6 +1,5 @@ // Copyright 2010 The draw2d Authors. All rights reserved. // created: 21/11/2010 by Laurent Le Goff - package draw2d import ( diff --git a/draw2d/vertex2d.go b/draw2d/vertex2d.go new file mode 100644 index 0000000..3822fcc --- /dev/null +++ b/draw2d/vertex2d.go @@ -0,0 +1,18 @@ +// Copyright 2010 The draw2d Authors. All rights reserved. +// created: 21/11/2010 by Laurent Le Goff +package draw2d + +type VertexCommand byte + +const ( + VertexNoCommand VertexCommand = iota + VertexStartCommand + VertexJoinCommand + VertexCloseCommand + VertexStopCommand +) + +type VertexConverter interface { + NextCommand(cmd VertexCommand) + Vertex(x, y float64) +} \ No newline at end of file