Mercurial > gemma

changeset 681:a8d32a11b113 octree

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octree: more consistent traversal order in contour tool.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 19 Sep 2018 18:39:03 +0200
parents c79c7be29a7a
children b17e3ce53285
files cmd/octree2contour/loader.go cmd/octree2contour/main.go
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/cmd/octree2contour/loader.go	Wed Sep 19 18:07:28 2018 +0200
+++ b/cmd/octree2contour/loader.go	Wed Sep 19 18:39:03 2018 +0200
@@ -162,12 +162,12 @@
 				stack = append(stack,
 					frame{ot.index[pos+0], min, mid},
 					frame{ot.index[pos+1], min, mid},
-					frame{ot.index[pos+4], min, mid},
+					frame{ot.index[pos+3], min, mid},
 					frame{ot.index[pos+5], min, mid})
 			} else {
 				stack = append(stack,
-					frame{ot.index[pos+2], mid, max},
-					frame{ot.index[pos+3], mid, max},
+					frame{ot.index[pos+4], mid, max},
+					frame{ot.index[pos+5], mid, max},
 					frame{ot.index[pos+6], mid, max},
 					frame{ot.index[pos+7], mid, max})
 			}
--- a/cmd/octree2contour/main.go	Wed Sep 19 18:07:28 2018 +0200
+++ b/cmd/octree2contour/main.go	Wed Sep 19 18:39:03 2018 +0200
@@ -21,9 +21,12 @@
 		})
 	} else {
 		for h := tree.min.z; h <= tree.max.z; h += *step {
+			var level int
 			tree.horizontal(h, func([]int32) {
-				triangles++
+				level++
 			})
+			log.Printf("level %f: %d\n", h, level)
+			triangles += level
 		}
 	}
 	log.Printf("traversal took: %v\n", time.Since(start))