From 1540623029bc115d4b444b5a7483840db713c860 Mon Sep 17 00:00:00 2001 From: oakes Date: Tue, 1 Apr 2014 13:10:38 -0400 Subject: [PATCH] Always use :as when destructuring --- src/play_clj/core_graphics.clj | 2 +- src/play_clj/g2d.clj | 4 ++-- src/play_clj/g2d_physics.clj | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/play_clj/core_graphics.clj b/src/play_clj/core_graphics.clj index 36784f6..a9b2699 100644 --- a/src/play_clj/core_graphics.clj +++ b/src/play_clj/core_graphics.clj @@ -288,7 +288,7 @@ specify which layers to render with or without. (defn render-stage! "Calls the stage renderer from `screen`." - [{:keys [^Stage renderer ^Camera camera]}] + [{:keys [^Stage renderer ^Camera camera] :as screen}] (when camera (.setCamera renderer camera) (.setViewport renderer (. camera viewportWidth) (. camera viewportHeight))) diff --git a/src/play_clj/g2d.clj b/src/play_clj/g2d.clj index 8ccbfd4..0af9bf0 100644 --- a/src/play_clj/g2d.clj +++ b/src/play_clj/g2d.clj @@ -166,7 +166,7 @@ time the `screen` has been showing. (animation->texture screen anim)" - ([{:keys [total-time]} ^Animation animation] + ([{:keys [total-time] :as screen} ^Animation animation] (texture* (.getKeyFrame animation total-time true))) - ([{:keys [total-time]} ^Animation animation is-looping?] + ([{:keys [total-time] :as screen} ^Animation animation is-looping?] (texture* (.getKeyFrame animation total-time is-looping?)))) diff --git a/src/play_clj/g2d_physics.clj b/src/play_clj/g2d_physics.clj index edd1ff8..18e2f5d 100644 --- a/src/play_clj/g2d_physics.clj +++ b/src/play_clj/g2d_physics.clj @@ -232,7 +232,8 @@ "Runs the physics simulations for a single frame and optionally returns the `entities` with their positions updated." ([{:keys [world time-step velocity-iterations position-iterations] - :or {time-step (/ 1 60) velocity-iterations 10 position-iterations 10}}] + :or {time-step (/ 1 60) velocity-iterations 10 position-iterations 10} + :as screen}] (assert world) (cond (isa? (type world) World)