From 9e904e4247e105ca3fb59c0ec6c481ad4935e2af Mon Sep 17 00:00:00 2001 From: Andrey Antukh <niwi@niwi.nz> Date: Sat, 13 Aug 2016 02:42:20 +0300 Subject: [PATCH] Activate by default path simplification. --- src/uxbox/main/ui/workspace/drawarea.cljs | 6 ++++-- src/uxbox/util/geom/path.cljs | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs index 30f24eff9..877c00d79 100644 --- a/src/uxbox/main/ui/workspace/drawarea.cljs +++ b/src/uxbox/main/ui/workspace/drawarea.cljs @@ -195,8 +195,10 @@ dx (- 0 minx) dy (- 0 miny) + ;; _ (println "Initial number of points:" (count points)) points (mapv #(gpt/add % [dx dy]) points) - ;; points (path/simplify points) + points (path/simplify points 0.1) + ;; _ (println "Final number of points:" (count points)) width (- maxx minx) height (- maxy miny)] @@ -227,7 +229,7 @@ (defn- on-init-draw-generic [shape] - (let [mouse (->> (rx/sample 10 wb/mouse-viewport-s) + (let [mouse (->> wb/mouse-viewport-s (rx/mapcat (fn [point] (if @wb/alignment-ref (uds/align-point point) diff --git a/src/uxbox/util/geom/path.cljs b/src/uxbox/util/geom/path.cljs index 2a0b7f7eb..76422c581 100644 --- a/src/uxbox/util/geom/path.cljs +++ b/src/uxbox/util/geom/path.cljs @@ -8,6 +8,8 @@ (:require [uxbox.util.geom.path-impl-simplify :as impl-simplify])) (defn simplify - [points] - (let [points (into-array points)] - (into [] (impl-simplify/simplify points 10 true)))) + ([points] + (simplify points 0.1)) + ([points tolerance] + (let [points (into-array points)] + (into [] (impl-simplify/simplify points tolerance true)))))