Added ETC2 and ASTC texture variants (Refs #174)

android/parallaxmapping/AndroidManifest.xml

@@ -15,6 +15,7 @@
                 android:label="Parallax mapping"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:launchMode="singleTask"
+                android:screenOrientation="landscape"
                 android:configChanges="orientation|screenSize|keyboardHidden">
 			<meta-data android:name="android.app.lib_name" android:value="vulkanParallaxmapping" />
 			<intent-filter>

android/parallaxmapping/build.bat

@@ -1,28 +0,0 @@
-cd jni
-call ndk-build
-if %ERRORLEVEL% EQU 0 (
-	echo ndk-build has failed, build cancelled
-	cd..
-
-	mkdir "assets\shaders\base"
-	xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
-	
-
-	mkdir "assets\shaders\parallax"
-	xcopy "..\..\data\shaders\parallax\*.spv" "assets\shaders\parallax" /Y
-
-	mkdir "assets\textures"
-	xcopy "..\..\data\textures\rocks_color_bc3.dds" "assets\textures" /Y
-	xcopy "..\..\data\textures\rocks_normal_height_rgba.dds" "assets\textures" /Y
-
-	mkdir "assets\models"
-	xcopy "..\..\data\models\plane_z.obj" "assets\models" /Y
-
-	mkdir "res\drawable"
-	xcopy "..\..\android\images\icon.png" "res\drawable" /Y
-
-	call ant debug -Dout.final.file=vulkanParallaxmapping.apk
-) ELSE (
-	echo error : ndk-build failed with errors!
-	cd..
-)

android/parallaxmapping/build.py

@@ -0,0 +1,53 @@
+import os
+import shutil
+import subprocess
+import sys
+import glob
+
+APK_NAME = "vulkanParallaxmapping"
+SHADER_DIR = "parallax"
+ASSETS_MODELS = ["plane_z.obj"]
+ASSETS_TEXTURES = ["rocks_normal_height_rgba.dds", "rocks_color_bc3_unorm.dds", "rocks_color_astc_8x8_unorm.ktx", "rocks_color_etc2_unorm.ktx"]
+
+if subprocess.call("ndk-build", shell=True) == 0:   
+    print("Build successful")
+
+    # Assets
+    if not os.path.exists("./assets"):
+        os.makedirs("./assets")  
+
+    # Shaders    
+    # Base
+    if not os.path.exists("./assets/shaders/base"):
+        os.makedirs("./assets/shaders/base")           
+    for file in glob.glob("../../data/shaders/base/*.spv"):
+        shutil.copy(file, "./assets/shaders/base")    
+    # Sample
+    if not os.path.exists("./assets/shaders/%s" % SHADER_DIR):
+        os.makedirs("./assets/shaders/%s" % SHADER_DIR)
+    for file in glob.glob("../../data/shaders/%s/*.spv" %SHADER_DIR):
+        shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR)          
+    # Textures and models
+    if not os.path.exists("./assets/textures"):
+        os.makedirs("./assets/textures")           
+    for file in ASSETS_TEXTURES:
+        shutil.copy("../../data/textures/%s" % file, "./assets/textures")       
+    if not os.path.exists("./assets/models"):
+        os.makedirs("./assets/models")           
+    for file in ASSETS_MODELS:
+        shutil.copy("../../data/models/%s" % file, "./assets/models")            
+
+    # Icon
+    if not os.path.exists("./res/drawable"):
+        os.makedirs("./res/drawable")         
+    shutil.copy("../../android/images/icon.png", "./res/drawable")      
+
+    if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0:
+        if len(sys.argv) > 1:
+            if sys.argv[1] == "-deploy":
+                if subprocess.call("adb install -r %s.apk" % APK_NAME, shell=True) != 0:
+                    print("Could not deploy to device!")
+    else:
+        print("Error during build process!")
+else:
+    print("Error building project!")