claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated android build files

Browse source
This commit is contained in:
saschawillems 2017-03-12 11:49:55 +01:00
parent ed7f88fd37
commit b793b63f8f
7 changed files with 74 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
android/dynamicuniformbuffer/AndroidManifest.xml
View file

@ -15,6 +15,7 @@
android:label="Dynamic uniform buffers"
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="vulkanDynamicuniformbuffer" />
<intent-filter>

19
android/dynamicuniformbuffer/build.bat
View file

@ -1,19 +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\dynamicuniformbuffer"
xcopy "..\..\data\shaders\dynamicuniformbuffer\*.spv" "assets\shaders\dynamicuniformbuffer" /Y
mkdir "res\drawable"
xcopy "..\..\android\images\icon.png" "res\drawable" /Y
call ant debug -Dout.final.file=vulkanDynamicuniformbuffer.apk
) ELSE (
echo error : ndk-build failed with errors!
cd..
)

35
android/dynamicuniformbuffer/build.py Normal file
View file

@ -0,0 +1,35 @@
import os
import shutil
import subprocess
import sys
import glob
APK_NAME = "vulkanDynamicuniformbuffer"
SHADER_DIR = "dynamicuniformbuffer"
if subprocess.call("ndk-build", shell=True) == 0:
print("Build successful")
os.makedirs("./assets/shaders/base", exist_ok=True)
os.makedirs("./assets/shaders/%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)
# 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!")

1
android/gears/AndroidManifest.xml
View file

@ -15,6 +15,7 @@
android:label="Gears"
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="vulkanGears" />
<intent-filter>

22
android/gears/build.bat
View file

@ -1,22 +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"
xcopy "..\..\data\shaders\gears.vert.spv" "assets\shaders" /Y
xcopy "..\..\data\shaders\gears.frag.spv" "assets\shaders" /Y
mkdir "res\drawable"
xcopy "..\..\android\images\icon.png" "res\drawable" /Y
call ant debug -Dout.final.file=vulkanGears.apk
) ELSE (
echo error : ndk-build failed with errors!
cd..
)

35
android/gears/build.py Normal file
View file

@ -0,0 +1,35 @@
import os
import shutil
import subprocess
import sys
import glob
APK_NAME = "vulkanGears"
SHADER_DIR = "gears"
if subprocess.call("ndk-build", shell=True) == 0:
print("Build successful")
os.makedirs("./assets/shaders/base", exist_ok=True)
os.makedirs("./assets/shaders/%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)
# 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!")

4
dynamicuniformbuffer/dynamicuniformbuffer.cpp
View file

@ -208,7 +208,7 @@ public:
VulkanExampleBase::submitFrame();
}
void generateTriangle()
void generateCube()
{
// Setup vertices indices for a colored cube
std::vector<Vertex> vertices = {
@ -513,7 +513,7 @@ public:
void prepare()
{
VulkanExampleBase::prepare();
generateTriangle();
generateCube();
setupVertexDescriptions();
prepareUniformBuffers();
setupDescriptorSetLayout();