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

Shorten function name

Browse Source
This commit is contained in:
oakes
2014-02-12 17:55:31 -05:00
parent c110f07deb
commit a234f2275e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/play_clj/core_graphics.clj
View File

@@ -101,11 +101,11 @@ from the tiled map in `screen` from the given `layer` and position `x` and `y`
:width (.get prop "width") :width (.get prop "width")
:height (.get prop "height")})) :height (.get prop "height")}))
(defn screen->isometric-map (defn screen->isometric
"Returns a copy of the provided map with x/y values converted from screen "Returns a copy of the provided map with x/y values converted from screen
to isometric map coordinates to isometric map coordinates
(screen->isometric-map screen {:x 64 :y 32})" (screen->isometric screen {:x 64 :y 32})"
[screen {:keys [x y] :as entity}] [screen {:keys [x y] :as entity}]
(let [{:keys [unit-scale tile-width tile-height]} (tiled-map-prop screen) (let [{:keys [unit-scale tile-width tile-height]} (tiled-map-prop screen)
half-tile-width (/ (* tile-width unit-scale) 2) half-tile-width (/ (* tile-width unit-scale) 2)
@@ -118,11 +118,11 @@ to isometric map coordinates
(/ x half-tile-width)) (/ x half-tile-width))
2)))) 2))))
(defn isometric-map->screen (defn isometric->screen
"Returns a copy of the provided map with x/y values converted from isometric "Returns a copy of the provided map with x/y values converted from isometric
map to screen coordinates map to screen coordinates
(isometric-map->screen screen {:x 2 :y 1})" (isometric->screen screen {:x 2 :y 1})"
[screen {:keys [x y] :as entity}] [screen {:keys [x y] :as entity}]
(let [{:keys [unit-scale tile-width tile-height]} (tiled-map-prop screen) (let [{:keys [unit-scale tile-width tile-height]} (tiled-map-prop screen)
half-tile-width (/ (* tile-width unit-scale) 2) half-tile-width (/ (* tile-width unit-scale) 2)
@@ -382,7 +382,7 @@ specify which layers to render with or without
[screen layer-name] [screen layer-name]
(let [^TiledMapTileLayer l (tiled-map-layer screen layer-name)] (let [^TiledMapTileLayer l (tiled-map-layer screen layer-name)]
(reduce (fn [layers {:keys [x y] :as map-tile}] (reduce (fn [layers {:keys [x y] :as map-tile}]
(let [screen-tile (isometric-map->screen screen map-tile) (let [screen-tile (isometric->screen screen map-tile)
new-layer (or (->> layers (filter #(= y (:y %))) first) new-layer (or (->> layers (filter #(= y (:y %))) first)
(assoc screen-tile :layer (create-layer l)))] (assoc screen-tile :layer (create-layer l)))]
(->> (tiled-map-layer! l :get-cell x y) (->> (tiled-map-layer! l :get-cell x y)