X-Git-Url: https://git.jsancho.org/?p=dungeon-master.git;a=blobdiff_plain;f=dungeon-master%2Fgeom%2Fvoronoi.scm;h=9217285ad97c2295dd539acd6cba191284526801;hp=a748634dad75eb54580c26917b5b8bb900f05d05;hb=09c4aef3b2dde4e8fdf0a4b673b36c1ddbc84b6e;hpb=efcdd7897930ce2ce2f24ef789c8331b6154527b

diff --git a/dungeon-master/geom/voronoi.scm b/dungeon-master/geom/voronoi.scm
index a748634..9217285 100644
--- a/dungeon-master/geom/voronoi.scm
+++ b/dungeon-master/geom/voronoi.scm
@@ -1,7 +1,9 @@
 (define-module (dungeon-master geom voronoi)
   #:use-module (ice-9 receive)
+  #:use-module (rnrs sorting)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
+  #:use-module (dungeon-master geom)
   #:use-module (dungeon-master geom point)
   #:use-module (dungeon-master geom triangle)
   #:use-module (dungeon-master geom bowyer-watson)
@@ -10,16 +12,28 @@
             voronoi-mesh-triangles
             voronoi-mesh-points
             voronoi-mesh-frame
-            voronoi-mesh-regions))
+            voronoi-mesh-regions
+            voronoi-mesh-relax))
 
 "https://github.com/watabou/TownGeneratorOS/blob/master/Source/com/watabou/geom/Voronoi.hx"
 
+;;; Voronoi mesh region
+
 (define-record-type <voronoi-region>
-  (make-voronoi-region seed vertices)
+  (make-raw-voronoi-region seed vertices)
   voronoi-region?
   (seed voronoi-region-seed)
   (vertices voronoi-region-vertices))
 
+(define (make-voronoi-region seed vertices)
+  (define (compare-angles triangle1 triangle2)
+    (let ((c1 (triangle-center triangle1))
+          (c2 (triangle-center triangle2)))
+      (> (angle-sign seed c1 c2) 0)))
+  (make-raw-voronoi-region seed (list-sort compare-angles vertices)))
+
+;;; Voronoi mesh
+
 (define-record-type <voronoi-mesh>
   (make-raw-voronoi-mesh triangles points frame regions)
   voronoi-mesh?
@@ -29,30 +43,59 @@
   (regions voronoi-mesh-regions))
 
 (define* (make-voronoi-mesh vertices #:optional (relax-steps 3))
-  ; Delaunay triangulation
+  ;; Delaunay triangulation
   (receive (triangles points frame)
       (bowyer-watson vertices)
-    ; Relaxing central wards
-    ;; (let relax ((step relax-steps))
-    ;;   (cond ((> step 0)
-    ;;          (relax (- step 1)))
-    ;;         (else
-    ;;          #t)))
     (make-raw-voronoi-mesh
      triangles
      points
      frame
      (make-regions points triangles))))
 
-(define* (make-regions points triangles #:optional (regions '()))
-  (cond ((null? points)
-         regions)
-        (else
-         (let* ((p (car points))
-                (vertices (filter
-                           (lambda (tr) (member p (triangle-points tr)))
-                           triangles)))
-           (display p)(newline)
-           (make-regions (cdr points)
-                         triangles
-                         (cons (make-voronoi-region p vertices) regions))))))
+(define (partitioning voronoi)
+  (define (is-real-triangle triangle)
+    ;; real triangle points cannot be frame points
+    (let ((frame (voronoi-mesh-frame voronoi)))
+      (let check-points ((points (triangle-points triangle)))
+        (cond ((null? points)
+               #t)  ; triangle is real
+              (else
+               (and (not (member (car points) frame))
+                    (check-points (cdr points))))))))
+
+  (define (is-real-region region)
+    ;; real region points cannot be frame points
+    (let check-vertices ((vertices (voronoi-region-vertices region)))
+      (cond ((null? vertices)
+             #t)  ; region is real
+            (else
+             (and (is-real-triangle (car vertices))
+                  (check-vertices (cdr vertices)))))))
+
+  (let* ((points (voronoi-mesh-points voronoi))
+         (regions (voronoi-mesh-regions voronoi))
+         ;; we need the regions in the same order as points are
+         (ordered-regions
+          (map-in-order
+           (lambda (p)
+             (assoc-ref regions p))
+           points))
+         ;; only real regions without frame points
+         (filtered-regions
+          (filter (lambda (r) (is-real-region r))
+                  ordered-regions)))
+    filtered-regions))
+
+(define* (voronoi-mesh-relax voronoi #:optional (to-relax '()))
+  (let ((regions (partitioning voronoi)))
+    voronoi))
+
+(define (make-regions points triangles)
+  (map-in-order
+   (lambda (p)
+     (let ((vertices
+            (filter
+             (lambda (tr) (member p (triangle-points tr)))
+             triangles)))
+       (cons p (make-voronoi-region p vertices))))
+   points))