notid/play-clj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix defscreen to allow adding new screen functions in a REPL session

Browse Source
This commit is contained in:
oakes
2014-03-21 14:51:32 -04:00
parent 14ba95d670
commit 8dd9024fc7
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/play_clj/core.clj
View File

@@ -41,11 +41,10 @@
(defn defscreen* (defn defscreen*
"Internal use only" "Internal use only"
[{:keys [on-show on-render on-hide on-pause on-resize on-resume on-timer] [{:keys [screen entities
on-show on-render on-hide on-pause on-resize on-resume on-timer]
:as options}] :as options}]
(let [screen (atom {}) (let [execute-fn! (fn [func & {:keys [] :as options}]
entities (atom [])
execute-fn! (fn [func & {:keys [] :as options}]
(when func (when func
(let [old-entities @entities] (let [old-entities @entities]
(some->> (func (merge @screen options) old-entities) (some->> (func (merge @screen options) old-entities)
@@ -85,11 +84,20 @@
replaced by simply reloading the namespace, and creates a var for the symbol `n` replaced by simply reloading the namespace, and creates a var for the symbol `n`
bound to a map containing various important values related to the screen" bound to a map containing various important values related to the screen"
[n & {:keys [] :as options}] [n & {:keys [] :as options}]
`(let [fns# (->> (for [[k# v#] ~options] `(let [fn-syms# (->> (for [[k# v#] ~options]
[k# (intern *ns* (symbol (str '~n "-" (name k#))) v#)]) [k# (intern *ns* (symbol (str '~n "-" (name k#))) v#)])
flatten flatten
(apply hash-map))] (apply hash-map))
(defonce ~n (defscreen* fns#)))) map-sym# (symbol (str '~n "-map"))
entities-sym# (symbol (str '~n "-entities"))
syms# (assoc fn-syms#
:screen (deref
(or (resolve map-sym#)
(intern *ns* map-sym# (atom {}))))
:entities (deref
(or (resolve entities-sym#)
(intern *ns* entities-sym# (atom [])))))]
(def ~n (defscreen* syms#))))
(defn defgame* (defn defgame*
"Internal use only" "Internal use only"