notid/play-clj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the tiled-map* conditional to the renderer constructors

Browse Source
This commit is contained in:
oakes
2014-09-27 00:40:48 -04:00
parent 5d90389c27
commit 00fced3317
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/play_clj/core_graphics.clj
View File

@@ -94,11 +94,9 @@ complicated shapes. If you use `assoc` to set the overall :x and :y of the
(defn tiled-map* (defn tiled-map*
([] ([]
(TiledMap.)) (TiledMap.))
([s] ([^String path]
(if (string? s) (or (u/load-asset path TiledMap)
(or (u/load-asset s TiledMap) (.load (TmxMapLoader.) path))))
(.load (TmxMapLoader.) s))
s)))
(defmacro tiled-map (defmacro tiled-map
"Returns a [TiledMap](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/TiledMap.html). "Returns a [TiledMap](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/TiledMap.html).
@@ -368,7 +366,10 @@ screen coordinates.
(defn orthogonal-tiled-map* (defn orthogonal-tiled-map*
[path unit] [path unit]
(OrthogonalTiledMapRenderer. ^TiledMap (tiled-map* path) ^double unit)) (OrthogonalTiledMapRenderer. ^TiledMap (if (string? path)
(tiled-map* path)
path)
^double unit))
(defmacro orthogonal-tiled-map (defmacro orthogonal-tiled-map
"Returns an [OrthogonalTiledMapRenderer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/renderers/OrthogonalTiledMapRenderer.html) "Returns an [OrthogonalTiledMapRenderer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/renderers/OrthogonalTiledMapRenderer.html)
@@ -387,7 +388,10 @@ with the tiled map file at `path` and `unit` scale.
(defn isometric-tiled-map* (defn isometric-tiled-map*
[path unit] [path unit]
(IsometricTiledMapRenderer. ^TiledMap (tiled-map* path) ^double unit)) (IsometricTiledMapRenderer. ^TiledMap (if (string? path)
(tiled-map* path)
path)
^double unit))
(defmacro isometric-tiled-map (defmacro isometric-tiled-map
"Returns an [IsometricTiledMapRenderer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/renderers/IsometricTiledMapRenderer.html) "Returns an [IsometricTiledMapRenderer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/renderers/IsometricTiledMapRenderer.html)
@@ -406,7 +410,9 @@ with the tiled map file at `path` and `unit` scale.
(defn isometric-staggered-tiled-map* (defn isometric-staggered-tiled-map*
[path unit] [path unit]
(IsometricStaggeredTiledMapRenderer. ^TiledMap (tiled-map* path) (IsometricStaggeredTiledMapRenderer. ^TiledMap (if (string? path)
(tiled-map* path)
path)
^double unit)) ^double unit))
(defmacro isometric-staggered-tiled-map (defmacro isometric-staggered-tiled-map
@@ -428,7 +434,10 @@ with the tiled map file at `path` and `unit` scale.
(defn hexagonal-tiled-map* (defn hexagonal-tiled-map*
[path unit] [path unit]
(HexagonalTiledMapRenderer. ^TiledMap (tiled-map* path) ^double unit)) (HexagonalTiledMapRenderer. ^TiledMap (if (string? path)
(tiled-map* path)
path)
^double unit))
(defmacro hexagonal-tiled-map (defmacro hexagonal-tiled-map
"Returns a [HexagonalTiledMapRenderer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/renderers/HexagonalTiledMapRenderer.html) "Returns a [HexagonalTiledMapRenderer](http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/maps/tiled/renderers/HexagonalTiledMapRenderer.html)