fixed #20, supply init value for transducer in

gmesh/compute-vertex-normals, add single vertex/face-normal accessors for GMesh & BasicMesh
thi-ng · May 25, 2015 · 661dccf · 661dccf
1 parent 780a6b1
commit 661dccf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/geom-types/src/basicmesh.org b/geom-types/src/basicmesh.org
@@ -137,8 +137,12 @@
   g/PNormalAccess
   (face-normals
    [_ force?] (if (seq (:fnormals _)) (:fnormals _) (if force? (:fnormals (g/compute-face-normals _)))))
+  (face-normal
+   [_ f] ((:fnormals _) f))
   (vertex-normals
    [_ force?] (if force? (err/unsupported!)))
+  (vertex-normal
+   [_ v] (err/unsupported!))
   (compute-face-normals
    [_]
    (loop [fnorms (transient {}), faces (:faces _)]

diff --git a/geom-types/src/gmesh.org b/geom-types/src/gmesh.org
@@ -333,11 +333,15 @@ located on the rotation axis.
    (if (seq (:fnormals _))
      (:fnormals _)
      (if force? (:fnormals (g/compute-face-normals _)))))
+  (face-normal
+   [_ f] ((:fnormals _) f))
   (vertex-normals
    [_ force?]
    (if (seq (:vnormals _))
      (:vnormals _)
      (if force? (:vnormals (g/compute-vertex-normals _)))))
+  (vertex-normal
+   [_ v] ((:vnormals _) v))
   (compute-face-normals
    [_]
    (loop [norms (transient #{}), fnorms (transient {}), faces (:faces _)]
@@ -346,23 +350,23 @@ located on the rotation axis.
              [norms n] (d/index! norms (apply gu/ortho-normal f))]
          (recur norms (assoc! fnorms f n) (next faces)))
        (assoc _
-         :normals  (persistent! norms)
-         :fnormals (persistent! fnorms)))))
+              :normals  (persistent! norms)
+              :fnormals (persistent! fnorms)))))
   (compute-vertex-normals
    [_]
    (let [{:keys [vertices normals fnormals] :as this} (if (seq (:fnormals _)) _ (g/compute-face-normals _))
          ntx (map #(get fnormals %))]
      (loop [norms (transient normals), vnorms (transient (hash-map)), verts (keys vertices)]
        (if verts
          (let [v (first verts)
-               n (->> (g/vertex-faces this v)
-                      (transduce ntx g/+)
-                      (g/normalize))
-               [norms n] (d/index! norms n)]
+               [norms n] (->> (d/value-set :f vertices v)
+                              (transduce ntx g/+ v/V3)
+                              (g/normalize)
+                              (d/index! norms))]
            (recur norms (assoc! vnorms v n) (next verts)))
          (assoc this
-           :normals  (persistent! norms)
-           :vnormals (persistent! vnorms))))))
+                :normals  (persistent! norms)
+                :vnormals (persistent! vnorms))))))
 #+END_SRC
 
 *** PGeomContainer