gemma: pkg/octree/vertex.go annotate

annotate pkg/octree/vertex.go @ 940:be7b83638ec8

Simplified line merging in generating contour lines. Now its ~40% faster.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Tue, 09 Oct 2018 13:30:45 +0200
parents	ae1531e00344
children	6ab012d0f0c2

rev	line source
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	1 package octree
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	2
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	3 import (
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	4 "bytes"
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	5 "encoding/binary"
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	6 "io"
795 bd5f38eb6153 Vertical Triangle intersection: Fixed function to determine where intersection point Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 792 diff changeset	7 "log"
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	8 "math"
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	9 "sort"
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	10 )
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	11
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	12 type (
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	13 Vertex struct {
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	14 X float64
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	15 Y float64
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	16 Z float64
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	17 }
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	18
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	19 Triangle [3]Vertex
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	20
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	21 Line [2]Vertex
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	22
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	23 LineStringZ []Vertex
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	24 MultiLineStringZ []LineStringZ
774 c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	25
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	26 Box2D struct {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	27 X1 float64
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	28 Y1 float64
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	29 X2 float64
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	30 Y2 float64
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	31 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	32
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	33 Plane2D struct {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	34 A float64
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	35 B float64
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	36 C float64
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	37 }
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	38 )
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	39
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	40 const (
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	41 wkbNDR byte = 1
925 15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	42 wkbLineString uint32 = 2
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	43 wkbLineStringZ uint32 = 1000 + 2
925 15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	44 wkbMultiLineString uint32 = 5
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	45 wkbMultiLineStringZ uint32 = 1000 + 5
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	46 )
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	47
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	48 func (v *Vertex) Minimize(w Vertex) {
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	49 if w.X < v.X {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	50 v.X = w.X
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	51 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	52 if w.Y < v.Y {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	53 v.Y = w.Y
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	54 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	55 if w.Z < v.Z {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	56 v.Z = w.Z
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	57 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	58 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	59
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	60 func (v *Vertex) Maximize(w Vertex) {
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	61 if w.X > v.X {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	62 v.X = w.X
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	63 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	64 if w.Y > v.Y {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	65 v.Y = w.Y
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	66 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	67 if w.Z > v.Z {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	68 v.Z = w.Z
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	69 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	70 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	71
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	72 func (v Vertex) Sub(w Vertex) Vertex {
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	73 return Vertex{
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	74 v.X - w.X,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	75 v.Y - w.Y,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	76 v.Z - w.Z,
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	77 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	78 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	79
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	80 func (v Vertex) Add(w Vertex) Vertex {
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	81 return Vertex{
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	82 v.X + w.X,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	83 v.Y + w.Y,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	84 v.Z + w.Z,
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	85 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	86 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	87
730 4c05bdbf8e4b Renamed scale in Vertex to uppercase to make it public. Sascha L. Teichmann <teichmann@intevation.de> parents: 729 diff changeset	88 func (v Vertex) Scale(s float64) Vertex {
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	89 return Vertex{
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	90 s * v.X,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	91 s * v.Y,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	92 s * v.Z,
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	93 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	94 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	95
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	96 func Interpolate(v1, v2 Vertex) func(Vertex) Vertex {
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	97 v2 = v2.Sub(v1)
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	98 return func(s Vertex) Vertex {
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	99 return Vertex{
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	100 v2.X*s.X + v1.X,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	101 v2.Y*s.Y + v1.Y,
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	102 v2.Z*s.Z + v1.Z,
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	103 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	104 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	105 }
120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	106
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	107 func (a Vertex) Less(b Vertex) bool {
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	108 return a.X < b.X \|\| a.Y < b.Y \|\| a.Z < b.Z
674 120a82bd9953 octree: Added loading frame for contour generation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	109 }
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	110
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	111 func NewLine(p1, p2 Vertex) Line {
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	112 return Line{
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	113 p2.Sub(p1),
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	114 p1,
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	115 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	116 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	117
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	118 func (l Line) Eval(t float64) Vertex {
730 4c05bdbf8e4b Renamed scale in Vertex to uppercase to make it public. Sascha L. Teichmann <teichmann@intevation.de> parents: 729 diff changeset	119 return l[0].Scale(t).Add(l[1])
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	120 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	121
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	122 func (l Line) IntersectHorizontal(h float64) Vertex {
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	123 t := (h - l[1].Z) / l[0].Z
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	124 return l.Eval(t)
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	125 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	126
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	127 func side(z, h float64) int {
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	128 switch {
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	129 case z < h:
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	130 return -1
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	131 case z > h:
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	132 return +1
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	133 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	134 return 0
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	135 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	136
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	137 func (t *Triangle) IntersectHorizontal(h float64) LineStringZ {
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	138 sides := [3]int{
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	139 side(t[0].Z, h),
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	140 side(t[1].Z, h),
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	141 side(t[2].Z, h),
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	142 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	143
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	144 var points LineStringZ
689 614135d69823 octree: prepare storing the lines to file in contouring tool. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 687 diff changeset	145
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	146 for i := 0; i < 3; i++ {
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	147 j := (i + 1) % 3
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	148 si := sides[i]
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	149 sj := sides[j]
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	150
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	151 switch {
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	152 case si == 0 && sj == 0:
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	153 // both on plane
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	154 points = append(points, t[i], t[j])
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	155 case si == 0 && sj != 0:
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	156 // first on plane
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	157 points = append(points, t[i])
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	158 case si != 0 && sj == 0:
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	159 // second on plane
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	160 points = append(points, t[j])
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	161 case si == sj:
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	162 // both on same side
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	163 default:
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	164 // real intersection
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	165 v := NewLine(t[i], t[j]).IntersectHorizontal(h)
687 be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	166 points = append(points, v)
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	167 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	168 }
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	169
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	170 return points
be90ab542aa7 octree: contouring: Do the math to calculate the intersection points of the triangles and the planes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 674 diff changeset	171 }
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	172
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	173 func linearScale(x1, y1, x2, y2 float64) func(Vertex) float64 {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	174 dx := x2 - x1
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	175 dy := y2 - y1
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	176
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	177 switch {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	178 case dx != 0:
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	179 return func(v Vertex) float64 {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	180 return (v.X - x1) / dx
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	181 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	182 case dy != 0:
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	183 return func(v Vertex) float64 {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	184 return (v.Y - y1) / dy
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	185 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	186 default:
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	187 return func(Vertex) float64 {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	188 return 0
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	189 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	190 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	191 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	192
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	193 func (ls LineStringZ) order(position func(Vertex) float64) {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	194 type posVertex struct {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	195 pos float64
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	196 v Vertex
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	197 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	198 positions := make([]posVertex, len(ls))
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	199 for i, v := range ls {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	200 positions[i] = posVertex{position(v), v}
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	201 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	202 sort.Slice(positions, func(i, j int) bool {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	203 return positions[i].pos < positions[j].pos
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	204 })
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	205 for i := range positions {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	206 ls[i] = positions[i].v
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	207 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	208 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	209
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	210 func (v Vertex) EpsEquals(w Vertex) bool {
769 ba2007b746ef Fixed nasty typo. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 768 diff changeset	211 const eps = 1e-5
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	212 return math.Abs(v.X-w.X) < eps &&
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	213 math.Abs(v.Y-w.Y) < eps && math.Abs(v.Z-w.Z) < eps
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	214 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	215
763 d05bc3e34338 More infrastructure for the octree driven cross section endpoint. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 730 diff changeset	216 func (mls MultiLineStringZ) JoinOnLine(x1, y1, x2, y2 float64) MultiLineStringZ {
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	217
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	218 position := linearScale(x1, y1, x2, y2)
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	219
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	220 type posLineString struct {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	221 pos float64
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	222 line LineStringZ
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	223 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	224
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	225 positions := make([]posLineString, 0, len(mls))
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	226
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	227 for _, ls := range mls {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	228 if len(ls) == 0 {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	229 continue
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	230 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	231 // order the atoms first
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	232 ls.order(position)
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	233 positions = append(positions, posLineString{position(ls[0]), ls})
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	234 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	235
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	236 sort.Slice(positions, func(i, j int) bool {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	237 return positions[i].pos < positions[j].pos
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	238 })
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	239
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	240 out := make(MultiLineStringZ, 0, len(positions))
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	241
796 0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	242 var ignored int
0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	243
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	244 for i := range positions {
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	245 curr := positions[i].line
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	246 if l := len(out); l > 0 {
796 0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	247 last := out[l-1]
0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	248
0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	249 if last[len(last)-1].EpsEquals(curr[0]) {
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	250 out[l-1] = append(last[:len(last)-1], curr...)
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	251 continue
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	252 }
796 0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	253 if position(last[len(last)-1]) > position(curr[0]) {
0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	254 ignored++
0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	255 continue
0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	256 }
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	257 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	258 out = append(out, curr)
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	259 }
3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	260
796 0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	261 log.Printf("ignored parts: %d\n", ignored)
0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	262
768 3219e7e34953 Join neighbored linestring segments in octree cross sections and sort them along the input line. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 763 diff changeset	263 return out
763 d05bc3e34338 More infrastructure for the octree driven cross section endpoint. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 730 diff changeset	264 }
d05bc3e34338 More infrastructure for the octree driven cross section endpoint. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 730 diff changeset	265
729 b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	266 func (v *Vertex) Write(w io.Writer) error {
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	267 if err := binary.Write(
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	268 w, binary.LittleEndian, math.Float64bits(v.X)); err != nil {
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	269 return err
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	270 }
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	271 if err := binary.Write(
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	272 w, binary.LittleEndian, math.Float64bits(v.Y)); err != nil {
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	273 return err
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	274 }
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	275 return binary.Write(
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	276 w, binary.LittleEndian, math.Float64bits(v.Z))
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	277 }
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	278
b0bd242ff821 Removed vertex duplicate. Sascha L. Teichmann <teichmann@intevation.de> parents: 727 diff changeset	279 func (v *Vertex) Read(r io.Reader) error {
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	280 var buf [8]byte
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	281 b := buf[:]
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	282 if _, err := io.ReadFull(r, b); err != nil {
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	283 return nil
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	284 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	285 v.X = math.Float64frombits(binary.LittleEndian.Uint64(b))
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	286 if _, err := io.ReadFull(r, b); err != nil {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	287 return nil
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	288 }
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	289 v.Y = math.Float64frombits(binary.LittleEndian.Uint64(b))
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	290 if _, err := io.ReadFull(r, b); err != nil {
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	291 return nil
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	292 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	293 v.Z = math.Float64frombits(binary.LittleEndian.Uint64(b))
726 5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	294 return nil
5af9ab39e715 Renamed a few types to uppercase names to prepare the move to the octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 718 diff changeset	295 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	296
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	297 func (mls MultiLineStringZ) AsWKB() []byte {
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	298
924 c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	299 // pre-calculate size to avoid reallocations.
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	300 size := 1 + 4 + 4
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	301 for _, ml := range mls {
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	302 size += 1 + 4 + 4 + len(ml)38
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	303 }
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	304
924 c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	305 buf := bytes.NewBuffer(make([]byte, 0, size))
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	306
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	307 binary.Write(buf, binary.LittleEndian, wkbNDR)
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	308 binary.Write(buf, binary.LittleEndian, wkbMultiLineStringZ)
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	309 binary.Write(buf, binary.LittleEndian, uint32(len(mls)))
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	310
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	311 for _, ml := range mls {
924 c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	312 binary.Write(buf, binary.LittleEndian, wkbNDR)
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	313 binary.Write(buf, binary.LittleEndian, wkbLineStringZ)
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	314 binary.Write(buf, binary.LittleEndian, uint32(len(ml)))
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	315 for _, p := range ml {
924 c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	316 binary.Write(buf, binary.LittleEndian, math.Float64bits(p.X))
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	317 binary.Write(buf, binary.LittleEndian, math.Float64bits(p.Y))
c8146132059e Precalculate WKB size for MultiLineStringZ to avoid reallocations. Sascha L. Teichmann <teichmann@intevation.de> parents: 824 diff changeset	318 binary.Write(buf, binary.LittleEndian, math.Float64bits(p.Z))
727 41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	319 }
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	320 }
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	321
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	322 return buf.Bytes()
41c8dc61f38f Moved octree loading stuff to octree package. Sascha L. Teichmann <teichmann@intevation.de> parents: 726 diff changeset	323 }
774 c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	324
925 15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	325 func (mls MultiLineStringZ) AsWKB2D() []byte {
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	326
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	327 // pre-calculate size to avoid reallocations.
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	328 size := 1 + 4 + 4
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	329 for _, ml := range mls {
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	330 size += 1 + 4 + 4 + len(ml)28
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	331 }
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	332
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	333 buf := bytes.NewBuffer(make([]byte, 0, size))
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	334
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	335 binary.Write(buf, binary.LittleEndian, wkbNDR)
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	336 binary.Write(buf, binary.LittleEndian, wkbMultiLineString)
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	337 binary.Write(buf, binary.LittleEndian, uint32(len(mls)))
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	338
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	339 for _, ml := range mls {
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	340 binary.Write(buf, binary.LittleEndian, wkbNDR)
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	341 binary.Write(buf, binary.LittleEndian, wkbLineString)
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	342 binary.Write(buf, binary.LittleEndian, uint32(len(ml)))
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	343 for _, p := range ml {
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	344 binary.Write(buf, binary.LittleEndian, math.Float64bits(p.X))
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	345 binary.Write(buf, binary.LittleEndian, math.Float64bits(p.Y))
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	346 }
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	347 }
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	348
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	349 return buf.Bytes()
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	350 }
15bf101e1522 Send 2D X/Y vertices to the database directly instead of sending 3D data and dropping the Z value afterwards. Sascha L. Teichmann <teichmann@intevation.de> parents: 924 diff changeset	351
932 ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	352 // Join joins two lines leaving the first of the secoung out.
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	353 func (ls LineStringZ) Join(other LineStringZ) LineStringZ {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	354 nline := make(LineStringZ, len(ls)+len(other)-1)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	355 copy(nline, ls)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	356 copy(nline[len(ls):], other[1:])
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	357 return nline
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	358 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	359
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	360 func (mls MultiLineStringZ) Merge() MultiLineStringZ {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	361
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	362 var out MultiLineStringZ
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	363
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	364 min := Vertex{math.MaxFloat64, math.MaxFloat64, math.MaxFloat64}
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	365
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	366 for _, line := range mls {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	367 for _, v := range line {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	368 min.Minimize(v)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	369 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	370 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	371
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	372 type point struct {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	373 x int64
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	374 y int64
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	375 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	376
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	377 const precision = 1e7
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	378
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	379 quant := func(v Vertex) point {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	380 return point{
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	381 x: int64(math.Round((v.X - min.X) * precision)),
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	382 y: int64(math.Round((v.Y - min.Y) * precision)),
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	383 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	384 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	385
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	386 heads := make(map[point]*[]LineStringZ)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	387
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	388 for _, line := range mls {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	389 if len(line) < 2 {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	390 out = append(out, line)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	391 continue
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	392 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	393 head := quant(line[0])
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	394 tail := quant(line[len(line)-1])
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	395 if head == tail { // its already a ring
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	396 out = append(out, line)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	397 continue
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	398 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	399
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	400 if hs := heads[tail]; hs != nil {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	401 l := len(*hs)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	402 last := (*hs)[l-1]
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	403 if l == 1 {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	404 delete(heads, tail)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	405 } else {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	406 (*hs)[l-1] = nil
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	407 hs = (hs)[:l-1]
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	408 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	409 line = line.Join(last)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	410
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	411 if head == quant(line[len(line)-1]) { // its a ring
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	412 out = append(out, line)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	413 continue
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	414 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	415 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	416
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	417 if hs := heads[head]; hs != nil {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	418 hs = append(hs, line)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	419 } else {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	420 heads[head] = &[]LineStringZ{line}
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	421 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	422 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	423
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	424 again:
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	425 for head, lines := range heads {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	426 for i, line := range *lines {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	427 tail := quant(line[len(line)-1])
940 be7b83638ec8 Simplified line merging in generating contour lines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 932 diff changeset	428 for hs := heads[tail]; hs != nil && len(*hs) > 0; hs = heads[tail] {
932 ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	429 l := len(*hs)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	430 last := (*hs)[l-1]
940 be7b83638ec8 Simplified line merging in generating contour lines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 932 diff changeset	431 (*hs)[l-1] = nil
be7b83638ec8 Simplified line merging in generating contour lines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 932 diff changeset	432 hs = (hs)[:l-1]
932 ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	433 line = line.Join(last)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	434
940 be7b83638ec8 Simplified line merging in generating contour lines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 932 diff changeset	435 if tail = quant(line[len(line)-1]); head == tail { // its a ring
932 ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	436 out = append(out, line)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	437 // remove from current lines
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	438 copy((lines)[i:], (lines)[i+1:])
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	439 (lines)[len(lines)-1] = nil
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	440 lines = (lines)[:len(*lines)-1]
940 be7b83638ec8 Simplified line merging in generating contour lines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 932 diff changeset	441 goto again
932 ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	442 }
940 be7b83638ec8 Simplified line merging in generating contour lines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 932 diff changeset	443 // overwrite in current lines
be7b83638ec8 Simplified line merging in generating contour lines. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 932 diff changeset	444 (*lines)[i] = line
932 ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	445 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	446 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	447 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	448
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	449 rings := len(out)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	450
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	451 // The rest are open line strings.
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	452 for _, lines := range heads {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	453 for _, line := range *lines {
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	454 out = append(out, line)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	455 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	456 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	457
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	458 log.Printf("segments before/after merge: %d/%d (%d rings)\n",
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	459 len(mls), len(out), rings)
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	460
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	461 return out
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	462 }
ae1531e00344 Merged line merging from geo-style branch into default (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 925 diff changeset	463
774 c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	464 func (a Box2D) Intersects(b Box2D) bool {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	465 return !(a.X2 < a.X1 \|\| a.X2 < b.X1 \|\|
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	466 a.Y2 < a.Y1 \|\| a.Y2 < b.Y1)
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	467 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	468
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	469 func (a Box2D) Mid() (float64, float64) {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	470 return (a.X2-a.X1)0.5 + a.X1, (a.Y2-a.Y1)0.5 + a.Y1
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	471 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	472
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	473 func (a Box2D) Xi(i int) float64 {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	474 if i == 0 {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	475 return a.X1
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	476 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	477 return a.X2
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	478 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	479
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	480 func (a Box2D) Yi(i int) float64 {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	481 if i == 0 {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	482 return a.Y1
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	483 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	484 return a.Y2
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	485 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	486
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	487 func NewPlane2D(x1, y1, x2, y2 float64) Plane2D {
778 9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	488 b := x2 - x1
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	489 a := -(y2 - y1)
774 c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	490
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	491 l := math.Sqrt(aa + bb)
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	492 a /= l
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	493 b /= l
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	494
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	495 // ax1 + by1 + c = 0
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	496 c := -(ax1 + by1)
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	497 return Plane2D{a, b, c}
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	498 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	499
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	500 func (p Plane2D) Eval(x, y float64) float64 {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	501 return p.Ax + p.By + p.C
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	502 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	503
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	504 const epsPlane = 1e-5
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	505
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	506 func sides(s int, x float64) int {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	507 if math.Signbit(x) {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	508 return s \| 2
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	509 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	510 return s \| 1
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	511 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	512
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	513 func (a Box2D) IntersectsPlane(p Plane2D) bool {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	514 var s int
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	515 for i := 0; i < 2; i++ {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	516 x := a.Xi(i)
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	517 for j := 0; j < 2; j++ {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	518 y := a.Yi(j)
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	519 v := p.Eval(x, y)
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	520 if math.Abs(v) < epsPlane {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	521 //log.Printf("on line")
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	522 return true
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	523 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	524 if s = sides(s, v); s == 3 {
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	525 //log.Printf("... on both sides (djt)")
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	526 return true
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	527 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	528 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	529 }
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	530 //log.Printf("side: %d\n", s)
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	531 return false
c55771b7c502 Moved Box2D and Plane2D into vertex.go and made to API public. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 769 diff changeset	532 }
778 9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	533
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	534 func (a Vertex) Cross(b Vertex) Vertex {
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	535 return Vertex{
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	536 a.Yb.Z - a.Zb.Y,
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	537 a.Zb.X - a.Xb.Z,
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	538 a.Xb.Y - a.Yb.X,
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	539 }
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	540 }
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	541
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	542 func (p1 Plane2D) Intersection(p2 Plane2D) (float64, float64, bool) {
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	543
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	544 u1 := Vertex{p1.A, p1.B, p1.C}
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	545 u2 := Vertex{p2.A, p2.B, p2.C}
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	546
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	547 p := u1.Cross(u2)
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	548
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	549 if p.Z == 0 {
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	550 return 0, 0, false
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	551 }
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	552
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	553 return p.X / p.Z, p.Y / p.Z, true
9be20bd0f131 Fixed a bug with 2d planes (lines) found while working on line intersections. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 774 diff changeset	554 }
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	555
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	556 type VerticalLine struct {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	557 x1 float64
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	558 y1 float64
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	559 x2 float64
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	560 y2 float64
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	561
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	562 line Plane2D
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	563 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	564
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	565 func NewVerticalLine(x1, y1, x2, y2 float64) *VerticalLine {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	566 return &VerticalLine{
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	567 x1: x1,
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	568 y1: y1,
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	569 x2: x2,
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	570 y2: y2,
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	571 line: NewPlane2D(x1, y1, x2, y2),
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	572 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	573 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	574
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	575 func onPlane(x float64) bool { return math.Abs(x) < epsPlane }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	576
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	577 func relative(v1, v2 Vertex) func(x, y float64) float64 {
795 bd5f38eb6153 Vertical Triangle intersection: Fixed function to determine where intersection point Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 792 diff changeset	578 ls := linearScale(v1.X, v1.Y, v2.X, v2.Y)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	579 return func(x, y float64) float64 {
795 bd5f38eb6153 Vertical Triangle intersection: Fixed function to determine where intersection point Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 792 diff changeset	580 return ls(Vertex{x, y, 0})
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	581 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	582 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	583
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	584 func interpolate(a, b float64) func(float64) float64 {
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	585 return func(x float64) float64 {
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	586 return (b-a)*x + a
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	587 }
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	588 }
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	589
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	590 func linear(v1, v2 Vertex) func(t float64) Vertex {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	591 return func(t float64) Vertex {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	592 return Vertex{
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	593 (v2.X-v1.X)*t + v1.X,
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	594 (v2.Y-v1.Y)*t + v1.Y,
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	595 (v2.Z-v1.Z)*t + v1.Z,
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	596 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	597 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	598 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	599
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	600 func inRange(a float64) bool { return 0 <= a && a <= 1 }
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	601
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	602 func (vl VerticalLine) Intersection(t Triangle) LineStringZ {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	603
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	604 var out LineStringZ
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	605
815 01019d4c8359 Cross section: Made triangle intersection less spammy. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 813 diff changeset	606 //defer func() { log.Printf("length out: %d\n", len(out)) }()
796 0cc97135717c More fixes to vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 795 diff changeset	607
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	608 edges:
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	609 for i := 0; i < 3 && len(out) < 2; i++ {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	610 j := (i + 1) % 3
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	611 edge := NewPlane2D(t[i].X, t[i].Y, t[j].X, t[j].Y)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	612
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	613 s1 := edge.Eval(vl.x1, vl.y1)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	614 s2 := edge.Eval(vl.x2, vl.y2)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	615
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	616 o1 := onPlane(s1)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	617 o2 := onPlane(s2)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	618
815 01019d4c8359 Cross section: Made triangle intersection less spammy. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 813 diff changeset	619 // log.Printf("s1, s2: %t %t (%f %f)\n", o1, o2, s1, s2)
795 bd5f38eb6153 Vertical Triangle intersection: Fixed function to determine where intersection point Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 792 diff changeset	620
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	621 switch {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	622 case o1 && o2:
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	623 pos := relative(t[i], t[j])
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	624 t1 := pos(vl.x1, vl.y1)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	625 t2 := pos(vl.x2, vl.y2)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	626
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	627 r1 := inRange(t1)
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	628 r2 := inRange(t2)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	629
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	630 switch {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	631 case r1 && r2:
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	632 lin := linear(t[i], t[j])
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	633 out = append(out, lin(t1), lin(t2))
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	634 return out
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	635
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	636 case !r1 && !r2: // the hole edge
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	637 out = append(out, t[i], t[j])
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	638 return out
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	639 case !r1:
789 d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	640 if t1 < 0 {
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	641 // below first -> clip by first
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	642 lin := linear(t[i], t[j])
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	643 out = append(out, t[i], lin(t2))
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	644 } else {
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	645 // above second -> clip by second
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	646 lin := linear(t[i], t[j])
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	647 out = append(out, lin(t2), t[j])
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	648 }
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	649 return out
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	650 case !r2:
789 d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	651 if t2 < 0 {
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	652 // below first -> clip by first
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	653 lin := linear(t[i], t[j])
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	654 out = append(out, t[i], lin(t1))
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	655 } else {
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	656 // above second -> clip by second
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	657 lin := linear(t[i], t[j])
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	658 out = append(out, lin(t1), t[j])
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	659 }
d43e61044ad8 Fill in last remaining corner cases in vertical triangle interpolation. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 788 diff changeset	660 return out
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	661 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	662
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	663 case o1:
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	664 t1 := relative(t[i], t[j])(vl.x1, vl.y1)
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	665 if !inRange(t1) {
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	666 continue edges
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	667 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	668 out = append(out, linear(t[i], t[j])(t1))
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	669
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	670 case o2:
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	671 t2 := relative(t[i], t[j])(vl.x2, vl.y2)
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	672 if !inRange(t2) {
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	673 continue edges
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	674 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	675 out = append(out, linear(t[i], t[j])(t2))
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	676
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	677 default:
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	678 x, y, intersects := vl.line.Intersection(edge)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	679 if !intersects {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	680 continue edges
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	681 }
795 bd5f38eb6153 Vertical Triangle intersection: Fixed function to determine where intersection point Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 792 diff changeset	682
815 01019d4c8359 Cross section: Made triangle intersection less spammy. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 813 diff changeset	683 // log.Println("Intersection -----------------------------")
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	684 t1 := relative(t[i], t[j])(x, y)
815 01019d4c8359 Cross section: Made triangle intersection less spammy. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 813 diff changeset	685 // log.Printf("relative pos: %f\n", t1)
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	686 if !inRange(t1) {
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	687 continue edges
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	688 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	689
815 01019d4c8359 Cross section: Made triangle intersection less spammy. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 813 diff changeset	690 // log.Println("valid ***************")
795 bd5f38eb6153 Vertical Triangle intersection: Fixed function to determine where intersection point Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 792 diff changeset	691
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	692 z := interpolate(t[j].Z, t[i].Z)(t1)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	693 n := Vertex{x, y, z}
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	694
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	695 if math.Signbit(s1) != math.Signbit(s2) {
815 01019d4c8359 Cross section: Made triangle intersection less spammy. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 813 diff changeset	696 // log.Println("\ton different sides")
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	697 // different sides -> vertex on edge.
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	698 out = append(out, n)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	699 } else { // same side -> inside. Find peer
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	700 if len(out) > 0 { // we already have our peer
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	701 out = append(out, n)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	702 return out
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	703 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	704
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	705 for k := 0; k < 3; k++ {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	706 if k == i {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	707 continue
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	708 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	709 l := (k + 1) % 3
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	710 other := NewPlane2D(t[k].X, t[k].Y, t[l].X, t[l].Y)
813 1a808929c2c5 Cross sections: Fixed problem that certain inputs don't deliver data. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 796 diff changeset	711 xo, yo, intersects := vl.line.Intersection(other)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	712 if !intersects {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	713 continue
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	714 }
813 1a808929c2c5 Cross sections: Fixed problem that certain inputs don't deliver data. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 796 diff changeset	715 t2 := relative(t[k], t[l])(xo, yo)
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	716 if !inRange(t2) {
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	717 continue
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	718 }
813 1a808929c2c5 Cross sections: Fixed problem that certain inputs don't deliver data. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 796 diff changeset	719 zo := interpolate(t[k].Z, t[l].Z)(t2)
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	720
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	721 m := Vertex{xo, yo, zo}
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	722
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	723 var xn, yn, xf, yf float64
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	724
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	725 // Which is nearer to current edge?
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	726 if math.Abs(s1) < math.Abs(s2) {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	727 xn, yn = vl.x1, vl.y1
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	728 xf, yf = vl.x2, vl.y2
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	729 } else {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	730 xn, yn = vl.x2, vl.y2
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	731 xf, yf = vl.x1, vl.y1
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	732 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	733
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	734 if onPlane(other.Eval(xn, yn)) {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	735 // triangle intersect in only point
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	736 // treat as no intersection
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	737 break edges
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	738 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	739
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	740 pos := relative(n, m)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	741
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	742 tzn := pos(xn, yn)
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	743 tzf := pos(xf, yf)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	744
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	745 if !inRange(tzn) {
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	746 // if near is out of range far is, too.
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	747 return out
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	748 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	749
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	750 lin := interpolate(n.Z, m.Z)
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	751
9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	752 if inRange(tzf) {
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	753 m.X = xf
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	754 m.Y = yf
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	755 m.Z = lin(tzf)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	756 } // else m is clipping
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	757
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	758 n.X = xn
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	759 n.Y = yn
788 9f3a4a60dc04 Cleaned up interpolation mess in vertical triangle intersection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 787 diff changeset	760 n.Z = lin(tzn)
787 3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	761
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	762 out = append(out, n, m)
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	763 return out
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	764 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	765 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	766 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	767 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	768
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	769 // supress single point touches.
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	770 if len(out) == 1 {
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	771 out = out[:0]
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	772 }
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	773
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	774 return out
3d927e06b92c Triangle intersection. WIP. Currently interpolation is messed up. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 778 diff changeset	775 }

Mercurial > gemma

annotate pkg/octree/vertex.go @ 940:be7b83638ec8