diff --git a/android/computecullandlod/AndroidManifest.xml b/android/computecullandlod/AndroidManifest.xml index 35fcedef..ccc68ea3 100644 --- a/android/computecullandlod/AndroidManifest.xml +++ b/android/computecullandlod/AndroidManifest.xml @@ -15,6 +15,7 @@ android:label="Compute cull and LOD" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" + android:screenOrientation="landscape" android:configChanges="orientation|screenSize|keyboardHidden"> diff --git a/android/computecullandlod/build.bat b/android/computecullandlod/build.bat deleted file mode 100644 index 69047f8b..00000000 --- a/android/computecullandlod/build.bat +++ /dev/null @@ -1,22 +0,0 @@ -cd jni -call ndk-build -if %ERRORLEVEL% EQU 0 ( - cd.. - - mkdir "assets\shaders\base" - xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y - - mkdir "assets\shaders\computecullandlod" - xcopy "..\..\data\shaders\computecullandlod\*.spv" "assets\shaders\computecullandlod" /Y - - mkdir "assets\models" - xcopy "..\..\data\models\suzanne_lods.dae" "assets\models" /Y - - mkdir "res\drawable" - xcopy "..\..\android\images\icon.png" "res\drawable" /Y - - call ant debug -Dout.final.file=vulkanComputecullandlod.apk -) ELSE ( - echo error : ndk-build failed with errors! - cd.. -) diff --git a/android/computecullandlod/build.py b/android/computecullandlod/build.py new file mode 100644 index 00000000..e3ccbc68 --- /dev/null +++ b/android/computecullandlod/build.py @@ -0,0 +1,43 @@ +import os +import shutil +import subprocess +import sys +import glob + +APK_NAME = "vulkanComputecullandlod" +SHADER_DIR = "computecullandlod" +ASSETS_MODELS = ["suzanne_lods.dae"] + +if subprocess.call("ndk-build", shell=True) == 0: + print("Build successful") + + # Assets + os.makedirs("./assets/shaders", exist_ok=True) + 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: + 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!") \ No newline at end of file diff --git a/android/computenbody/AndroidManifest.xml b/android/computenbody/AndroidManifest.xml index 254409f1..a316e781 100644 --- a/android/computenbody/AndroidManifest.xml +++ b/android/computenbody/AndroidManifest.xml @@ -15,6 +15,7 @@ android:label="Compute N-Body simulation" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" + android:screenOrientation="landscape" android:configChanges="orientation|screenSize|keyboardHidden"> diff --git a/android/computenbody/build.bat b/android/computenbody/build.bat deleted file mode 100644 index fefb7a4b..00000000 --- a/android/computenbody/build.bat +++ /dev/null @@ -1,23 +0,0 @@ -cd jni -call ndk-build -if %ERRORLEVEL% EQU 0 ( - cd.. - - mkdir "assets\shaders\base" - xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y - - mkdir "assets\shaders\computenbody" - xcopy "..\..\data\shaders\computenbody\*.spv" "assets\shaders\computenbody" /Y - - mkdir "assets\textures" - xcopy "..\..\data\textures\particle01_rgba.ktx" "assets\textures" /Y - xcopy "..\..\data\textures\particle_gradient_rgba.ktx" "assets\textures" /Y - - mkdir "res\drawable" - xcopy "..\..\android\images\icon.png" "res\drawable" /Y - - call ant debug -Dout.final.file=vulkanComputenbody.apk -) ELSE ( - echo error : ndk-build failed with errors! - cd.. -) diff --git a/android/computenbody/build.py b/android/computenbody/build.py new file mode 100644 index 00000000..5d3de2b5 --- /dev/null +++ b/android/computenbody/build.py @@ -0,0 +1,42 @@ +import os +import shutil +import subprocess +import sys +import glob + +APK_NAME = "vulkanComputenbody" +SHADER_DIR = "computenbody" +ASSETS_TEXTURES = ["particle01_rgba.ktx", "particle_gradient_rgba.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/%s" % SHADER_DIR, 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) + # Texture + for file in ASSETS_TEXTURES: + shutil.copy("../../data/textures/%s" % file, "./assets/textures") + + # 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!") \ No newline at end of file diff --git a/android/computeparticles/AndroidManifest.xml b/android/computeparticles/AndroidManifest.xml index 8d39a188..291bb1ad 100644 --- a/android/computeparticles/AndroidManifest.xml +++ b/android/computeparticles/AndroidManifest.xml @@ -15,6 +15,7 @@ android:label="Compute Particles" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" + android:screenOrientation="landscape" android:configChanges="orientation|screenSize|keyboardHidden"> diff --git a/android/computeparticles/build.bat b/android/computeparticles/build.bat deleted file mode 100644 index e053a9ce..00000000 --- a/android/computeparticles/build.bat +++ /dev/null @@ -1,25 +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\computeparticles" - xcopy "..\..\data\shaders\computeparticles\*.spv" "assets\shaders\computeparticles" /Y - - mkdir "assets\textures" - xcopy "..\..\data\textures\particle01_rgba.ktx" "assets\textures" /Y - xcopy "..\..\data\textures\particle_gradient_rgba.ktx" "assets\textures" /Y - - mkdir "res\drawable" - xcopy "..\..\android\images\icon.png" "res\drawable" /Y - - call ant debug -Dout.final.file=vulkanComputeparticles.apk -) ELSE ( - echo error : ndk-build failed with errors! - cd.. -) diff --git a/android/computeparticles/build.py b/android/computeparticles/build.py new file mode 100644 index 00000000..86d3e27f --- /dev/null +++ b/android/computeparticles/build.py @@ -0,0 +1,42 @@ +import os +import shutil +import subprocess +import sys +import glob + +APK_NAME = "vulkanComputeparticles" +SHADER_DIR = "computeparticles" +ASSETS_TEXTURES = ["particle01_rgba.ktx", "particle_gradient_rgba.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/%s" % SHADER_DIR, 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) + # Texture + for file in ASSETS_TEXTURES: + shutil.copy("../../data/textures/%s" % file, "./assets/textures") + + # 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!") \ No newline at end of file diff --git a/android/computeshader/AndroidManifest.xml b/android/computeshader/AndroidManifest.xml index c409d1bb..d04ca488 100644 --- a/android/computeshader/AndroidManifest.xml +++ b/android/computeshader/AndroidManifest.xml @@ -15,6 +15,7 @@ android:label="Compute Shader" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" + android:screenOrientation="landscape" android:configChanges="orientation|screenSize|keyboardHidden"> diff --git a/android/computeshader/build.bat b/android/computeshader/build.bat deleted file mode 100644 index 8f5f1e3f..00000000 --- a/android/computeshader/build.bat +++ /dev/null @@ -1,25 +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\computeshader" - xcopy "..\..\data\shaders\computeshader\*.spv" "assets\shaders\computeshader" /Y - - mkdir "assets\textures" - xcopy "..\..\data\textures\het_kanonschot_rgba8.ktx" "assets\textures" /Y - - - mkdir "res\drawable" - xcopy "..\..\android\images\icon.png" "res\drawable" /Y - - call ant debug -Dout.final.file=vulkanComputeshader.apk -) ELSE ( - echo error : ndk-build failed with errors! - cd.. -) diff --git a/android/computeshader/build.py b/android/computeshader/build.py new file mode 100644 index 00000000..e4b679c7 --- /dev/null +++ b/android/computeshader/build.py @@ -0,0 +1,44 @@ +import os +import shutil +import subprocess +import sys +import glob + +APK_NAME = "vulkanComputeshader" +SHADER_DIR = "computeshader" +ASSETS_TEXTURES = ["het_kanonschot_rgba8.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("./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") + + # 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!")