build ./android/assets from ./assets

13 files changed, 45 insertions, 35 deletions

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/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
--- a/android/assets/data/loading.png
+++ /dev/null
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/android/assets/data/corner.png b/assets/data/corner.png
index 7b9e8f4..7b9e8f4 100644
--- a/android/assets/data/corner.png
+++ b/assets/data/corner.png
diff --git a/android/assets/data/map_00.png b/assets/data/map_00.png
index d2c6961..d2c6961 100644
--- a/android/assets/data/map_00.png
+++ b/assets/data/map_00.png
diff --git a/assets/loading/bar.png b/assets/loading/bar.png
new file mode 100644
index 0000000..0e707de
--- /dev/null
+++ b/assets/loading/bar.png
diff --git a/assets/loading/border.png b/assets/loading/border.png
new file mode 100644
index 0000000..8354e38
--- /dev/null
+++ b/assets/loading/border.png
diff --git a/assets/loading/loaded.png b/assets/loading/loaded.png
new file mode 100644
index 0000000..d7df58f
--- /dev/null
+++ b/assets/loading/loaded.png
diff --git a/assets/loading/loading.png b/assets/loading/loading.png
new file mode 100644
index 0000000..e609553
--- /dev/null
+++ b/assets/loading/loading.png
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'