[webgl] update color uniform handling and minor other refactoring

thi-ng · Oct 1, 2015 · 94b495d · 94b495d
1 parent e47ef62
commit 94b495d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/geom-webgl/src/animator.org b/geom-webgl/src/animator.org
@@ -17,22 +17,23 @@
      (.-mozRequestAnimationFrame js/window)
      (.-msRequestAnimationFrame js/window)
      (.-oRequestAnimationFrame js/window)))
-  
+
   (defn now
-    [] (or
-        (.now js/performance)
-        (.webkitNow js/performance)
-        (.mozNow js/performance)
-        (.msNow js/performance)
-        (.oNow js/performance)))  
-
-   (defn animate
-     [f & [element]]
+    []
+    (or
+     (.now js/performance)
+     (.webkitNow js/performance)
+     (.mozNow js/performance)
+     (.msNow js/performance)
+     (.oNow js/performance)))
+
+  (defn animate
+    [f & [element]]
     (let [t0 (.getTime (js/Date.))
-           t (atom [0 0])
-           f' (fn animate* []
-               (if (f (reset! t [(* (- (.getTime (js/Date.)) t0) 0.001) (inc (@t 1))]))
-                  (if element
+          t  (volatile! [0 0])
+          f' (fn animate* []
+               (if (f (vreset! t [(* (- (.getTime (js/Date.)) t0) 0.001) (inc (@t 1))]))
+                 (if element
                    (animframe-provider animate* element)
                    (animframe-provider animate*))))]
       (f')))

diff --git a/geom-webgl/src/demo.org b/geom-webgl/src/demo.org
@@ -399,10 +399,10 @@ rotation / transformation).
                          (gl/as-webgl-buffer-spec {})
                          (buf/make-attribute-buffers-in-spec gl gl/static-draw)
                          (assoc :shader shader :uniforms uniforms))
-          state      (atom {:mpos (g/centroid view-rect) :update-ray true})
-          update-pos #(swap! state assoc
-                             :mpos (vec2 (.-clientX %) (.-clientY %))
-                             :update-ray true)]
+          state      (volatile! {:mpos (g/centroid view-rect) :update-ray true})
+          update-pos #(vswap! state assoc
+                              :mpos (vec2 (.-clientX %) (.-clientY %))
+                              :update-ray true)]
       (.addEventListener js/window "mousemove" update-pos)
       (.addEventListener js/window "touchmove" #(do (.preventDefault %) (update-pos (aget (.-touches %) 0))))
       (anim/animate
@@ -413,7 +413,7 @@ rotation / transformation).
                       (let [p (-> (vec3 (:mpos @state) 0)
                                   (mat/unproject-point (g/invert (g/* (:proj uniforms) view)) view-rect)
                                   (raycast eye ground back))]
-                        (swap! state assoc :isec p :update-ray false) p)
+                        (vswap! state assoc :isec p :update-ray false) p)
                       (:isec @state))]
            (gl/set-viewport gl view-rect)
            (gl/clear-color-buffer gl 0.52 0.5 0.5 1)

diff --git a/geom-webgl/src/shaders.org b/geom-webgl/src/shaders.org
@@ -104,7 +104,7 @@ Special cases:
                            (= :vec3 type)
                            (fn [x]
                              (if (number? x)
-                               (.call setter gl loc (u-cast (subvec (color/int->rgba x) 0 3)))
+                               (.call setter gl loc (-> x col/int24 col/as-rgba col/unwrap (subvec 0 3) u-cast))
                                (.call setter gl loc (if (arrays/typed-array? x) x (u-cast x)))))
                            :else
                            (fn [x]
@@ -350,7 +350,7 @@ Currently the following options are supported:
     [thi.ng.geom.webgl.core :as gl]
     [thi.ng.geom.webgl.utils :as glu]
     [thi.ng.typedarrays.core :as arrays]
-    [thi.ng.color.core :as color]
+    [thi.ng.color.core :as col]
     [thi.ng.common.error :as err]
     [clojure.string :as str]))