simon/mw-engine
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

small fixes arising out of lein ancient changes

Browse source
This commit is contained in:
Simon Brooke 2017-12-04 17:09:41 +00:00
parent 581a9d97cd
commit 4a0c10fb7a
5 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
project.clj
View file

@ -15,7 +15,6 @@
:dependencies [[org.clojure/clojure "1.8.0"]
[org.clojure/math.combinatorics "0.1.4"]
[org.clojure/tools.trace "0.7.9"]
[org.clojure/tools.namespace "0.2.10"]
[org.clojure/tools.namespace "0.2.11"]
[hiccup "1.0.5"]
[net.mikera/imagez "0.12.0"]
[fivetonine/collage "0.2.0"]])
[net.mikera/imagez "0.12.0"]])

9
src/mw_engine/heightmap.clj
View file

@ -2,8 +2,7 @@
:author "Simon Brooke"}
mw-engine.heightmap
(:import [java.awt.image BufferedImage])
(:require [fivetonine.collage.util :as collage :only [load-image]]
[mikera.image.core :as imagez :only [filter-image get-pixels]]
(:require [mikera.image.core :as imagez :only [filter-image get-pixels]]
[mikera.image.filters :as filters]
[mw-engine.utils :refer [abs get-int get-neighbours map-world]]
[mw-engine.world :refer [make-world]]))
@ -107,14 +106,14 @@
* `imagepath` a file path or URL which indicates an (ideally greyscale) image file."
([world imagepath]
(let [heightmap (imagez/filter-image
(imagez/load-image-resource imagepath)
(imagez/load-image imagepath)
(filters/grayscale))]
(map-world
(map-world world tag-altitude (list heightmap))
tag-gradient)))
([imagepath]
(let [heightmap (imagez/filter-image
(imagez/load-image-resource imagepath)
(imagez/load-image imagepath)
(filters/grayscale))
world (make-world (.getWidth heightmap) (.getHeight heightmap))]
(map-world
@ -132,6 +131,6 @@
intensity of the corresponding cell of the image."
[world imagepath property]
(let [heightmap (imagez/filter-image
(imagez/load-image-resource imagepath)
(imagez/load-image imagepath)
(filters/grayscale))]
(map-world world tag-property (list property heightmap))))

2
src/mw_engine/utils.clj
View file

@ -112,7 +112,7 @@
([world function additional-args]
(into []
(pmap (fn [row]
(into [] (mapv
(into [] (map
#(apply function
(cons world (cons % additional-args)))
row)))

6
test/mw_engine/heightmap_test.clj
View file

@ -7,7 +7,7 @@
(deftest apply-heightmap-test
(testing "Heightmap functionality"
(let [world (apply-heightmap "heightmaps/test9x9.png")
(let [world (apply-heightmap "resources/heightmaps/test9x9.png")
altitudes (map #(:altitude %) (flatten world))
gradients (map #(:gradient %) (flatten world))]
(is (= (count world) 9) "World should be 9x9")
@ -22,7 +22,7 @@
(is (> (apply + gradients) 0)
"At least some gradients must be positive, none should be negative"))
;; alternate means of making the world, same tests.
(let [world (apply-heightmap (world/make-world 9 9) "heightmaps/test9x9.png")
(let [world (apply-heightmap (world/make-world 9 9) "resources/heightmaps/test9x9.png")
altitudes (map #(:altitude %) (flatten world))
gradients (map #(:gradient %) (flatten world))]
(is (= (count world) 9) "World should be 9x9")
@ -42,7 +42,7 @@
(deftest apply-valuemap-test
(testing "Valuemap functionality"
(let [image "heightmaps/test9x9.png"
(let [image "resources/heightmaps/test9x9.png"
world (apply-valuemap (apply-heightmap image) image :arbitrary)
altitudes (map #(:altitude %) (flatten world))
arbitraries (map #(:arbitrary %) (flatten world))]