Clean up draw-entity! functions

This commit is contained in:
oakes
2014-01-18 04:56:45 -05:00
parent 10621a3204
commit 4d3a79ea74

View File

@@ -169,12 +169,12 @@
; rendering ; rendering
(defmulti draw-entity! #(-> % second :type)) (defmulti draw-entity! (fn [_ entity] (:type entity)))
(defmethod draw-entity! nil [_]) (defmethod draw-entity! nil [_ _])
(defmethod draw-entity! :actor (defmethod draw-entity! :actor
[[^SpriteBatch batch {:keys [^Actor object] :as entity}]] [^SpriteBatch batch {:keys [^Actor object] :as entity}]
(assert object) (assert object)
(doseq [[k v] entity] (doseq [[k v] entity]
(case k (case k
@@ -186,8 +186,8 @@
(.draw object batch 1)) (.draw object batch 1))
(defmethod draw-entity! :texture (defmethod draw-entity! :texture
[[^SpriteBatch batch {:keys [^TextureRegion object x y width height] [^SpriteBatch batch {:keys [^TextureRegion object x y width height]
:or {x 0 y 0 width 0 height 0}}]] :or {x 0 y 0 width 0 height 0}}]
(assert object) (assert object)
(.draw batch object (float x) (float y) (float width) (float height))) (.draw batch object (float x) (float y) (float width) (float height)))
@@ -196,7 +196,7 @@
(let [^SpriteBatch batch (batch screen)] (let [^SpriteBatch batch (batch screen)]
(.begin batch) (.begin batch)
(doseq [entity entities] (doseq [entity entities]
(draw-entity! [batch entity])) (draw-entity! batch entity))
(.end batch)) (.end batch))
entities) entities)