From 3c578d21a601007d63d844509b8fff450afcb186 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Mon, 14 Dec 2015 12:46:18 -0500 Subject: [PATCH] contrib: move lib/gamnit/examples/asteronits to contrib/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- .../examples => contrib}/asteronits/Makefile | 9 +++++---- .../examples => contrib}/asteronits/README.md | 0 .../asteronits/art/controls.svg | 0 .../examples => contrib}/asteronits/art/icon.svg | 0 .../examples => contrib}/asteronits/art/sheet.xml | 0 .../asteronits/assets/.gitignore | 0 .../asteronits/assets/images/sheet.png | Bin 147484 -> 147484 bytes .../examples => contrib}/asteronits/bin/.gitignore | 0 .../asteronits/org.nitlanguage.asteronits.txt | 0 .../examples => contrib}/asteronits/package.ini | 0 .../examples => contrib}/asteronits/res/.gitignore | 0 .../examples => contrib}/asteronits/src/.gitignore | 0 .../asteronits/src/asteronits.nit | 0 .../asteronits/src/game_logic.nit | 0 .../asteronits/src/texture_atlas_parser.nit | 0 .../asteronits/src/touch_ui.nit | 0 lib/gamnit/simple_2d.nit | 2 +- 17 files changed, 6 insertions(+), 5 deletions(-) rename {lib/gamnit/examples => contrib}/asteronits/Makefile (78%) rename {lib/gamnit/examples => contrib}/asteronits/README.md (100%) rename {lib/gamnit/examples => contrib}/asteronits/art/controls.svg (100%) rename {lib/gamnit/examples => contrib}/asteronits/art/icon.svg (100%) rename {lib/gamnit/examples => contrib}/asteronits/art/sheet.xml (100%) rename {lib/gamnit/examples => contrib}/asteronits/assets/.gitignore (100%) rename {lib/gamnit/examples => contrib}/asteronits/assets/images/sheet.png (100%) rename {lib/gamnit/examples => contrib}/asteronits/bin/.gitignore (100%) rename {lib/gamnit/examples => contrib}/asteronits/org.nitlanguage.asteronits.txt (100%) rename {lib/gamnit/examples => contrib}/asteronits/package.ini (100%) rename {lib/gamnit/examples => contrib}/asteronits/res/.gitignore (100%) rename {lib/gamnit/examples => contrib}/asteronits/src/.gitignore (100%) rename {lib/gamnit/examples => contrib}/asteronits/src/asteronits.nit (100%) rename {lib/gamnit/examples => contrib}/asteronits/src/game_logic.nit (100%) rename {lib/gamnit/examples => contrib}/asteronits/src/texture_atlas_parser.nit (100%) rename {lib/gamnit/examples => contrib}/asteronits/src/touch_ui.nit (100%) diff --git a/lib/gamnit/examples/asteronits/Makefile b/contrib/asteronits/Makefile similarity index 78% rename from lib/gamnit/examples/asteronits/Makefile rename to contrib/asteronits/Makefile index dae31dd..c4cedc4 100644 --- a/lib/gamnit/examples/asteronits/Makefile +++ b/contrib/asteronits/Makefile @@ -1,5 +1,5 @@ -NITC=../../../../bin/nitc -NITLS=../../../../bin/nitls +NITC=../../bin/nitc +NITLS=../../bin/nitls all: bin/asteronits @@ -10,7 +10,8 @@ bin/texture_atlas_parser: src/texture_atlas_parser.nit ${NITC} src/texture_atlas_parser.nit -o $@ src/controls.nit: art/controls.svg - ../../../../contrib/inkscape_tools/bin/svg_to_png_and_nit art/controls.svg -a assets/ -s src/ -x 2.0 -g + make -C ../inkscape_tools/ + ../inkscape_tools/bin/svg_to_png_and_nit art/controls.svg -a assets/ -s src/ -x 2.0 -g src/spritesheet_city.nit: bin/texture_atlas_parser bin/texture_atlas_parser art/sheet.xml --dir src/ -n spritesheet @@ -31,4 +32,4 @@ android-release: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} res/dra ${NITC} src/touch_ui.nit -m android -o bin/asteronits.apk --release res/drawable-hdpi/icon.png: art/icon.svg - ../../../../contrib/inkscape_tools/bin/svg_to_icons --out res --android art/icon.svg + ../inkscape_tools/bin/svg_to_icons --out res --android art/icon.svg diff --git a/lib/gamnit/examples/asteronits/README.md b/contrib/asteronits/README.md similarity index 100% rename from lib/gamnit/examples/asteronits/README.md rename to contrib/asteronits/README.md diff --git a/lib/gamnit/examples/asteronits/art/controls.svg b/contrib/asteronits/art/controls.svg similarity index 100% rename from lib/gamnit/examples/asteronits/art/controls.svg rename to contrib/asteronits/art/controls.svg diff --git a/lib/gamnit/examples/asteronits/art/icon.svg b/contrib/asteronits/art/icon.svg similarity index 100% rename from lib/gamnit/examples/asteronits/art/icon.svg rename to contrib/asteronits/art/icon.svg diff --git a/lib/gamnit/examples/asteronits/art/sheet.xml b/contrib/asteronits/art/sheet.xml similarity index 100% rename from lib/gamnit/examples/asteronits/art/sheet.xml rename to contrib/asteronits/art/sheet.xml diff --git a/lib/gamnit/examples/asteronits/assets/.gitignore b/contrib/asteronits/assets/.gitignore similarity index 100% rename from lib/gamnit/examples/asteronits/assets/.gitignore rename to contrib/asteronits/assets/.gitignore diff --git a/lib/gamnit/examples/asteronits/assets/images/sheet.png b/contrib/asteronits/assets/images/sheet.png similarity index 100% rename from lib/gamnit/examples/asteronits/assets/images/sheet.png rename to contrib/asteronits/assets/images/sheet.png diff --git a/lib/gamnit/examples/asteronits/bin/.gitignore b/contrib/asteronits/bin/.gitignore similarity index 100% rename from lib/gamnit/examples/asteronits/bin/.gitignore rename to contrib/asteronits/bin/.gitignore diff --git a/lib/gamnit/examples/asteronits/org.nitlanguage.asteronits.txt b/contrib/asteronits/org.nitlanguage.asteronits.txt similarity index 100% rename from lib/gamnit/examples/asteronits/org.nitlanguage.asteronits.txt rename to contrib/asteronits/org.nitlanguage.asteronits.txt diff --git a/lib/gamnit/examples/asteronits/package.ini b/contrib/asteronits/package.ini similarity index 100% rename from lib/gamnit/examples/asteronits/package.ini rename to contrib/asteronits/package.ini diff --git a/lib/gamnit/examples/asteronits/res/.gitignore b/contrib/asteronits/res/.gitignore similarity index 100% rename from lib/gamnit/examples/asteronits/res/.gitignore rename to contrib/asteronits/res/.gitignore diff --git a/lib/gamnit/examples/asteronits/src/.gitignore b/contrib/asteronits/src/.gitignore similarity index 100% rename from lib/gamnit/examples/asteronits/src/.gitignore rename to contrib/asteronits/src/.gitignore diff --git a/lib/gamnit/examples/asteronits/src/asteronits.nit b/contrib/asteronits/src/asteronits.nit similarity index 100% rename from lib/gamnit/examples/asteronits/src/asteronits.nit rename to contrib/asteronits/src/asteronits.nit diff --git a/lib/gamnit/examples/asteronits/src/game_logic.nit b/contrib/asteronits/src/game_logic.nit similarity index 100% rename from lib/gamnit/examples/asteronits/src/game_logic.nit rename to contrib/asteronits/src/game_logic.nit diff --git a/lib/gamnit/examples/asteronits/src/texture_atlas_parser.nit b/contrib/asteronits/src/texture_atlas_parser.nit similarity index 100% rename from lib/gamnit/examples/asteronits/src/texture_atlas_parser.nit rename to contrib/asteronits/src/texture_atlas_parser.nit diff --git a/lib/gamnit/examples/asteronits/src/touch_ui.nit b/contrib/asteronits/src/touch_ui.nit similarity index 100% rename from lib/gamnit/examples/asteronits/src/touch_ui.nit rename to contrib/asteronits/src/touch_ui.nit diff --git a/lib/gamnit/simple_2d.nit b/lib/gamnit/simple_2d.nit index a37279b..338f736 100644 --- a/lib/gamnit/simple_2d.nit +++ b/lib/gamnit/simple_2d.nit @@ -29,7 +29,7 @@ # It can be used to standardize the size of the UI across devices. # It is used to position the sprites in `App::ui_sprites`. # -# See the sample game at `examples/asteronits/`. +# See the sample game at `contrib/asteronits/`. module simple_2d import glesv2 -- 1.7.9.5