From 4bef4ca134110f7e5f4e499d8c10cb5a31657467 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sat, 7 May 2016 15:59:08 +0200 Subject: [PATCH] Added text overlay example to cmake and android build --- CMakeLists.txt | 1 + android/build-all.bat | 3 +- android/textoverlay/.gitignore | 10 +++++ android/textoverlay/AndroidManifest.xml | 27 ++++++++++++++ android/textoverlay/build.bat | 24 ++++++++++++ android/textoverlay/jni/Android.mk | 49 +++++++++++++++++++++++++ android/textoverlay/jni/Application.mk | 5 +++ android/uninstall-all.bat | 1 + 8 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 android/textoverlay/.gitignore create mode 100644 android/textoverlay/AndroidManifest.xml create mode 100644 android/textoverlay/build.bat create mode 100644 android/textoverlay/jni/Android.mk create mode 100644 android/textoverlay/jni/Application.mk diff --git a/CMakeLists.txt b/CMakeLists.txt index 36ae4389..6afa6fd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,6 +95,7 @@ set(EXAMPLES skeletalanimation sphericalenvmapping tessellation + textoverlay texture texturearray texturecubemap diff --git a/android/build-all.bat b/android/build-all.bat index de2b1616..f0c80dfd 100644 --- a/android/build-all.bat +++ b/android/build-all.bat @@ -27,4 +27,5 @@ call _build radialblur %1 call _build displacement %1 call _build raytracing %1 call _build multisampling %1 -call _build multithreading %1 \ No newline at end of file +call _build multithreading %1 +call _build textoverlay %1 \ No newline at end of file diff --git a/android/textoverlay/.gitignore b/android/textoverlay/.gitignore new file mode 100644 index 00000000..7a5d249c --- /dev/null +++ b/android/textoverlay/.gitignore @@ -0,0 +1,10 @@ +/assets/ +/res/ +/bin/ +/libs/ +/obj/ +/build.xml +/local.properties +/project.properties +/proguard-project.txt +*.apk \ No newline at end of file diff --git a/android/textoverlay/AndroidManifest.xml b/android/textoverlay/AndroidManifest.xml new file mode 100644 index 00000000..11cf75aa --- /dev/null +++ b/android/textoverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/android/textoverlay/build.bat b/android/textoverlay/build.bat new file mode 100644 index 00000000..0effc377 --- /dev/null +++ b/android/textoverlay/build.bat @@ -0,0 +1,24 @@ +cd jni +call ndk-build +if %ERRORLEVEL% EQU 0 ( + echo ndk-build has failed, build cancelled + cd.. + + 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/jni/Android.mk b/android/textoverlay/jni/Android.mk new file mode 100644 index 00000000..8ef0a8df --- /dev/null +++ b/android/textoverlay/jni/Android.mk @@ -0,0 +1,49 @@ +LOCAL_PATH := $(call my-dir)/../../textoverlay + +# assimp + +include $(CLEAR_VARS) + +LOCAL_MODULE := assimp +LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a +include $(PREBUILT_STATIC_LIBRARY) + +# vulkan example + +DATADIR := $(LOCAL_PATH)/../../data + +include $(CLEAR_VARS) + +LOCAL_MODULE := vulkanTextoverlay + +PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../textoverlay/*.cpp) +PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp) + +LOCAL_CPPFLAGS := -std=c++11 +LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS +LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR + +LOCAL_DISABLE_FATAL_LINKER_WARNINGS = true + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/ +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/ +#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android + +LOCAL_SRC_FILES := $(PROJECT_FILES) + +LOCAL_LDLIBS := -landroid -llog -lz + +LOCAL_DISABLE_FORMAT_STRING_CHECKS := true + +LOCAL_STATIC_LIBRARIES += android_native_app_glue +LOCAL_STATIC_LIBRARIES += cpufeatures +LOCAL_STATIC_LIBRARIES += libassimp + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module, android/native_app_glue) +$(call import-module, android/cpufeatures) diff --git a/android/textoverlay/jni/Application.mk b/android/textoverlay/jni/Application.mk new file mode 100644 index 00000000..62020feb --- /dev/null +++ b/android/textoverlay/jni/Application.mk @@ -0,0 +1,5 @@ +APP_PLATFORM := android-19 +APP_ABI := armeabi-v7a +APP_STL := c++_static +APP_CPPFLAGS := -std=c++11 +NDK_TOOLCHAIN_VERSION := clang diff --git a/android/uninstall-all.bat b/android/uninstall-all.bat index 47eb6e40..18a45d9f 100644 --- a/android/uninstall-all.bat +++ b/android/uninstall-all.bat @@ -35,6 +35,7 @@ adb uninstall de.saschawillems.vulkanDisplacement adb uninstall de.saschawillems.vulkanRaytracing adb uninstall de.saschawillems.vulkanMultisampling adb uninstall de.saschawillems.vulkanMultithreading +adb uninstall de.saschawillems.vulkanTextoverlay goto finish :exit