Android support for Vulkan demo scene (#97)

android/_build.bat

@@ -12,6 +12,7 @@ if "%1" == "" (
 	call build %2
 	IF EXIST vulkan%1.apk (
 		if "%2" == "-deploy" (
+            echo deploying to device
 			IF EXIST vulkan%1.apk (
 			    adb install -r vulkan%1.apk
 			)

android/build-vulkanscene.bat

@@ -0,0 +1 @@
+_build vulkanscene %1

android/vulkanscene/.gitignore

@@ -0,0 +1,10 @@
+/assets/
+/res/
+/bin/
+/libs/
+/obj/
+/build.xml
+/local.properties
+/project.properties
+/proguard-project.txt
+*.apk

android/vulkanscene/AndroidManifest.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+		package="de.saschawillems.vulkanScene"
+        android:versionCode="1"
+        android:versionName="1.0">
+		
+    <uses-sdk android:minSdkVersion="19" /> 
+	
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
+    <uses-feature android:name="android.software.leanback" android:required="false"/>  	
+	
+    <application android:label="vulkanScene" android:icon="@drawable/icon" android:hasCode="false">
+		<activity android:name="android.app.NativeActivity"
+                android:label="Vulkan Demo Scene"
+                android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				android:launchMode="singleTask"
+                android:configChanges="orientation|screenSize|keyboardHidden">
+			<meta-data android:name="android.app.lib_name" android:value="vulkanScene" />
+			<intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+				<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>  
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

android/vulkanscene/build.bat

@@ -0,0 +1,26 @@
+cd jni
+call ndk-build
+if %ERRORLEVEL% EQU 0 (
+	echo ndk-build has failed, build cancelled
+	cd..
+
+	mkdir "assets\shaders\vulkanscene"
+	xcopy "..\..\data\shaders\vulkanscene\*.spv" "assets\shaders\vulkanscene" /Y
+
+	mkdir "assets\textures"
+	xcopy "..\..\data\textures\cubemap_vulkan.ktx" "assets\textures" /Y
+
+	mkdir "assets\models"
+    xcopy "..\..\data\models\vulkanscenelogos.dae" "assets\models" /Y  
+	xcopy "..\..\data\models\vulkanscenebackground.dae" "assets\models" /Y  
+	xcopy "..\..\data\models\vulkanscenemodels.dae" "assets\models" /Y  
+	xcopy "..\..\data\models\cube.obj" "assets\models" /Y  
+	
+	mkdir "res\drawable"
+	xcopy "..\..\android\images\icon.png" "res\drawable" /Y
+
+	call ant debug -Dout.final.file=vulkanScene.apk
+) ELSE (
+	echo error : ndk-build failed with errors!
+	cd..
+)

android/vulkanscene/jni/Android.mk

@@ -0,0 +1,47 @@
+LOCAL_PATH := $(call my-dir)/../../vulkanscene
+
+# 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 := vulkanScene
+
+PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../vulkanscene/*.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_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)

android/vulkanscene/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

mesh/mesh.cpp

@@ -610,4 +610,3 @@ int main(const int argc, const char *argv[])
 	return 0;
 #endif
 }
-

vulkanscene/vulkanscene.cpp

@@ -113,7 +113,7 @@ public:
 	void loadTextures()
 	{
 		textureLoader->loadCubemap(
-			"./../data/textures/cubemap_vulkan.ktx", 
+			getAssetPath() + "textures/cubemap_vulkan.ktx", 
 			VK_FORMAT_R8G8B8A8_UNORM, 
 			&textures.skybox);
 	}
@@ -216,13 +216,21 @@ public:
 
 		// Load meshes for demos scene
 		demoMeshes.logos = new VulkanMeshLoader();
-		demoMeshes.logos->LoadMesh("../data/models/vulkanscenelogos.dae");
 		demoMeshes.background = new VulkanMeshLoader();
-		demoMeshes.background->LoadMesh("../data/models/vulkanscenebackground.dae");
 		demoMeshes.models = new VulkanMeshLoader();
-		demoMeshes.models->LoadMesh("../data/models/vulkanscenemodels.dae");
 		demoMeshes.skybox = new VulkanMeshLoader();
-		demoMeshes.skybox->LoadMesh("../data/models/cube.obj");
+
+#if defined(__ANDROID__)
+		demoMeshes.logos->assetManager = androidApp->activity->assetManager;
+		demoMeshes.background->assetManager = androidApp->activity->assetManager;
+		demoMeshes.models->assetManager = androidApp->activity->assetManager;
+		demoMeshes.skybox->assetManager = androidApp->activity->assetManager;
+#endif
+
+		demoMeshes.logos->LoadMesh(getAssetPath() + "models/vulkanscenelogos.dae");
+		demoMeshes.background->LoadMesh(getAssetPath() + "models/vulkanscenebackground.dae");
+		demoMeshes.models->LoadMesh(getAssetPath() + "models/vulkanscenemodels.dae");
+		demoMeshes.skybox->LoadMesh(getAssetPath() + "models/cube.obj");
 
 		std::vector<VulkanMeshLoader*> meshList;
 		meshList.push_back(demoMeshes.skybox); // skybox first because of depth writes
@@ -478,8 +486,8 @@ public:
 		// Pipeline for the meshes (armadillo, bunny, etc.)
 		// Load shaders
 		std::array<VkPipelineShaderStageCreateInfo, 2> shaderStages;
-		shaderStages[0] = loadShader("./../data/shaders/vulkanscene/mesh.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-		shaderStages[1] = loadShader("./../data/shaders/vulkanscene/mesh.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+		shaderStages[0] = loadShader(getAssetPath() + "shaders/vulkanscene/mesh.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+		shaderStages[1] = loadShader(getAssetPath() + "shaders/vulkanscene/mesh.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 
 		VkGraphicsPipelineCreateInfo pipelineCreateInfo =
 			vkTools::initializers::pipelineCreateInfo(
@@ -502,16 +510,16 @@ public:
 		assert(!err);
 
 		// Pipeline for the logos
-		shaderStages[0] = loadShader("./../data/shaders/vulkanscene/logo.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-		shaderStages[1] = loadShader("./../data/shaders/vulkanscene/logo.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+		shaderStages[0] = loadShader(getAssetPath() + "shaders/vulkanscene/logo.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+		shaderStages[1] = loadShader(getAssetPath() + "shaders/vulkanscene/logo.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 		err = vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.logos);
 		assert(!err);
 
 		// Pipeline for the sky sphere (todo)
 		rasterizationState.cullMode = VK_CULL_MODE_FRONT_BIT; // Inverted culling
 		depthStencilState.depthWriteEnable = VK_FALSE; // No depth writes
-		shaderStages[0] = loadShader("./../data/shaders/vulkanscene/skybox.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-		shaderStages[1] = loadShader("./../data/shaders/vulkanscene/skybox.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+		shaderStages[0] = loadShader(getAssetPath() + "shaders/vulkanscene/skybox.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+		shaderStages[1] = loadShader(getAssetPath() + "shaders/vulkanscene/skybox.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 		err = vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.skybox);
 		assert(!err);
 
@@ -595,8 +603,7 @@ public:
 
 VulkanExample *vulkanExample;
 
-#ifdef _WIN32
-
+#if defined(_WIN32)
 LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	if (vulkanExample != NULL)
@@ -605,9 +612,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	}
 	return (DefWindowProc(hWnd, uMsg, wParam, lParam));
 }
-
-#else 
-
+#elif defined(__linux__) && !defined(__ANDROID__)
 static void handleEvent(const xcb_generic_event_t *event)
 {
 	if (vulkanExample != NULL)
@@ -617,21 +622,42 @@ static void handleEvent(const xcb_generic_event_t *event)
 		}
 #endif
 
-#ifdef _WIN32
+// Main entry point
+#if defined(_WIN32)
+// Windows entry point
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, int nCmdShow)
-#else
+#elif defined(__ANDROID__)
+// Android entry point
+void android_main(android_app* state)
+#elif defined(__linux__)
+// Linux entry point
 int main(const int argc, const char *argv[])
 #endif
 {
+#if defined(__ANDROID__)
+	// Removing this may cause the compiler to omit the main entry point 
+	// which would make the application crash at start
+	app_dummy();
+#endif
 	vulkanExample = new VulkanExample();
-#ifdef _WIN32
+#if defined(_WIN32)
 	vulkanExample->setupWindow(hInstance, WndProc);
-#else
+#elif defined(__ANDROID__)
+	// Attach vulkan example to global android application state
+	state->userData = vulkanExample;
+	state->onAppCmd = VulkanExample::handleAppCommand;
+	state->onInputEvent = VulkanExample::handleAppInput;
+	vulkanExample->androidApp = state;
+#elif defined(__linux__)
 	vulkanExample->setupWindow();
 #endif
+#if !defined(__ANDROID__)
 	vulkanExample->initSwapchain();
 	vulkanExample->prepare();
+#endif
 	vulkanExample->renderLoop();
+#if !defined(__ANDROID__)
 	delete(vulkanExample);
 	return 0;
+#endif
 }