✨ Improvements over selrect generation

common/src/app/common/geom/shapes.cljc

@@ -17,39 +17,6 @@
    [app.common.geom.shapes.transforms :as gtr]
    [app.common.math :as mth]))
 
-;; --- Setup (Initialize)
-;; FIXME: Is this the correct place for these functions?
-
-(defn- setup-rect
-  "A specialized function for setup rect-like shapes."
-  [shape {:keys [x y width height]}]
-  (let [rect    {:x x :y y :width width :height height}
-        points  (gpr/rect->points rect)
-        selrect (gpr/points->selrect points)]
-    (assoc shape
-           :x x
-           :y y
-           :width width
-           :height height
-           :points points
-           :selrect selrect)))
-
-(defn- setup-image
-  [{:keys [metadata] :as shape} props]
-  (-> (setup-rect shape props)
-      (assoc
-       :proportion (/ (:width metadata)
-                      (:height metadata))
-       :proportion-lock true)))
-
-(defn setup
-  "A function that initializes the first coordinates for
-  the shape. Used mainly for draw operations."
-  [shape props]
-  (case (:type shape)
-    :image (setup-image shape props)
-    (setup-rect shape props)))
-
 ;; --- Outer Rect
 
 (defn selection-rect
@@ -121,13 +88,6 @@
 (defn distance-shapes [shape other]
   (distance-selrect (:selrect shape) (:selrect other)))
 
-(defn setup-selrect [shape]
-  (let [selrect (gpr/rect->selrect shape)
-        points  (gpr/rect->points shape)]
-    (-> shape
-        (assoc :selrect selrect
-               :points points))))
-
 (defn shape-stroke-margin
   [shape stroke-width]
   (if (= (:type shape) :path)

common/src/app/common/geom/shapes/bool.cljc

@@ -30,15 +30,13 @@
   "Calculates the selrect+points for the boolean shape"
   [shape children objects]
 
-  (let [content (calc-bool-content shape objects)
-        [points selrect]
-        (if (empty? content)
-          (let [selrect (gtr/selection-rect children)
-                points (gpr/rect->points selrect)]
-            [points selrect])
-          (gsp/content->points+selrect shape content))]
-    (-> shape
-        (assoc :selrect selrect)
-        (assoc :points points)
-        (assoc :bool-content content))))
+  (let [bool-content     (calc-bool-content shape objects)
+        shape            (assoc shape :bool-content bool-content)
+        [points selrect] (gsp/content->points+selrect shape bool-content)]
+
+    (if (and (some? selrect) (d/not-empty? points))
+      (-> shape
+          (assoc :selrect selrect)
+          (assoc :points points))
+      (gtr/update-group-selrect shape children))))
 

common/src/app/common/geom/shapes/path.cljc

@@ -333,11 +333,8 @@
                                                (command->point command :c2)]]
                                     (->> (curve-extremities curve)
                                          (mapv #(curve-values curve %)))))
-                  [])
-         selrect (gpr/points->selrect points)]
-     (-> selrect
-         (update :width #(if (mth/almost-zero? %) 1 %))
-         (update :height #(if (mth/almost-zero? %) 1 %))))))
+                  [])]
+     (gpr/points->selrect points))))
 
 (defn content->selrect [content]
   (let [calc-extremities
@@ -371,20 +368,26 @@
 
         set-tr
         (fn [params px py]
-          (-> params
-              (update px + dx)
-              (update py + dy)))
+          (cond-> params
+            (d/num? dx)
+            (update px + dx)
+
+            (d/num? dy)
+            (update py + dy)))
 
         transform-params
-        (fn [{:keys [x c1x c2x] :as params}]
+        (fn [{:keys [x y c1x c1y c2x c2y] :as params}]
           (cond-> params
-            (some? x)   (set-tr :x :y)
-            (some? c1x) (set-tr :c1x :c1y)
-            (some? c2x) (set-tr :c2x :c2y)))]
+            (d/num? x y)   (set-tr :x :y)
+            (d/num? c1x c1y) (set-tr :c1x :c1y)
+            (d/num? c2x c2y) (set-tr :c2x :c2y)))
 
