From f92cc42fa10f484e9250c912b21a0c9e510b4cb7 Mon Sep 17 00:00:00 2001 From: oakes Date: Mon, 21 Apr 2014 22:36:10 -0400 Subject: [PATCH] Allow shape entities to coexist with texture entities --- src/play_clj/entities.clj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/play_clj/entities.clj b/src/play_clj/entities.clj index 8c0eb2f..f15a886 100644 --- a/src/play_clj/entities.clj +++ b/src/play_clj/entities.clj @@ -67,17 +67,21 @@ (defrecord ShapeEntity [object] Entity (draw-entity! [{:keys [^ShapeRenderer object type draw! x y z]} {:keys [^Camera camera]} - _] + batch] (let [^Matrix4 m (.getTransformMatrix object) x (float (or x 0)) y (float (or y 0)) z (float (or z 0))] (.setTranslation m x y z)) + (when batch + (.end ^SpriteBatch batch)) (when camera (.setProjectionMatrix object (. camera combined))) (.begin object type) (draw!) - (.end object))) + (.end object) + (when batch + (.begin ^SpriteBatch batch)))) (defrecord BundleEntity [entities] Entity (draw-entity! [{:keys [entities] :as entity} screen batch]