From 926ff7439cb4298f482e6c73de393550f4827a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 27 Jun 2018 00:28:49 +0200 Subject: build ./android/assets from ./assets --- .gitignore | 1 + android/assets/data/corner.png | Bin 1513 -> 0 bytes android/assets/data/loading.atlas | 34 ---------------------------------- android/assets/data/loading.png | Bin 14501 -> 0 bytes android/assets/data/map_00.png | Bin 3880220 -> 0 bytes assets/build.gradle | 33 +++++++++++++++++++++++++++++++++ assets/data/corner.png | Bin 0 -> 1513 bytes assets/data/map_00.png | Bin 0 -> 3880220 bytes assets/loading/bar.png | Bin 0 -> 621 bytes assets/loading/border.png | Bin 0 -> 2299 bytes assets/loading/loaded.png | Bin 0 -> 5898 bytes assets/loading/loading.png | Bin 0 -> 3727 bytes build.gradle | 4 ++++ do | 6 ++++++ settings.gradle | 2 +- 15 files changed, 45 insertions(+), 35 deletions(-) delete mode 100644 android/assets/data/corner.png delete mode 100644 android/assets/data/loading.atlas delete mode 100644 android/assets/data/loading.png delete mode 100644 android/assets/data/map_00.png create mode 100644 assets/build.gradle create mode 100644 assets/data/corner.png create mode 100644 assets/data/map_00.png create mode 100644 assets/loading/bar.png create mode 100644 assets/loading/border.png create mode 100644 assets/loading/loaded.png create mode 100644 assets/loading/loading.png diff --git a/.gitignore b/.gitignore index ad948a8..5dc530a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ ## Mine *~ .tags +/android/assets ## Java diff --git a/android/assets/data/corner.png b/android/assets/data/corner.png deleted file mode 100644 index 7b9e8f4..0000000 Binary files a/android/assets/data/corner.png and /dev/null differ diff --git a/android/assets/data/loading.atlas b/android/assets/data/loading.atlas deleted file mode 100644 index cb8c853..0000000 --- a/android/assets/data/loading.atlas +++ /dev/null @@ -1,34 +0,0 @@ - -loading.png -size: 1024,128 -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -bar - rotate: false - xy: 2, 18 - size: 692, 27 - orig: 692, 27 - offset: 0, 0 - index: -1 -border - rotate: false - xy: 2, 47 - size: 700, 36 - orig: 700, 36 - offset: 0, 0 - index: -1 -loaded - rotate: false - xy: 704, 69 - size: 276, 14 - orig: 276, 14 - offset: 0, 0 - index: -1 -loading - rotate: false - xy: 2, 2 - size: 130, 14 - orig: 130, 14 - offset: 0, 0 - index: -1 diff --git a/android/assets/data/loading.png b/android/assets/data/loading.png deleted file mode 100644 index c68fdd7..0000000 Binary files a/android/assets/data/loading.png and /dev/null differ diff --git a/android/assets/data/map_00.png b/android/assets/data/map_00.png deleted file mode 100644 index d2c6961..0000000 Binary files a/android/assets/data/map_00.png and /dev/null differ diff --git a/assets/build.gradle b/assets/build.gradle new file mode 100644 index 0000000..1ef0761 --- /dev/null +++ b/assets/build.gradle @@ -0,0 +1,33 @@ +configurations { + texturePacker +} + +dependencies { + texturePacker "com.badlogicgames.gdx:gdx-tools:$gdxVersion" +} + +defaultTasks 'build' + +task clean(type: Delete) { + delete '../android/assets' +} + +task copyData(type: Copy) { + from 'data' + into '../android/assets/data' +} + +task packLoading(type: JavaExec) { + main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker' + classpath = configurations.texturePacker + args = ['./loading', '../android/assets/data', 'loading'] +} + +/* task buildUI(dependsOn: ["processXHDPI"]) { */ +task build(dependsOn: clean) { + description "Builds the skin at various DPIs" +} + +build.dependsOn { + tasks.findAll { task -> (task.name.startsWith('pack') || task.name.startsWith('copy')) } +} diff --git a/assets/data/corner.png b/assets/data/corner.png new file mode 100644 index 0000000..7b9e8f4 Binary files /dev/null and b/assets/data/corner.png differ diff --git a/assets/data/map_00.png b/assets/data/map_00.png new file mode 100644 index 0000000..d2c6961 Binary files /dev/null and b/assets/data/map_00.png differ diff --git a/assets/loading/bar.png b/assets/loading/bar.png new file mode 100644 index 0000000..0e707de Binary files /dev/null and b/assets/loading/bar.png differ diff --git a/assets/loading/border.png b/assets/loading/border.png new file mode 100644 index 0000000..8354e38 Binary files /dev/null and b/assets/loading/border.png differ diff --git a/assets/loading/loaded.png b/assets/loading/loaded.png new file mode 100644 index 0000000..d7df58f Binary files /dev/null and b/assets/loading/loaded.png differ diff --git a/assets/loading/loading.png b/assets/loading/loading.png new file mode 100644 index 0000000..e609553 Binary files /dev/null and b/assets/loading/loading.png differ diff --git a/build.gradle b/build.gradle index 2504886..180f67a 100644 --- a/build.gradle +++ b/build.gradle @@ -91,6 +91,10 @@ project(":core") { } } +project(":assets") { + configurations { texturePacker } +} + task ctags(type: Exec) { executable "ctags" args "-R", "--language-force=java", "--exclude=*~", "-f.tags", "core/src/" diff --git a/do b/do index 7dd1f98..14ac11d 100755 --- a/do +++ b/do @@ -8,6 +8,12 @@ function gradlew_do() } case "$1" in +# clean + "c") + shift; + ARGS="clean assets:build $ARGS" + gradlew_do + ;; # dist "d") shift; diff --git a/settings.gradle b/settings.gradle index 14bee42..15de458 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'desktop', 'android', 'html', 'core' \ No newline at end of file +include 'desktop', 'android', 'html', 'core', 'assets' -- cgit v1.1-2-g2b99