Small fixes that somehow crop up on linux

CmdrDats · Oct 18, 2021 · 628d32f · 628d32f
1 parent 6139e10
commit 628d32f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/src/igoki/game.clj b/src/igoki/game.clj
@@ -294,15 +294,15 @@
         board-size (* cellsize (dec size))
         extent (+ grid-start board-size)
         tx (+ (lq/height) (/ cellsize 2))
-        visiblepath (take movenumber (mapcat identity (:current-branch-path game)))
+        visiblepath (take (or movenumber 0) (mapcat identity (:current-branch-path game)))
         actionlist (sgf/current-branch-node-list [visiblepath] (:moves game))
         lastmove (last actionlist)
         canvas-size (max 250 (min (lq/width) (lq/height)))]
 
     (lq/shadow-text (str "Recording: Img #" (:camidx game)) tx 25)
     (when (:filename game)
       (lq/shadow-text (:filename game) tx 50))
-    (lq/shadow-text (str "Move " (inc movenumber) ", " (if (= (:player-turn constructed) :black) "Black" "White") " to play") tx 75)
+    (lq/shadow-text (str "Move " (inc (or movenumber 0)) ", " (if (= (:player-turn constructed) :black) "Black" "White") " to play") tx 75)
     (lq/shadow-text "<P> Pass" tx 225)
 
 

diff --git a/src/igoki/simulated.clj b/src/igoki/simulated.clj
@@ -89,19 +89,23 @@
 
 (defn simulate []
   (let [context @simctx]
+
     (if (= (:mode context) :replay)
-      (swap! simctx
-             update :camera assoc
-             :raw (-> context :camera :raw)
-             :pimg (util/mat-to-pimage (-> context :camera :raw)
-                     (-> context :camera :pimg :bufimg)))
-      (let [m (.clone (-> context :sim :background))]
-        (draw-board m)
+      (when (-> context :camera :raw)
         (swap! simctx
-               update :camera assoc
-               :raw m
-               :pimg (util/mat-to-pimage m
-                       (-> context :camera :pimg :bufimg)))))))
+          update :camera assoc
+          :raw (-> context :camera :raw)
+          :pimg (util/mat-to-pimage (-> context :camera :raw)
+                  (-> context :camera :pimg :bufimg))))
+      (when (-> context :sim :background)
+        (let [m (.clone (-> context :sim :background))]
+          (draw-board m)
+          (swap! simctx
+            update :camera assoc
+            :raw m
+            :pimg
+            (util/mat-to-pimage m
+              (-> context :camera :pimg :bufimg))))))))
 
 
 (defn next-stone [{:keys [next mode]}]

diff --git a/src/igoki/ui.clj b/src/igoki/ui.clj
@@ -119,18 +119,19 @@
           (doseq [l (:pre-read-listeners camera)]
             (l ctx))
 
-          (.read video frame)
-
-          (doseq [l (:post-read-listeners camera)]
-            (l ctx))
-
-          (swap!
-            ctx update :camera
-            #(assoc %
-               :raw frame
-               ;; TODO: this chows memory - better to have a hook on update for each specific
-               ;; view - this will only be needed on the first screen.
-               :pimg (util/mat-to-pimage frame (get-in % [:pimg :bufimg])))))
+          (when
+            (.read video frame)
+
+            (doseq [l (:post-read-listeners camera)]
+              (l ctx))
+
+            (swap!
+              ctx update :camera
+              #(assoc %
+                 :raw frame
+                 ;; TODO: this chows memory - better to have a hook on update for each specific
+                 ;; view - this will only be needed on the first screen.
+                 :pimg (util/mat-to-pimage frame (get-in % [:pimg :bufimg]))))))
         (Thread/sleep (or (-> @ctx :camera :read-delay) 1000))
         (catch Exception e
           (println "exception thrown")