Merge remote-tracking branch 'oakes/master'

This commit is contained in:
2015-02-20 11:33:32 -08:00
36 changed files with 389 additions and 216 deletions

View File

@@ -478,7 +478,7 @@ with the tiled map file at `path` and `unit` scale.
(defmethod draw! BatchTiledMapRenderer
[{:keys [^BatchTiledMapRenderer renderer] :as screen} entities]
(let [^Batch batch (.getSpriteBatch renderer)]
(let [^Batch batch (.getBatch renderer)]
(.begin batch)
(doseq [entity entities]
(e/draw! entity screen batch))
@@ -610,7 +610,7 @@ to overlap correctly with the entities.
(when-not (get-in screen [:layers ln])
(update-fn! assoc-in [:layers ln] (split-layer screen ln))))
(when camera (.setView renderer camera))
(let [^Batch batch (.getSpriteBatch renderer)]
(let [^Batch batch (.getBatch renderer)]
(.begin batch)
(doseq [entity (->> (map #(get-in screen [:layers %]) layer-names)
(apply concat entities)