diff --git a/.gitignore b/.gitignore index 3e0df74..a243293 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,9 @@ src/cc/journeyman/the_great_game/cloverage.clj .DS_Store .portal/ + +# Excluding third party resources from the public repo; +# probably ought to list them in the README files. +resources/jme3/images/ +resources/jme3/textures/ +resources/polyhaven/textures/ \ No newline at end of file diff --git a/src/clj/cc/journeyman/architecture.md b/doc/Architecture.md similarity index 93% rename from src/clj/cc/journeyman/architecture.md rename to doc/Architecture.md index 75aeb7e..f9f2c12 100644 --- a/src/clj/cc/journeyman/architecture.md +++ b/doc/Architecture.md @@ -1,10 +1,12 @@ +# Architecture + OK, the basic idea is this Everything (every game object, including the world) is a map. Every object as an :id property; every :id property is distinct. -There is a master map - the `oblist` which contains every object, keyed by its :id. +There is a master map - the `oblist` which contains every object, keyed by its :id. (Actually, there probably can't be such a map in working memory, because there will be too many objects. There will be such a map in the database -- but still keyed by :id). Every object has a :run function, which returns either a new copy of itself or nil, and does not have side effects. diff --git a/project.clj b/project.clj index b562bc9..df18295 100644 --- a/project.clj +++ b/project.clj @@ -11,7 +11,14 @@ :output-path "docs/codox" :source-uri "https://github.com/simon-brooke/the-great-game/blob/master/{filepath}#L{line}"} :cucumber-feature-paths ["test/features/"] - :dependencies [[com.taoensso/timbre "6.5.0"] + :dependencies [ + ;; sadly it seems SQL Korma is dead. I'm experimenting with Honey SQL, + ;; but this is not a final decision yet. + [com.github.seancorfield/honeysql "2.6.1126"] + [com.github.seancorfield/next.jdbc "1.3.925"] + [com.simsilica/lemur "1.16.1-SNAPSHOT"] + [com.simsilica/sim-arboreal "1.0.1-SNAPSHOT"] + [com.taoensso/timbre "6.5.0"] [environ "1.2.0"] [hiccup "2.0.0-RC3"] [jme-clj "0.1.13"] diff --git a/resources/jme3/README.md b/resources/jme3/README.md new file mode 100644 index 0000000..63b83d9 --- /dev/null +++ b/resources/jme3/README.md @@ -0,0 +1,43 @@ +# README for jME3 sourced assets + +These should hold assets sourced from jMonkeyEngine, which are under this +[BSD style license](https://jmonkeyengine.org/license/). + +I'm excluding third party asset files from the public repository for now. +The files here at present are: + +* images/Monkey.jpg +* textures/terrain/brickwall/BrickWall.dds +* textures/terrain/brickwall/BrickWall_dxt5.dds +* textures/terrain/brickwall/BrickWall_height.jpg +* textures/terrain/brickwall/BrickWall.j3m +* textures/terrain/brickwall/BrickWall.jpg +* textures/terrain/brickwall/BrickWall_normal.jpg +* textures/terrain/brickwall/BrickWall_normal_parallax.dds +* textures/terrain/brickwall/BrickWallPBR2.j3m +* textures/terrain/brickwall/BrickWallPBR.j3m +* textures/terrain/pond/Pond.dds +* textures/terrain/pond/Pond_dxt5.dds +* textures/terrain/pond/Pond.j3m +* textures/terrain/pond/Pond.jpg +* textures/terrain/pond/Pond_normal.png +* textures/terrain/rock/Rock.j3m +* textures/terrain/rock/Rock_normal.png +* textures/terrain/rock/Rock.PNG +* textures/terrain/splat/alpha1.png +* textures/terrain/splat/alpha2.png +* textures/terrain/splat/alphamap2.png +* textures/terrain/splat/alphamap.png +* textures/terrain/splat/dirt.jpg +* textures/terrain/splat/dirt_normal.png +* textures/terrain/splat/fortress512.png +* textures/terrain/splat/grass.jpg +* textures/terrain/splat/grass_normal.jpg +* textures/terrain/splat/mountains1024.jpg +* textures/terrain/splat/mountains128.png +* textures/terrain/splat/mountains512.png +* textures/terrain/splat/pools.png +* textures/terrain/splat/road.jpg +* textures/terrain/splat/road_normal.png + +These are all taken from the [jME3 3.6.1-stable distribution zip](https://github.com/jMonkeyEngine/jmonkeyengine/releases/tag/v3.6.1-stable). Feel free to download it if you need them. diff --git a/resources/original/README.md b/resources/original/README.md new file mode 100644 index 0000000..cd30209 --- /dev/null +++ b/resources/original/README.md @@ -0,0 +1,3 @@ +# README for original assets + +These are assets original to The Great Game, and are under this [GNU General Public License, version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html). \ No newline at end of file diff --git a/resources/data/baking/biome-rules.txt b/resources/original/data/baking/biome-rules.txt similarity index 100% rename from resources/data/baking/biome-rules.txt rename to resources/original/data/baking/biome-rules.txt diff --git a/resources/data/baking/settlement-rules.txt b/resources/original/data/baking/settlement-rules.txt similarity index 100% rename from resources/data/baking/settlement-rules.txt rename to resources/original/data/baking/settlement-rules.txt diff --git a/resources/data/crafts.edn b/resources/original/data/crafts.edn similarity index 100% rename from resources/data/crafts.edn rename to resources/original/data/crafts.edn diff --git a/resources/images/splash.jpg b/resources/original/images/splash.jpg similarity index 100% rename from resources/images/splash.jpg rename to resources/original/images/splash.jpg diff --git a/resources/images/splash.png b/resources/original/images/splash.png similarity index 100% rename from resources/images/splash.png rename to resources/original/images/splash.png diff --git a/resources/maps/barra/barra.edn b/resources/original/maps/barra/barra.edn similarity index 100% rename from resources/maps/barra/barra.edn rename to resources/original/maps/barra/barra.edn diff --git a/resources/maps/barra/barra.html b/resources/original/maps/barra/barra.html similarity index 100% rename from resources/maps/barra/barra.html rename to resources/original/maps/barra/barra.html diff --git a/resources/maps/barra/barra.png b/resources/original/maps/barra/barra.png similarity index 100% rename from resources/maps/barra/barra.png rename to resources/original/maps/barra/barra.png diff --git a/resources/maps/barra/barra.xcf b/resources/original/maps/barra/barra.xcf similarity index 100% rename from resources/maps/barra/barra.xcf rename to resources/original/maps/barra/barra.xcf diff --git a/resources/maps/barra/barra_100.edn b/resources/original/maps/barra/barra_100.edn similarity index 100% rename from resources/maps/barra/barra_100.edn rename to resources/original/maps/barra/barra_100.edn diff --git a/resources/maps/barra/barra_100.html b/resources/original/maps/barra/barra_100.html similarity index 100% rename from resources/maps/barra/barra_100.html rename to resources/original/maps/barra/barra_100.html diff --git a/resources/maps/barra/barra_100_edited.edn b/resources/original/maps/barra/barra_100_edited.edn similarity index 100% rename from resources/maps/barra/barra_100_edited.edn rename to resources/original/maps/barra/barra_100_edited.edn diff --git a/resources/maps/barra/barra_101.edn b/resources/original/maps/barra/barra_101.edn similarity index 100% rename from resources/maps/barra/barra_101.edn rename to resources/original/maps/barra/barra_101.edn diff --git a/resources/maps/barra/barra_101.html b/resources/original/maps/barra/barra_101.html similarity index 100% rename from resources/maps/barra/barra_101.html rename to resources/original/maps/barra/barra_101.html diff --git a/resources/maps/heightmap.inverted.png b/resources/original/maps/heightmap.inverted.png similarity index 100% rename from resources/maps/heightmap.inverted.png rename to resources/original/maps/heightmap.inverted.png diff --git a/resources/maps/heightmap.inverted.xcf b/resources/original/maps/heightmap.inverted.xcf similarity index 100% rename from resources/maps/heightmap.inverted.xcf rename to resources/original/maps/heightmap.inverted.xcf diff --git a/resources/maps/heightmap.png b/resources/original/maps/heightmap.png similarity index 100% rename from resources/maps/heightmap.png rename to resources/original/maps/heightmap.png diff --git a/resources/maps/noise.png b/resources/original/maps/noise.png similarity index 100% rename from resources/maps/noise.png rename to resources/original/maps/noise.png diff --git a/resources/maps/noise.xcf b/resources/original/maps/noise.xcf similarity index 100% rename from resources/maps/noise.xcf rename to resources/original/maps/noise.xcf diff --git a/resources/maps/planning-map.svg b/resources/original/maps/planning-map.svg similarity index 100% rename from resources/maps/planning-map.svg rename to resources/original/maps/planning-map.svg diff --git a/resources/test/galloway-biome-20240407.edn b/resources/original/test/galloway-biome-20240407.edn similarity index 100% rename from resources/test/galloway-biome-20240407.edn rename to resources/original/test/galloway-biome-20240407.edn diff --git a/resources/test/galloway-drainage-20240407.edn b/resources/original/test/galloway-drainage-20240407.edn similarity index 100% rename from resources/test/galloway-drainage-20240407.edn rename to resources/original/test/galloway-drainage-20240407.edn diff --git a/resources/test/galloway-populated-20240407.edn b/resources/original/test/galloway-populated-20240407.edn similarity index 100% rename from resources/test/galloway-populated-20240407.edn rename to resources/original/test/galloway-populated-20240407.edn diff --git a/resources/test/sample-npcs-20200408.edn b/resources/original/test/sample-npcs-20200408.edn similarity index 100% rename from resources/test/sample-npcs-20200408.edn rename to resources/original/test/sample-npcs-20200408.edn diff --git a/resources/polyhaven/README.md b/resources/polyhaven/README.md new file mode 100644 index 0000000..0051d2e --- /dev/null +++ b/resources/polyhaven/README.md @@ -0,0 +1,25 @@ +# README for assets sourced from Poly Haven + +This directory should hold assets sourced from [Poly Haven](https://polyhaven.com/), +which are made available under +[Creative Commons Zero (CC0) license](https://creativecommons.org/publicdomain/zero/1.0/). + +These are high quality, but they're also pretty big! For this reason they're +excluded from the public repository. + +Files which are here at present are: + +* from [Pine Bark](https://polyhaven.com/a/pine_bark) + * textures/pine_bark_4k.blend + * textures/pine_bark_diff_4k.jpg + * textures/pine_bark_disp_4k.png + * textures/pine_bark_nor_4k.exr + * textures/pine_bark_rough_4k.blend +* from [Sakura (cherry) bark](https://polyhaven.com/a/sakura_bark): + * textures/sakura_bark_4k.blend + * textures/sakura_bark_diff_4k.jpg + * textures/sakura_bark_disp_4k.png + * textures/sakura_bark_nor_gl_4k.exr + * textures/sakura_bark_rough_4k.exr + +If you need these feel free to download them yourself. \ No newline at end of file diff --git a/resources/textures/Monkey.jpg b/resources/textures/Monkey.jpg deleted file mode 100644 index cfe465d..0000000 Binary files a/resources/textures/Monkey.jpg and /dev/null differ diff --git a/resources/textures/terrain/brickwall/BrickWall.dds b/resources/textures/terrain/brickwall/BrickWall.dds deleted file mode 100644 index 2ac3b8b..0000000 Binary files a/resources/textures/terrain/brickwall/BrickWall.dds and /dev/null differ diff --git a/resources/textures/terrain/brickwall/BrickWall.j3m b/resources/textures/terrain/brickwall/BrickWall.j3m deleted file mode 100644 index 0013c15..0000000 --- a/resources/textures/terrain/brickwall/BrickWall.j3m +++ /dev/null @@ -1,8 +0,0 @@ -Material Pong Rock : Common/MatDefs/Light/Lighting.j3md { - MaterialParameters { - Shininess : 2.0 - DiffuseMap : Repeat Textures/Terrain/BrickWall/BrickWall.dds - NormalMap : Repeat Textures/Terrain/BrickWall/BrickWall_normal_parallax.dds - PackedNormalParallax : true - } -} \ No newline at end of file diff --git a/resources/textures/terrain/brickwall/BrickWall.jpg b/resources/textures/terrain/brickwall/BrickWall.jpg deleted file mode 100644 index c386a0d..0000000 Binary files a/resources/textures/terrain/brickwall/BrickWall.jpg and /dev/null differ diff --git a/resources/textures/terrain/brickwall/BrickWallPBR.j3m b/resources/textures/terrain/brickwall/BrickWallPBR.j3m deleted file mode 100644 index 4d28048..0000000 --- a/resources/textures/terrain/brickwall/BrickWallPBR.j3m +++ /dev/null @@ -1,9 +0,0 @@ -Material Pong Rock PBR : Common/MatDefs/Light/PBRLighting.j3md { - MaterialParameters { - Roughness : 1.0 - Metallic : 0.0 - BaseColorMap : Repeat Textures/Terrain/BrickWall/BrickWall.jpg - NormalMap : Repeat Textures/Terrain/BrickWall/BrickWall_normal_parallax.dds - PackedNormalParallax: true - } -} \ No newline at end of file diff --git a/resources/textures/terrain/brickwall/BrickWallPBR2.j3m b/resources/textures/terrain/brickwall/BrickWallPBR2.j3m deleted file mode 100644 index 38ca15f..0000000 --- a/resources/textures/terrain/brickwall/BrickWallPBR2.j3m +++ /dev/null @@ -1,8 +0,0 @@ -Material Pong Rock PBR : Common/MatDefs/Light/PBRLighting.j3md { - MaterialParameters { - Roughness : 1.0 - Metallic : 0.0 - BaseColorMap : Repeat Textures/Terrain/BrickWall/BrickWall.jpg - ParallaxMap : Repeat Textures/Terrain/BrickWall/BrickWall_height.jpg - } -} \ No newline at end of file diff --git a/resources/textures/terrain/brickwall/BrickWall_dxt5.dds b/resources/textures/terrain/brickwall/BrickWall_dxt5.dds deleted file mode 100644 index 7efe789..0000000 Binary files a/resources/textures/terrain/brickwall/BrickWall_dxt5.dds and /dev/null differ diff --git a/resources/textures/terrain/brickwall/BrickWall_height.jpg b/resources/textures/terrain/brickwall/BrickWall_height.jpg deleted file mode 100644 index 3486674..0000000 Binary files a/resources/textures/terrain/brickwall/BrickWall_height.jpg and /dev/null differ diff --git a/resources/textures/terrain/brickwall/BrickWall_normal.jpg b/resources/textures/terrain/brickwall/BrickWall_normal.jpg deleted file mode 100644 index 249d553..0000000 Binary files a/resources/textures/terrain/brickwall/BrickWall_normal.jpg and /dev/null differ diff --git a/resources/textures/terrain/brickwall/BrickWall_normal_parallax.dds b/resources/textures/terrain/brickwall/BrickWall_normal_parallax.dds deleted file mode 100644 index df93b19..0000000 Binary files a/resources/textures/terrain/brickwall/BrickWall_normal_parallax.dds and /dev/null differ diff --git a/resources/textures/terrain/pond/Pond.dds b/resources/textures/terrain/pond/Pond.dds deleted file mode 100644 index 7470ead..0000000 Binary files a/resources/textures/terrain/pond/Pond.dds and /dev/null differ diff --git a/resources/textures/terrain/pond/Pond.j3m b/resources/textures/terrain/pond/Pond.j3m deleted file mode 100644 index 92bc6a1..0000000 --- a/resources/textures/terrain/pond/Pond.j3m +++ /dev/null @@ -1,11 +0,0 @@ -Material Pong Rock : Common/MatDefs/Light/Lighting.j3md { - MaterialParameters { - DiffuseMap: Repeat Textures/Terrain/Pond/Pond.jpg - NormalMap: Repeat Textures/Terrain/Pond/Pond_normal.png - UseMaterialColors : true - Shininess: 32.0 - Ambient : 0.2 0.2 0.2 1.0 - Diffuse : 0.8 0.8 0.8 1.0 - Specular : 0.3 0.3 0.3 1.0 - } -} diff --git a/resources/textures/terrain/pond/Pond.jpg b/resources/textures/terrain/pond/Pond.jpg deleted file mode 100644 index 177881c..0000000 Binary files a/resources/textures/terrain/pond/Pond.jpg and /dev/null differ diff --git a/resources/textures/terrain/pond/Pond_dxt5.dds b/resources/textures/terrain/pond/Pond_dxt5.dds deleted file mode 100644 index 309f2c7..0000000 Binary files a/resources/textures/terrain/pond/Pond_dxt5.dds and /dev/null differ diff --git a/resources/textures/terrain/pond/Pond_normal.png b/resources/textures/terrain/pond/Pond_normal.png deleted file mode 100644 index 8e566ed..0000000 Binary files a/resources/textures/terrain/pond/Pond_normal.png and /dev/null differ diff --git a/resources/textures/terrain/rock/Rock.PNG b/resources/textures/terrain/rock/Rock.PNG deleted file mode 100644 index 4b5b190..0000000 Binary files a/resources/textures/terrain/rock/Rock.PNG and /dev/null differ diff --git a/resources/textures/terrain/rock/Rock.j3m b/resources/textures/terrain/rock/Rock.j3m deleted file mode 100644 index b2e8256..0000000 --- a/resources/textures/terrain/rock/Rock.j3m +++ /dev/null @@ -1,7 +0,0 @@ -Material Rock : Common/MatDefs/Light/Lighting.j3md { - MaterialParameters { - Shininess: 16.0 - DiffuseMap : Textures/Terrain/Rock/Rock.PNG - NormalMap : Textures/Terrain/Rock/Rock_normal.png - } -} \ No newline at end of file diff --git a/resources/textures/terrain/rock/Rock_normal.png b/resources/textures/terrain/rock/Rock_normal.png deleted file mode 100644 index 48221c0..0000000 Binary files a/resources/textures/terrain/rock/Rock_normal.png and /dev/null differ diff --git a/resources/textures/terrain/splat/alpha1.png b/resources/textures/terrain/splat/alpha1.png deleted file mode 100644 index bb7742f..0000000 Binary files a/resources/textures/terrain/splat/alpha1.png and /dev/null differ diff --git a/resources/textures/terrain/splat/alpha2.png b/resources/textures/terrain/splat/alpha2.png deleted file mode 100644 index 28e48c6..0000000 Binary files a/resources/textures/terrain/splat/alpha2.png and /dev/null differ diff --git a/resources/textures/terrain/splat/alphamap.png b/resources/textures/terrain/splat/alphamap.png deleted file mode 100644 index 14f0a9b..0000000 Binary files a/resources/textures/terrain/splat/alphamap.png and /dev/null differ diff --git a/resources/textures/terrain/splat/alphamap2.png b/resources/textures/terrain/splat/alphamap2.png deleted file mode 100644 index 9367ef6..0000000 Binary files a/resources/textures/terrain/splat/alphamap2.png and /dev/null differ diff --git a/resources/textures/terrain/splat/dirt.jpg b/resources/textures/terrain/splat/dirt.jpg deleted file mode 100644 index 4742068..0000000 Binary files a/resources/textures/terrain/splat/dirt.jpg and /dev/null differ diff --git a/resources/textures/terrain/splat/dirt_normal.png b/resources/textures/terrain/splat/dirt_normal.png deleted file mode 100644 index 2eb57f4..0000000 Binary files a/resources/textures/terrain/splat/dirt_normal.png and /dev/null differ diff --git a/resources/textures/terrain/splat/fortress512.png b/resources/textures/terrain/splat/fortress512.png deleted file mode 100644 index b6b4ed1..0000000 Binary files a/resources/textures/terrain/splat/fortress512.png and /dev/null differ diff --git a/resources/textures/terrain/splat/grass.jpg b/resources/textures/terrain/splat/grass.jpg deleted file mode 100644 index 8d5b97d..0000000 Binary files a/resources/textures/terrain/splat/grass.jpg and /dev/null differ diff --git a/resources/textures/terrain/splat/grass_normal.jpg b/resources/textures/terrain/splat/grass_normal.jpg deleted file mode 100644 index 12de380..0000000 Binary files a/resources/textures/terrain/splat/grass_normal.jpg and /dev/null differ diff --git a/resources/textures/terrain/splat/mountains1024.jpg b/resources/textures/terrain/splat/mountains1024.jpg deleted file mode 100644 index 37d6475..0000000 Binary files a/resources/textures/terrain/splat/mountains1024.jpg and /dev/null differ diff --git a/resources/textures/terrain/splat/mountains128.png b/resources/textures/terrain/splat/mountains128.png deleted file mode 100644 index 4a4dc7c..0000000 Binary files a/resources/textures/terrain/splat/mountains128.png and /dev/null differ diff --git a/resources/textures/terrain/splat/mountains512.png b/resources/textures/terrain/splat/mountains512.png deleted file mode 100644 index 13cb4d1..0000000 Binary files a/resources/textures/terrain/splat/mountains512.png and /dev/null differ diff --git a/resources/textures/terrain/splat/pools.png b/resources/textures/terrain/splat/pools.png deleted file mode 100644 index 22e8b83..0000000 Binary files a/resources/textures/terrain/splat/pools.png and /dev/null differ diff --git a/resources/textures/terrain/splat/road.jpg b/resources/textures/terrain/splat/road.jpg deleted file mode 100644 index 21195e6..0000000 Binary files a/resources/textures/terrain/splat/road.jpg and /dev/null differ diff --git a/resources/textures/terrain/splat/road_normal.png b/resources/textures/terrain/splat/road_normal.png deleted file mode 100644 index ae56480..0000000 Binary files a/resources/textures/terrain/splat/road_normal.png and /dev/null differ diff --git a/src/clj/cc/journeyman/the_great_game/launcher.clj b/src/clj/cc/journeyman/the_great_game/launcher.clj index 30fd510..93d0d50 100644 --- a/src/clj/cc/journeyman/the_great_game/launcher.clj +++ b/src/clj/cc/journeyman/the_great_game/launcher.clj @@ -5,7 +5,7 @@ defsimpleapp fly-cam get-height-map image image-based-height-map load-height-map load-texture material set* start - terrain-lod-control terrain-quad]]) + terrain-lod-control terrain-quad]]) (:import (com.jme3.texture Texture$WrapMode)) (:gen-class)) @@ -34,32 +34,36 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (def cli-options - ;; An option with a required argument - [["-p" "--port PORT" "Port number" - :default 80 - :parse-fn #(Integer/parseInt %) - :validate [#(< 0 % 0x10000) "Must be a number between 0 and 65536"]] - ;; A non-idempotent option (:default is applied first) - ["-v" nil "Verbosity level" + "I haven't yet thought out what command line arguments (if any) I need. + This is a placeholder." + [["-v" nil "Verbosity level" :id :verbosity :default 0 - :update-fn inc] ; Prior to 0.4.1, you would have to use: - ;; :assoc-fn (fn [m k _] (update-in m [k] inc)) - ;; A boolean option defaulting to nil + :update-fn inc] ["-h" "--help"]]) -(defn init [] +(defn init + "Again, placeholder. This initialises a bit of standard jMonkeyEngine + terrain, just to check I have things wired up correctly." + [] (set* (fly-cam) :move-speed 50) - (let [grass (set* (load-texture "textures/terrain/splat/grass.jpg") :wrap Texture$WrapMode/Repeat) - dirt (set* (load-texture "textures/terrain/splat/dirt.jpg") :wrap Texture$WrapMode/Repeat) - rock (set* (load-texture "textures/terrain/splat/road.jpg") :wrap Texture$WrapMode/Repeat) - mat (material "Common/MatDefs/Terrain/Terrain.j3md") - height-map-tex (load-texture "textures/terrain/splat/mountains512.png") - height-map (->> height-map-tex image image-based-height-map load-height-map) - patch-size 65 - terrain (terrain-quad "my terrain" patch-size 513 (get-height-map height-map))] + (let [grass (set* (load-texture "jme3/textures/terrain/splat/grass.jpg") + :wrap Texture$WrapMode/Repeat) + dirt (set* (load-texture "jme3/textures/terrain/splat/dirt.jpg") + :wrap Texture$WrapMode/Repeat) + rock (set* (load-texture "jme3/textures/terrain/splat/road.jpg") + :wrap Texture$WrapMode/Repeat) + mat (material "Common/MatDefs/Terrain/Terrain.j3md") + height-map-tex (load-texture + "jme3/textures/terrain/splat/mountains512.png") + height-map (->> height-map-tex image image-based-height-map + load-height-map) + patch-size 65 + terrain (terrain-quad "my terrain" patch-size 513 + (get-height-map height-map))] (-> mat - (set* :texture "Alpha" (load-texture "textures/terrain/splat/alphamap.png")) + (set* :texture "Alpha" + (load-texture "jme3/textures/terrain/splat/alphamap.png")) (set* :texture "Tex1" grass) (set* :float "Tex1Scale" (float 64)) (set* :texture "Tex2" dirt) @@ -73,15 +77,17 @@ (add-to-root) (add-control (terrain-lod-control terrain (cam)))))) -(defsimpleapp app :init init) +(defsimpleapp game :init init) -(defn -main +(defn -main "Launch the game." [& args] (parse-opts args cli-options) ;; this isn't working, not sure why not. - ;; (.setSettings app (app-settings false :dialog-image "images/splash.png")) + (.setSettings game + (app-settings false + :dialog-image "original/images/splash.png")) - (start app)) + (start game)) \ No newline at end of file