From 3738d867f03d474fae7128caba91e59e7e04fa1f Mon Sep 17 00:00:00 2001
From: oakes <zsoakes@gmail.com>
Date: Sat, 11 Jan 2014 16:04:56 -0500
Subject: [PATCH] Automatically add/remove actors based on entities list

---
 src/play_clj/core.clj        | 27 ++++++++++++---------------
 src/play_clj/core_global.clj |  5 +++++
 src/play_clj/core_render.clj | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/play_clj/core.clj b/src/play_clj/core.clj
index 4287414..92c2471 100644
--- a/src/play_clj/core.clj
+++ b/src/play_clj/core.clj
@@ -24,19 +24,28 @@
 (load "core_global")
 (load "core_render")
 
+(defn ^:private reset-if-changed!
+  [e-atom e-old e-new]
+  (when (not= e-old e-new)
+    (compare-and-set! e-atom e-old e-new)))
+
 (defn defscreen*
   [{:keys [on-show on-render on-hide on-pause on-resize on-resume]
     :as options}]
   (let [screen (atom {})
         entities (atom '())
+        watcher (add-watch entities
+                           :changed
+                           (fn [_ _ _ new-entities]
+                             (refresh-renderer! @screen new-entities)))
         execute-fn! (fn [func & {:keys [] :as options}]
                       (when func
-                        (let [entities-list @entities]
-                          (some->> (func (merge @screen options) entities-list)
+                        (let [old-entities @entities]
+                          (some->> (func (merge @screen options) old-entities)
                                    list
                                    flatten
                                    (remove nil?)
-                                   (compare-and-set! entities entities-list)))))
+                                   (reset-if-changed! entities old-entities)))))
         listeners [(input-processor options execute-fn!)
                    (gesture-detector options execute-fn!)]
         ui-listeners (ui/listeners options execute-fn!)
@@ -100,15 +109,3 @@
 (defn update!
   [{:keys [update-fn!]} & {:keys [] :as args}]
   (update-fn! args))
-
-(defn listen!
-  [{:keys [renderer ui-listeners] :as screen} entities]
-  (assert (isa? (type renderer) Stage))
-  (add-input! renderer)
-  (stage! screen :clear)
-  (doseq [{:keys [object]} entities]
-    (when (isa? (type object) Actor)
-      (stage! screen :add-actor object)
-      (doseq [listener ui-listeners]
-        (.addListener ^Actor object listener))))
-  entities)
diff --git a/src/play_clj/core_global.clj b/src/play_clj/core_global.clj
index f848617..5e6a61b 100644
--- a/src/play_clj/core_global.clj
+++ b/src/play_clj/core_global.clj
@@ -136,3 +136,8 @@
   [^InputProcessor p]
   (let [^InputMultiplexer multi (input! :get-input-processor)]
     (.addProcessor multi p)))
+
+(defn ^:private remove-input!
+  [^InputProcessor p]
+  (let [^InputMultiplexer multi (input! :get-input-processor)]
+    (.removeProcessor multi p)))
diff --git a/src/play_clj/core_render.clj b/src/play_clj/core_render.clj
index 828c41a..cb3e6ee 100644
--- a/src/play_clj/core_render.clj
+++ b/src/play_clj/core_render.clj
@@ -44,6 +44,21 @@
   [screen layer x y]
   (.getCell ^TiledMapTileLayer (tiled-map-layer screen layer) x y))
 
+(defn ^:private refresh-renderer!
+  [{:keys [renderer ui-listeners]} entities]
+  (when (isa? (type renderer) Stage)
+    (doseq [^Actor a (.getActors ^Stage renderer)]
+      (.remove a))
+    (doseq [{:keys [object]} entities]
+      (when (isa? (type object) Actor)
+        (.addActor ^Stage renderer object)
+        (.clearListeners ^Actor object)
+        (doseq [listener ui-listeners]
+          (.addListener ^Actor object listener))))
+    (remove-input! renderer)
+    (add-input! renderer))
+  entities)
+
 ; renderers
 
 (defn tiled-map