From 3c3529e164e0a5239a68751dfbc414dfb0d03498 Mon Sep 17 00:00:00 2001 From: Marqt Date: Tue, 19 Apr 2016 00:56:39 +0200 Subject: [PATCH] More little improvments in examples Former-commit-id: 82177fe18ec9862159f3fdd22b971091f3e4ca8d --- README.md | 2 +- examples/java/Basic.java | 2 +- examples/java/README.md | 7 +++++-- examples/java/Seed.java | 4 ++-- examples/java/Spectator.java | 2 +- examples/python/README.md | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index de3958c40..c4a0fb712 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Also, for Java binding JAVA_HOME environment variable must be set. ###Windows -We are providing compiled runtime binaries and development libraries for Windows [here](https://github.com/Marqt/ViZDoom/releases/download/1.0.0-rc/ViZDoom-1.0.0-rc-Win-x86_64.zip) +We are providing compiled runtime binaries and development libraries for Windows [here](https://github.com/Marqt/ViZDoom/releases/download/1.0.0/ViZDoom-1.0.0-Win-x86_64.zip). ####Dependencies * CMake 3.0+ diff --git a/examples/java/Basic.java b/examples/java/Basic.java index 9e5ddbcc4..38d5711fd 100644 --- a/examples/java/Basic.java +++ b/examples/java/Basic.java @@ -17,7 +17,7 @@ public static void main (String[] args) { DoomGame game = new DoomGame(); // Sets path to vizdoom engine executive which will be spawned as a separate process. Default is "./vizdoom". - game.setViZDoomPath("../../bin/vizdood"); + game.setViZDoomPath("../../bin/vizdoom"); // Sets path to doom2 iwad resource file which contains the actual doom game-> Default is "./doom2.wad". game.setDoomGamePath("../../scenarios/freedoom2.wad"); diff --git a/examples/java/README.md b/examples/java/README.md index 4be945930..e0d8d9353 100644 --- a/examples/java/README.md +++ b/examples/java/README.md @@ -1,12 +1,15 @@ Use CMake to generate Makefile or project or build it using: ```bash javac -classpath "../../bin/java/vizdoom.jar" Example.java -jar cf ../../bin/examples/example.jar Example.java +jar cf ../../bin/examples/example.jar Example.class ``` Examples will be build in ``vizdoom_root_dir/bin/examples``. To run example use: -``java -Djava.library.path="../java" -classpath "../java/vizdoom.jar:example.jar" Example`` +```bash +java -Djava.library.path="../java" -classpath "../java/vizdoom.jar;example.jar" Example +``` + To run the examples, [freedoom2.wad]( https://freedoom.github.io/download.html) should be placed in the ``scenarios`` subdirectory. diff --git a/examples/java/Seed.java b/examples/java/Seed.java index 2f4085b2b..0e810e585 100644 --- a/examples/java/Seed.java +++ b/examples/java/Seed.java @@ -17,8 +17,8 @@ public static void main (String[] args) { DoomGame game= new DoomGame(); // Choose scenario config file you wish to be watched by agent. - // Don't load two configs cause the second will overwrite the first one. - // Multiple config files are ok but combining these ones doesn't make much sense. + // Don't load two configs cause the second will overwrite the first one. + // Multiple config files are ok but combining these ones doesn't make much sense. //game.loadConfig("../../examples/config/deadly_corridor.cfg") //game.loadConfig("../../examples/config/defend_the_center.cfg") diff --git a/examples/java/Spectator.java b/examples/java/Spectator.java index dc62da1cc..423daaa13 100644 --- a/examples/java/Spectator.java +++ b/examples/java/Spectator.java @@ -21,7 +21,7 @@ public static void main (String[] args) { DoomGame game= new DoomGame(); // Choose scenario config file you wish to watch. - // Don't load two configs cause the second will overrite the first one. + // Don't load two configs cause the second will overwrite the first one. // Multiple config files are ok but combining these ones doesn't make much sense. //game.loadConfig("../../examples/config/basic.cfg"); diff --git a/examples/python/README.md b/examples/python/README.md index a4c5f5d16..d87674b54 100644 --- a/examples/python/README.md +++ b/examples/python/README.md @@ -1,5 +1,5 @@ To run the examples, [freedoom2.wad]( https://freedoom.github.io/download.html) should be placed in the ``scenarios`` subdirectory. -Furthermore, you need to have ``vizdoom.so`` present (or symlinked) in the ``examples/python`` directory (on Linux it should be done automatically by the building process). +Furthermore, you need to have ``vizdoom.so/vizdoom.pyd`` present (or symlinked) in the ``examples/python`` directory (on Linux it should be done automatically by the building process). --- ##Examples