Remove fummy function
This commit is contained in:
@@ -31,8 +31,6 @@
|
|||||||
[obj]
|
[obj]
|
||||||
{:type :actor :object obj})
|
{:type :actor :object obj})
|
||||||
|
|
||||||
(defn- dummy [& args])
|
|
||||||
|
|
||||||
(load "core_2d")
|
(load "core_2d")
|
||||||
(load "core_deprecated")
|
(load "core_deprecated")
|
||||||
(load "core_global")
|
(load "core_global")
|
||||||
@@ -42,18 +40,17 @@
|
|||||||
|
|
||||||
(defn defscreen*
|
(defn defscreen*
|
||||||
[{:keys [on-show on-render on-hide on-pause on-resize on-resume]
|
[{:keys [on-show on-render on-hide on-pause on-resize on-resume]
|
||||||
:or {on-show dummy on-render dummy on-hide dummy
|
|
||||||
on-pause dummy on-resize dummy on-resume dummy}
|
|
||||||
:as options}]
|
:as options}]
|
||||||
(let [screen (atom {})
|
(let [screen (atom {})
|
||||||
entities (atom '())
|
entities (atom '())
|
||||||
execute-fn! (fn [func & {:keys [] :as options}]
|
execute-fn! (fn [func & {:keys [] :as options}]
|
||||||
(let [entities-list @entities]
|
(when func
|
||||||
(some->> (func (merge @screen options) entities-list)
|
(let [entities-list @entities]
|
||||||
list
|
(some->> (func (merge @screen options) entities-list)
|
||||||
flatten
|
list
|
||||||
(remove nil?)
|
flatten
|
||||||
(compare-and-set! entities entities-list))))
|
(remove nil?)
|
||||||
|
(compare-and-set! entities entities-list)))))
|
||||||
create-renderer-fn! #(swap! screen assoc :renderer (renderer %))
|
create-renderer-fn! #(swap! screen assoc :renderer (renderer %))
|
||||||
update-fn! #(swap! screen merge %)]
|
update-fn! #(swap! screen merge %)]
|
||||||
{:screen screen
|
{:screen screen
|
||||||
@@ -83,10 +80,10 @@
|
|||||||
(defonce ~n (defscreen* fns#))))
|
(defonce ~n (defscreen* fns#))))
|
||||||
|
|
||||||
(defn defgame*
|
(defn defgame*
|
||||||
[{:keys [on-create] :or {on-create dummy}}]
|
[{:keys [on-create]}]
|
||||||
(proxy [Game] []
|
(proxy [Game] []
|
||||||
(create []
|
(create []
|
||||||
(on-create this))))
|
(when on-create (on-create this)))))
|
||||||
|
|
||||||
(defmacro defgame
|
(defmacro defgame
|
||||||
[n & {:keys [] :as options}]
|
[n & {:keys [] :as options}]
|
||||||
|
|||||||
@@ -45,11 +45,7 @@
|
|||||||
|
|
||||||
(defn- input-processor
|
(defn- input-processor
|
||||||
[{:keys [on-key-down on-key-typed on-key-up on-mouse-moved
|
[{:keys [on-key-down on-key-typed on-key-up on-mouse-moved
|
||||||
on-scrolled on-touch-down on-touch-dragged on-touch-up]
|
on-scrolled on-touch-down on-touch-dragged on-touch-up]}
|
||||||
:or {on-key-down dummy on-key-typed dummy
|
|
||||||
on-key-up dummy on-mouse-moved dummy
|
|
||||||
on-scrolled dummy on-touch-down dummy
|
|
||||||
on-touch-dragged dummy on-touch-up dummy}}
|
|
||||||
execute-fn!]
|
execute-fn!]
|
||||||
(reify InputProcessor
|
(reify InputProcessor
|
||||||
(keyDown [this k]
|
(keyDown [this k]
|
||||||
@@ -78,9 +74,7 @@
|
|||||||
false)))
|
false)))
|
||||||
|
|
||||||
(defn- gesture-detector
|
(defn- gesture-detector
|
||||||
[{:keys [on-fling on-long-press on-pan on-pan-stop on-pinch on-tap on-zoom]
|
[{:keys [on-fling on-long-press on-pan on-pan-stop on-pinch on-tap on-zoom]}
|
||||||
:or {on-fling dummy on-long-press dummy on-pan dummy on-pan-stop dummy
|
|
||||||
on-pinch dummy on-tap dummy on-zoom dummy}}
|
|
||||||
execute-fn!]
|
execute-fn!]
|
||||||
(let [listener
|
(let [listener
|
||||||
(reify GestureDetector$GestureListener
|
(reify GestureDetector$GestureListener
|
||||||
|
|||||||
Reference in New Issue
Block a user