Simplify macros

This commit is contained in:
oakes
2014-01-15 16:12:01 -05:00
parent 868fabc3ed
commit 72a1d51009

View File

@@ -10,9 +10,7 @@
(defmacro tiled-map (defmacro tiled-map
[s & options] [s & options]
`(let [object# (tiled-map* ~s)] `(u/calls! ^TiledMap (tiled-map* ~s) ~@options))
(u/calls! ^TiledMap object# ~@options)
object#))
(defmacro tiled-map! (defmacro tiled-map!
[{:keys [^BatchTiledMapRenderer renderer]} k & options] [{:keys [^BatchTiledMapRenderer renderer]} k & options]
@@ -35,9 +33,7 @@
(defmacro tiled-map-layer (defmacro tiled-map-layer
[screen layer & options] [screen layer & options]
`(let [object# (tiled-map-layer* ~screen ~layer)] `(u/calls! ^TiledMapTileLayer (tiled-map-layer* ~screen ~layer) ~@options))
(u/calls! ^TiledMapTileLayer object# ~@options)
object#))
(defmacro tiled-map-layer! (defmacro tiled-map-layer!
[layer k & options] [layer k & options]
@@ -49,9 +45,8 @@
(defmacro tiled-map-cell (defmacro tiled-map-cell
[screen layer x y & options] [screen layer x y & options]
`(let [object# (tiled-map-cell* ~screen ~layer ~x ~y)] `(u/calls! ^TiledMapTileLayer$Cell (tiled-map-cell* ~screen ~layer ~x ~y)
(u/calls! ^TiledMapTileLayer$Cell object# ~@options) ~@options))
object#))
(defmacro tiled-map-cell! (defmacro tiled-map-cell!
[cell k & options] [cell k & options]
@@ -78,9 +73,8 @@
(defmacro orthogonal-tiled-map (defmacro orthogonal-tiled-map
[path unit & options] [path unit & options]
`(let [object# (orthogonal-tiled-map* ~path ~unit)] `(u/calls! ^OrthogonalTiledMapRenderer (orthogonal-tiled-map* ~path ~unit)
(u/calls! ^OrthogonalTiledMapRenderer object# ~@options) ~@options))
object#))
(defmacro orthogonal-tiled-map! (defmacro orthogonal-tiled-map!
[screen k & options] [screen k & options]
@@ -92,9 +86,8 @@
(defmacro isometric-tiled-map (defmacro isometric-tiled-map
[path unit & options] [path unit & options]
`(let [object# (isometric-tiled-map* ~path ~unit)] `(u/calls! ^IsometricTiledMapRenderer (isometric-tiled-map* ~path ~unit)
(u/calls! ^IsometricTiledMapRenderer object# ~@options) ~@options))
object#))
(defmacro isometric-tiled-map! (defmacro isometric-tiled-map!
[screen k & options] [screen k & options]
@@ -106,9 +99,9 @@
(defmacro isometric-staggered-tiled-map (defmacro isometric-staggered-tiled-map
[path unit & options] [path unit & options]
`(let [object# (isometric-staggered-tiled-map* ~path ~unit)] `(u/calls! ^IsometricStaggeredTiledMapRenderer
(u/calls! ^IsometricStaggeredTiledMapRenderer object# ~@options) (isometric-staggered-tiled-map* ~path ~unit)
object#)) ~@options))
(defmacro isometric-staggered-tiled-map! (defmacro isometric-staggered-tiled-map!
[screen k & options] [screen k & options]
@@ -121,9 +114,8 @@
(defmacro hexagonal-tiled-map (defmacro hexagonal-tiled-map
[path unit & options] [path unit & options]
`(let [object# (hexagonal-tiled-map* ~path ~unit)] `(u/calls! ^HexagonalTiledMapRenderer (hexagonal-tiled-map* ~path ~unit)
(u/calls! ^HexagonalTiledMapRenderer object# ~@options) ~@options))
object#))
(defmacro hexagonal-tiled-map! (defmacro hexagonal-tiled-map!
[screen k & options] [screen k & options]
@@ -135,9 +127,7 @@
(defmacro stage (defmacro stage
[& options] [& options]
`(let [object# (stage*)] `(u/calls! ^Stage (stage*) ~@options))
(u/calls! ^Stage object# ~@options)
object#))
(defmacro stage! (defmacro stage!
[screen k & options] [screen k & options]
@@ -167,9 +157,7 @@
(defmacro orthographic-camera (defmacro orthographic-camera
[& options] [& options]
`(let [object# (orthographic-camera*)] `(u/calls! ^OrthographicCamera (orthographic-camera*) ~@options))
(u/calls! ^OrthographicCamera object# ~@options)
object#))
(defmacro orthographic-camera! (defmacro orthographic-camera!
[screen k & options] [screen k & options]
@@ -181,9 +169,7 @@
(defmacro perspective-camera (defmacro perspective-camera
[& options] [& options]
`(let [object# (perspective-camera*)] `(u/calls! ^PerspectiveCamera (perspective-camera*) ~@options))
(u/calls! ^PerspectiveCamera object# ~@options)
object#))
(defmacro perspective-camera! (defmacro perspective-camera!
[screen k & options] [screen k & options]