gemma: pkg/mesh/meshserialize

annotate pkg/mesh/meshserialize_v2.go @ 5705:39d91e76c05c sr-v2

Simplify code.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Tue, 20 Feb 2024 09:51:20 +0100
parents	a68e8eae7273
children	148abae1fcd0

rev	line source
5680 a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	1 // This is Free Software under GNU Affero General Public License v >= 3.0
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	2 // without warranty, see README.md and license for details.
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	3 //
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	4 // SPDX-License-Identifier: AGPL-3.0-or-later
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	5 // License-Filename: LICENSES/AGPL-3.0.txt
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	6 //
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	7 // Copyright (C) 2024 by via donau
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	8 // – Österreichische Wasserstraßen-Gesellschaft mbH
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	9 // Software engineering by Intevation GmbH
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	10 //
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	11 // Author(s):
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	12 // * Sascha L. Teichmann <sascha.teichmann@intevation.de>
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	13
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	14 package mesh
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	15
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	16 import (
5686 c33a5354328d Add stubs for de/serialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5685 diff changeset	17 "bufio"
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	18 "cmp"
5687 8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	19 "encoding/binary"
5686 c33a5354328d Add stubs for de/serialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5685 diff changeset	20 "io"
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	21 "math"
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	22 "slices"
5688 6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	23
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	24 "gemma.intevation.de/gemma/pkg/common"
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	25 )
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	26
5688 6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	27 const quantScale = 1_000
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	28
5690 da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	29 func quant(x float64) int64 { return int64(math.Round(x * quantScale)) }
da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	30 func unquant(x int64) float64 { return float64(x) / quantScale }
5688 6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	31
5686 c33a5354328d Add stubs for de/serialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5685 diff changeset	32 func (s *STRTree) serializeV2(w io.Writer) error {
5692 d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	33 return serializer(w, s,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	34 serializeHeader(),
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	35 serializeVersion(2),
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	36 (*STRTree).serializeTinV2,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	37 (*STRTree).serializeEntries,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	38 (*STRTree).serializeIndexV2,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	39 )
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	40 }
5690 da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	41
5692 d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	42 func (s *STRTree) serializeTinV2(w io.Writer) error {
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	43 return s.tin.serializeV2(w)
5687 8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	44 }
8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	45
8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	46 func (t *Tin) serializeV2(w io.Writer) error {
5692 d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	47 return serializer(w, t,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	48 (*Tin).serializeEPSG,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	49 (*Tin).serializeExtent,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	50 (*Tin).serializeVerticesV2,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	51 (*Tin).serializeTrianglesV2,
d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	52 )
5688 6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	53 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	54
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	55 func zigZag(buf []byte, w io.Writer, x int64) error {
5689 159291854063 Simplify zug zig store call. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5688 diff changeset	56 _, err := w.Write(buf[:binary.PutVarint(buf, x)])
159291854063 Simplify zug zig store call. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5688 diff changeset	57 return err
5688 6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	58 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	59
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	60 func (t *Tin) serializeVerticesV2(w io.Writer) error {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	61 vertices := t.Vertices
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	62 if err := binary.Write(w, binary.LittleEndian, uint32(len(vertices))); err != nil {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	63 return err
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	64 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	65 m := t.Min
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	66 buf := make([]byte, binary.MaxVarintLen64)
5700 45240edad249 Make Go 1.21 compatible. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5695 diff changeset	67 for dim := 0; dim <= 2; dim++ {
5688 6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	68 delta := common.Delta()
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	69 for i := range vertices {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	70 var v float64
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	71 switch dim {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	72 case 0:
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	73 v = vertices[i].X - m.X
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	74 case 1:
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	75 v = vertices[i].Y - m.Y
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	76 case 2:
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	77 v = vertices[i].Z - m.Z
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	78 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	79 q := quant(v)
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	80 d := delta(q)
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	81 if err := zigZag(buf, w, d); err != nil {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	82 return err
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	83 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	84 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	85 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	86 return nil
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	87 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	88
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	89 func (t *Tin) serializeTrianglesV2(w io.Writer) error {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	90 triangles := t.Triangles
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	91 if err := binary.Write(w, binary.LittleEndian, uint32(len(triangles))); err != nil {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	92 return err
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	93 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	94 buf := make([]byte, binary.MaxVarintLen64)
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	95 delta := common.Delta()
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	96 for _, tri := range triangles {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	97 for _, idx := range tri {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	98 d := delta(int64(idx))
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	99 if err := zigZag(buf, w, d); err != nil {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	100 return err
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	101 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	102 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	103 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	104 return nil
5687 8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	105 }
8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	106
8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	107 func (s *STRTree) serializeIndexV2(w io.Writer) error {
5688 6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	108 index := s.index
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	109 if err := binary.Write(w, binary.LittleEndian, uint32(len(index))); err != nil {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	110 return err
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	111 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	112 buf := make([]byte, binary.MaxVarintLen64)
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	113 delta := common.Delta()
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	114 for _, idx := range index {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	115 d := delta(int64(idx))
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	116 if err := zigZag(buf, w, d); err != nil {
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	117 return err
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	118 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	119 }
6281c18b109f Finsh serializing v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5687 diff changeset	120 return nil
5687 8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	121 }
8ff842858434 More stubs for serializing v2. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5686 diff changeset	122
5686 c33a5354328d Add stubs for de/serialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5685 diff changeset	123 func (s STRTree) deserializeV2(r bufio.Reader) error {
5690 da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	124 // The header is already skipped here.
5704 a68e8eae7273 Dont store bounding boxes in v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5702 diff changeset	125 if err := serializer(r, s,
5691 9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	126 (*STRTree).deserializeTinV2,
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	127 (*STRTree).deserializeEntries,
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	128 (*STRTree).deserializeIndexV2,
5704 a68e8eae7273 Dont store bounding boxes in v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5702 diff changeset	129 ); err != nil {
a68e8eae7273 Dont store bounding boxes in v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5702 diff changeset	130 return err
a68e8eae7273 Dont store bounding boxes in v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5702 diff changeset	131 }
a68e8eae7273 Dont store bounding boxes in v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5702 diff changeset	132 s.rebuildBBoxes()
a68e8eae7273 Dont store bounding boxes in v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5702 diff changeset	133 return nil
5691 9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	134 }
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	135
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	136 func (s STRTree) deserializeTinV2(r bufio.Reader) error {
5690 da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	137 s.tin = new(Tin)
5691 9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	138 return s.tin.deserializeV2(r)
5690 da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	139 }
da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	140
da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	141 func (s STRTree) deserializeIndexV2(r bufio.Reader) error {
5695 ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	142 var numIndices uint32
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	143 if err := binary.Read(r, binary.LittleEndian, &numIndices); err != nil {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	144 return err
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	145 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	146 index := make([]int32, numIndices)
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	147 s.index = index
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	148 invDelta := common.InvDelta()
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	149 for i := range index {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	150 d, err := binary.ReadVarint(r)
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	151 if err != nil {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	152 return err
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	153 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	154 index[i] = int32(invDelta(d))
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	155 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	156 return nil
5690 da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	157 }
da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	158
da9720b4aa42 More stubs and refactoring to deserialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5689 diff changeset	159 func (t Tin) deserializeV2(r bufio.Reader) error {
5692 d920f0fa2f04 User generic serializer for serialization, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5691 diff changeset	160 return serializer(r, t,
5691 9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	161 (*Tin).deserializeEPSG,
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	162 (*Tin).deserializeExtent,
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	163 (*Tin).deserializeVerticesV2,
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	164 (*Tin).deserializeTrianglesV2,
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	165 )
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	166 }
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	167
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	168 func (t Tin) deserializeVerticesV2(r bufio.Reader) error {
5695 ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	169 var numVertices uint32
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	170 if err := binary.Read(r, binary.LittleEndian, &numVertices); err != nil {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	171 return err
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	172 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	173 vertices := make([]Vertex, numVertices)
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	174 t.Vertices = vertices
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	175 m := t.Min
5700 45240edad249 Make Go 1.21 compatible. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5695 diff changeset	176 for dim := 0; dim <= 2; dim++ {
5695 ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	177 invDelta := common.InvDelta()
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	178 for i := range vertices {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	179 d, err := binary.ReadVarint(r)
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	180 if err != nil {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	181 return err
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	182 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	183 v := unquant(invDelta(d))
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	184 switch dim {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	185 case 0:
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	186 vertices[i].X = v + m.X
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	187 case 1:
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	188 vertices[i].Y = v + m.Y
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	189 case 2:
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	190 vertices[i].Z = v + m.Z
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	191 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	192 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	193 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	194 return nil
5691 9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	195 }
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	196
9d2e74225104 Some refactoring to clean up deserialization. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5690 diff changeset	197 func (t Tin) deserializeTrianglesV2(r bufio.Reader) error {
5695 ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	198 var numTriangles uint32
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	199 if err := binary.Read(r, binary.LittleEndian, &numTriangles); err != nil {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	200 return err
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	201 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	202 indices := make([]int32, 3*numTriangles)
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	203 triangles := make([][]int32, numTriangles)
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	204 t.Triangles = triangles
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	205 invDelta := common.InvDelta()
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	206 for i := range triangles {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	207 tri := indices[:3]
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	208 indices = indices[3:]
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	209 triangles[i] = tri
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	210 for j := range tri {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	211 v, err := binary.ReadVarint(r)
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	212 if err != nil {
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	213 return err
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	214 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	215 tri[j] = int32(invDelta(v))
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	216 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	217 }
ef80748ae4f3 Finish deserializing v2 of the mesh index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5692 diff changeset	218 return nil
5686 c33a5354328d Add stubs for de/serialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5685 diff changeset	219 }
c33a5354328d Add stubs for de/serialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5685 diff changeset	220
c33a5354328d Add stubs for de/serialize v2 meshes. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5685 diff changeset	221 // optimizeForSerializationV2 prepares the mesh to be stored in V2.
5680 a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	222 func (s *STRTree) optimizeForSerializationV2() {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	223 s.removeUnusedTriangles()
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	224 s.sortVertices()
5682 33499bd1b829 Sort indices in spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5680 diff changeset	225 s.sortIndices()
5680 a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	226 }
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	227
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	228 // removeUnusedTriangles removes all triangles from the
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	229 // TIN that are not registered in the spatial index.
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	230 func (s *STRTree) removeUnusedTriangles() {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	231 used := make([]bool, len(s.tin.Triangles))
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	232 unused := len(used)
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	233 s.allTriangleIndices(func(indices []int32) {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	234 for _, idx := range indices {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	235 used[idx] = true
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	236 unused-- // They only occur once in the spatial index.
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	237 }
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	238 })
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	239 if unused <= 0 {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	240 return
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	241 }
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	242 newTris := make([][]int32, 0, len(s.tin.Triangles)-unused)
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	243 remap := map[int32]int32{}
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	244 for idx, tri := range s.tin.Triangles {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	245 if used[idx] {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	246 remap[int32(idx)] = int32(len(newTris))
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	247 newTris = append(newTris, tri)
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	248 }
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	249 }
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	250 s.tin.Triangles = newTris
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	251 // Update the spatial index as the gaps are now closed.
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	252 s.allTriangleIndices(func(indices []int32) {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	253 for i, idx := range indices {
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	254 indices[i] = remap[idx]
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	255 }
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	256 })
a87900c0fd11 Remove triangles that are not registered in the spatial index. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	257 }
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	258
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	259 // sortVertices so that the deltas between neighbors are minimized.
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	260 func (s *STRTree) sortVertices() {
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	261 vertices := s.tin.Vertices
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	262 indices := make([]int32, len(vertices))
5700 45240edad249 Make Go 1.21 compatible. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5695 diff changeset	263 for i := range indices {
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	264 indices[i] = int32(i)
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	265 }
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	266
5685 0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	267 // Take aspect ratio of bbox into account.
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	268 width := s.tin.Max.X - s.tin.Min.X
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	269 height := s.tin.Max.Y - s.tin.Min.Y
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	270 if width == 0 \|\| height == 0 {
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	271 return
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	272 }
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	273
5685 0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	274 // v = len(vertices)
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	275 // r = max(w, h)/min(w, h)
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	276 // n * t = v <=> n = v/t
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	277 // n / t = r <=> n = r*t
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	278 // v/t = r*t
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	279 // v = r*t^2
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	280 // v/r = t^2
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	281 // t = sqrt(v/r)
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	282 r := float64(max(width, height)) / float64(min(width, height))
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	283 t := int(math.Ceil(math.Sqrt(float64(len(vertices)) / r)))
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	284
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	285 var d1, d2 func(int32, int32) int
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	286
5685 0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	287 if width > height {
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	288 // Sort in X first and slices alternating up and down
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	289 slices.SortFunc(indices, func(a, b int32) int {
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	290 return cmp.Compare(vertices[a].X, vertices[b].X)
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	291 })
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	292 d1 = func(a, b int32) int { return cmp.Compare(vertices[a].Y, vertices[b].Y) }
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	293 d2 = func(a, b int32) int { return cmp.Compare(vertices[b].Y, vertices[a].Y) }
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	294 } else {
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	295 // Sort in Y first and slices alternating left and right
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	296 slices.SortFunc(indices, func(a, b int32) int {
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	297 return cmp.Compare(vertices[a].Y, vertices[b].Y)
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	298 })
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	299 d1 = func(a, b int32) int { return cmp.Compare(vertices[a].X, vertices[b].X) }
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	300 d2 = func(a, b int32) int { return cmp.Compare(vertices[b].X, vertices[a].X) }
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	301 }
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	302
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	303 for p := indices; len(p) > 0; d1, d2 = d2, d1 {
0ee8ace01b60 When sorting vertices by x/y take aspectio ratio of bbox into acount. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5684 diff changeset	304 l := min(len(p), t)
5702 fe83406fe7ed Fix bug in sorting the vertices. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5700 diff changeset	305 slices.SortStableFunc(p[:l], d1)
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	306 p = p[l:]
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	307 }
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	308
5702 fe83406fe7ed Fix bug in sorting the vertices. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5700 diff changeset	309 v2 := make([]Vertex, len(vertices))
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	310 reindices := make([]int32, len(indices))
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	311 for i, idx := range indices {
5702 fe83406fe7ed Fix bug in sorting the vertices. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5700 diff changeset	312 v2[i] = vertices[idx]
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	313 reindices[idx] = int32(i)
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	314 }
5702 fe83406fe7ed Fix bug in sorting the vertices. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5700 diff changeset	315 copy(vertices, v2)
5684 536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	316
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	317 // Update the indices in the triangles.
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	318 for _, tri := range s.tin.Triangles {
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	319 for i, idx := range tri {
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	320 tri[i] = reindices[idx]
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	321 }
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	322 }
536e842d9bfa Reorder vertices in tins to minimize delta distances. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 5682 diff changeset	323 }

Mercurial > gemma

annotate pkg/mesh/meshserialize_v2.go @ 5705:39d91e76c05c sr-v2