diff --git a/android/pushconstants/AndroidManifest.xml b/android/pushconstants/AndroidManifest.xml index d8e18a1e..95bac500 100644 --- a/android/pushconstants/AndroidManifest.xml +++ b/android/pushconstants/AndroidManifest.xml @@ -15,6 +15,7 @@ android:label="Push Constants" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" + android:screenOrientation="landscape" android:configChanges="orientation|screenSize|keyboardHidden"> diff --git a/android/pushconstants/build.bat b/android/pushconstants/build.bat deleted file mode 100644 index dacc91cf..00000000 --- a/android/pushconstants/build.bat +++ /dev/null @@ -1,24 +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\pushconstants" - xcopy "..\..\data\shaders\pushconstants\*.spv" "assets\shaders\pushconstants" /Y - - mkdir "assets\models" - xcopy "..\..\data\models\samplescene.dae" "assets\models" /Y - - mkdir "res\drawable" - xcopy "..\..\android\images\icon.png" "res\drawable" /Y - - call ant debug -Dout.final.file=vulkanPushconstants.apk -) ELSE ( - echo error : ndk-build failed with errors! - cd.. -) diff --git a/android/pushconstants/build.py b/android/pushconstants/build.py new file mode 100644 index 00000000..8d3138c0 --- /dev/null +++ b/android/pushconstants/build.py @@ -0,0 +1,42 @@ +import os +import shutil +import subprocess +import sys +import glob + +APK_NAME = "vulkanPushconstants" +SHADER_DIR = "pushconstants" +ASSETS_MODELS = ["samplescene.dae"] + +if subprocess.call("ndk-build", shell=True) == 0: + print("Build successful") + + # Assets + os.makedirs("./assets/shaders/base", exist_ok=True) + os.makedirs("./assets/shaders/%s" % SHADER_DIR, exist_ok=True) + os.makedirs("./assets/models", exist_ok=True) + os.makedirs("./res/drawable", exist_ok=True) + + # Shaders + # Base + for file in glob.glob("../../data/shaders/base/*.spv"): + shutil.copy(file, "./assets/shaders/base") + # Sample + for file in glob.glob("../../data/shaders/%s/*.spv" %SHADER_DIR): + shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR) + # Models + for file in ASSETS_MODELS: + shutil.copy("../../data/models/%s" % file, "./assets/models") + + # Icon + shutil.copy("../../android/images/icon.png", "./res/drawable") + + if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0: + for arg in sys.argv[1:]: + if arg == "-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!") \ No newline at end of file diff --git a/android/textoverlay/AndroidManifest.xml b/android/textoverlay/AndroidManifest.xml index 11cf75aa..3b726bca 100644 --- a/android/textoverlay/AndroidManifest.xml +++ b/android/textoverlay/AndroidManifest.xml @@ -15,6 +15,7 @@ android:label="Text overlay" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" + android:screenOrientation="landscape" android:configChanges="orientation|screenSize|keyboardHidden"> diff --git a/android/textoverlay/build.bat b/android/textoverlay/build.bat deleted file mode 100644 index 4d94e6ae..00000000 --- a/android/textoverlay/build.bat +++ /dev/null @@ -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\textoverlay" - xcopy "..\..\data\shaders\textoverlay\*.spv" "assets\shaders\textoverlay" /Y - - mkdir "assets\models" - xcopy "..\..\data\models\cube.dae" "assets\models" /Y - - mkdir "assets\textures" - xcopy "..\..\data\textures\skysphere_bc3.ktx" "assets\textures" /Y - xcopy "..\..\data\textures\round_window_bc3.ktx" "assets\textures" /Y - - mkdir "res\drawable" - xcopy "..\..\android\images\icon.png" "res\drawable" /Y - - call ant debug -Dout.final.file=vulkanTextoverlay.apk -) ELSE ( - echo error : ndk-build failed with errors! - cd.. -) diff --git a/android/textoverlay/build.py b/android/textoverlay/build.py new file mode 100644 index 00000000..4ef3030f --- /dev/null +++ b/android/textoverlay/build.py @@ -0,0 +1,47 @@ +import os +import shutil +import subprocess +import sys +import glob + +APK_NAME = "vulkanTextoverlay" +SHADER_DIR = "textoverlay" +ASSETS_MODELS = ["cube.dae"] +ASSETS_TEXTURES = ["skysphere_bc3_unorm.ktx", "round_window_bc3_unorm.ktx", "skysphere_astc_8x8_unorm.ktx", "round_window_astc_8x8_unorm.ktx", "skysphere_etc2_unorm.ktx", "round_window_etc2_unorm.ktx"] + +if subprocess.call("ndk-build", shell=True) == 0: + print("Build successful") + + # Assets + os.makedirs("./assets/shaders/base", exist_ok=True) + os.makedirs("./assets/shaders/%s" % SHADER_DIR, exist_ok=True) + os.makedirs("./assets/textures", exist_ok=True) + os.makedirs("./assets/models", exist_ok=True) + os.makedirs("./res/drawable", exist_ok=True) + + # Shaders + # Base + for file in glob.glob("../../data/shaders/base/*.spv"): + shutil.copy(file, "./assets/shaders/base") + # Sample + for file in glob.glob("../../data/shaders/%s/*.spv" %SHADER_DIR): + shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR) + # Textures + for file in ASSETS_TEXTURES: + shutil.copy("../../data/textures/%s" % file, "./assets/textures") + # Models + for file in ASSETS_MODELS: + shutil.copy("../../data/models/%s" % file, "./assets/models") + + # Icon + 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!")