-    (into []
-          (map #(update % :params transform-params))
-          content)))
+        update-command
+        (fn [command]
+          (update command :params transform-params))]
+
+    (->> content
+         (into [] (map update-command)))))
 
 (defn transform-content
   [content transform]

common/src/app/common/geom/shapes/transforms.cljc

@@ -21,38 +21,38 @@
 
 ;; --- Relative Movement
 
-(defn- move-selrect [selrect pt]
-  (when (and (some? selrect) (some? pt))
-    (let [dx (.-x pt)
-          dy (.-y pt)
-          {:keys [x y x1 y1 x2 y2 width height]} selrect]
-      {:x     (if (some? x) (+ dx x) x)
-       :y     (if (some? y) (+ dy y) y)
-       :x1    (if (some? x1) (+ dx x1) x1)
-       :y1    (if (some? y1) (+ dy y1) y1)
-       :x2    (if (some? x2) (+ dx x2) x2)
-       :y2    (if (some? y2) (+ dy y2) y2)
-       :width width
-       :height height})))
+(defn- move-selrect [{:keys [x y x1 y1 x2 y2 width height] :as selrect} {dx :x dy :y :as pt}]
+  (if (and (some? selrect) (some? pt) (d/num? dx dy))
+    {:x      (if (d/num? x)  (+ dx x)  x)
+     :y      (if (d/num? y)  (+ dy y)  y)
+     :x1     (if (d/num? x1) (+ dx x1) x1)
+     :y1     (if (d/num? y1) (+ dy y1) y1)
+     :x2     (if (d/num? x2) (+ dx x2) x2)
+     :y2     (if (d/num? y2) (+ dy y2) y2)
+     :width  width
+     :height height}
+    selrect))
 
 (defn- move-points [points move-vec]
-  (->> points
-       (mapv #(gpt/add % move-vec))))
+  (cond->> points
+    (d/num? (:x move-vec) (:y move-vec))
+    (mapv #(gpt/add % move-vec))))
 
 (defn move-position-data
   [position-data dx dy]
 
-  (->> position-data
-       (mapv #(-> %
-                  (update :x + dx)
-                  (update :y + dy)))))
+  (cond->> position-data
+    (d/num? dx dy)
+    (mapv #(-> %
+               (update :x + dx)
+               (update :y + dy)))))
 
 (defn move
   "Move the shape relatively to its current
   position applying the provided delta."
   [{:keys [type] :as shape} {dx :x dy :y}]
-  (let [dx       (d/check-num dx)
-        dy       (d/check-num dy)
+  (let [dx       (d/check-num dx 0)
+        dy       (d/check-num dy 0)
         move-vec (gpt/point dx dy)]
 
     (-> shape
@@ -138,9 +138,12 @@
 (defn transform-matrix
   "Returns a transformation matrix without changing the shape properties.
   The result should be used in a `transform` attribute in svg"
-  ([shape] (transform-matrix shape nil))
-  ([shape params] (transform-matrix shape params (or (gco/center-shape shape)
-                                                     (gpt/point 0 0))))
+  ([shape]
+   (transform-matrix shape nil))
+
+  ([shape params]
+   (transform-matrix shape params (or (gco/center-shape shape) (gpt/point 0 0))))
+
   ([{:keys [flip-x flip-y] :as shape} {:keys [no-flip]} shape-center]
    (-> (gmt/matrix)
        (gmt/translate shape-center)
@@ -276,10 +279,6 @@
           [(gpr/points->selrect points) nil nil]
           (adjust-rotated-transform shape points))
 
-        ;;selrect (cond-> selrect
-        ;;          round-coords? gpr/round-selrect)
-
-        ;; Redondear los points?
         base-rotation  (or (:rotation shape) 0)
         modif-rotation (or (get-in shape [:modifiers :rotation]) 0)
         rotation       (mod (+ base-rotation modif-rotation) 360)]
@@ -296,8 +295,10 @@
               (assoc :transform-inverse transform-inverse)))
         (cond-> (not transform)
           (dissoc :transform :transform-inverse))
-        (assoc :selrect selrect)
-        (assoc :points points)
+        (cond-> (some? selrect)
+          (assoc :selrect selrect))
+        (cond-> (d/not-empty? points)
+          (assoc :points points))
         (assoc :rotation rotation))))
 
 (defn- update-group-viewbox
@@ -568,11 +569,7 @@
 
         displacement
         (when (some? displacement)
-          (gmt/multiply resize-transform-inverse displacement)
-          #_(-> (gpt/point 0 0)
-              (gpt/transform displacement)
-              (gpt/transform resize-transform-inverse)
-              (gmt/translate-matrix)))
+          (gmt/multiply resize-transform-inverse displacement))
 
         resize-origin
         (when (some? resize-origin)

common/src/app/common/pages.cljc

@@ -42,4 +42,5 @@
 (dm/export init/make-minimal-shape)
 (dm/export init/make-minimal-group)
 (dm/export init/empty-file-data)
-
+(dm/export init/setup-shape)
+(dm/export init/setup-rect-selrect)

common/src/app/common/pages/common.cljc

@@ -104,6 +104,7 @@
   :group #{:proportion-lock
            :width :height
            :x :y
+           :rotation
            :selrect
 
            :constraints-h

common/src/app/common/pages/init.cljc

@@ -9,6 +9,7 @@
    [app.common.colors :as clr]
    [app.common.data :as d]
    [app.common.exceptions :as ex]
+   [app.common.geom.shapes :as gsh]
    [app.common.pages.common :refer [file-version default-color]]
    [app.common.uuid :as uuid]))
 
@@ -146,3 +147,40 @@
          (assoc :id file-id)
          (update :pages conj page-id)
          (update :pages-index assoc page-id pd)))))
+
+(defn setup-rect-selrect
+  "Initializes the selrect and points for a shape"
+  [shape]
+  (let [selrect (gsh/rect->selrect shape)
+        points  (gsh/rect->points shape)]
+    (-> shape
+        (assoc :selrect selrect
+               :points points))))
+
+(defn- setup-rect
+  "A specialized function for setup rect-like shapes."
+  [shape {:keys [x y width height]}]
+  (-> shape
+      (assoc :x x :y y :width width :height height)
+      (setup-rect-selrect)))
+
+(defn- setup-image
+  [{:keys [metadata] :as shape} props]
+  (-> (setup-rect shape props)
+      (assoc
+       :proportion (/ (:width metadata)
+                      (:height metadata))
+       :proportion-lock true)))
+
+(defn setup-shape
+  "A function that initializes the first coordinates for
+  the shape. Used mainly for draw operations."
+  ([props]
+   (setup-shape {:type :rect} props))
+
+  ([shape props]
+   (case (:type shape)
+     :image (setup-image shape props)
+     (setup-rect shape props))))
+
+

common/src/app/common/pages/migrations.cljc

@@ -84,7 +84,7 @@
 
           (fix-empty-points [shape]
             (let [shape (cond-> shape
-                          (empty? (:selrect shape)) (gsh/setup-selrect))]
+                          (empty? (:selrect shape)) (cp/setup-rect-selrect))]
               (cond-> shape
                 (empty? (:points shape))
                 (assoc :points (gsh/rect->points (:selrect shape))))))