Updating common code

Author: jherico

.gitignore

@@ -205,3 +205,4 @@ vulkanCapsViewer/vulkanreport.json
 # DLLs in bin
 !bin/*.dll
 bin_debug
+/external/

CMakeLists.txt

@@ -1,91 +1,60 @@
-cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
-cmake_policy(VERSION 3.8)
+cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
+cmake_policy(VERSION 3.6)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 include("cmake/defaults.cmake")
 set(NAME vulkanExamples)
 
 project(${NAME})
 
-if (WIN32)
-  if (MSVC)
-    if (NOT MSVC14)
-      message(FATAL_ERROR "Visual Studio 2015 is required for Windows builds")
-    endif()
-    if(NOT ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8"))
-      message(FATAL_ERROR "You must build for the Win64 architecture")
-    endif()
-  endif()    
-endif()
-
-add_custom_target(SetupRelease ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/bin)
-set_target_properties(SetupRelease PROPERTIES FOLDER "CMakeTargets")
-add_custom_target(SetupDebug ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/bin_debug)
-set_target_properties(SetupDebug PROPERTIES FOLDER "CMakeTargets")
-
-find_package(Vulkan REQUIRED)
-include_directories(${Vulkan_INCLUDE_DIR})
-link_libraries(${Vulkan_LIBRARY})
 
 if(WIN32)
-    add_definitions(-DVK_USE_PLATFORM_WIN32_KHR)
-else()
-    add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
-    find_package(XCB REQUIRED)
-    link_libraries(${XCB_LIBRARIES})
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
 endif()
 
+if(NOT ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8"))
+  message(FATAL_ERROR "32 bit builds not supported")
+endif()
 
+find_package(Threads REQUIRED)
 
-if (WIN32)
-    add_dependency_external_projects(glfw3)
-    list(APPEND EXTERNALS glfw3)
-    include_directories(${GLFW3_INCLUDE_DIR})
-    link_libraries(${GLFW3_LIBRARY})
-
-    add_dependency_external_projects(zlib)
-    list(APPEND EXTERNALS zlib)
-    include_directories(${ZLIB_INCLUDE_DIRS})
-    link_libraries(${ZLIB_LIBRARIES})
+if (NOT ANDROID)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/bin")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_SOURCE_DIR}/bin_debug")
+    set(CMAKE_DEBUG_POSTFIX "d")
 
-    add_dependency_external_projects(assimp)
-    list(APPEND EXTERNALS assimp)
-    include_directories(${ASSIMP_INCLUDE_DIRS})
-    link_libraries(${ASSIMP_LIBRARIES})
-else()
-    pkg_check_modules(GLFW3 REQUIRED glfw3>=3.2)
-    link_libraries(${GLFW3_LIBRARIES})
-    include_directories(${GLFW3_INCLUDEDIR})
-    link_directories(${GLFW3_LIBRARY_DIRS})
-    
-    find_package(assimp)
-    link_libraries(${ASSIMP_LIBRARIES})
-    include_directories(${ASSIMP_INCLUDEDIR})
-    link_directories(${ASSIMP_LIBRARY_DIRS})
+    add_custom_target(SetupRelease ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/bin)
+    set_target_properties(SetupRelease PROPERTIES FOLDER "CMakeTargets")
+    add_custom_target(SetupDebug ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_SOURCE_DIR}/bin_debug)
+    set_target_properties(SetupDebug PROPERTIES FOLDER "CMakeTargets")
 endif()
 
-add_dependency_external_projects(glm)
-list(APPEND EXTERNALS glm)
-include_directories(${GLM_INCLUDE_DIRS})
 
-add_dependency_external_projects(gli)
-list(APPEND EXTERNALS gli)
-include_directories(${GLI_INCLUDE_DIRS})
+if (ANDROID)
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate")
+    set(APP_GLUE_DIR ${ANDROID_NDK}/sources/android/native_app_glue)
+    include_directories(${APP_GLUE_DIR})
+    add_library(app-glue STATIC ${APP_GLUE_DIR}/android_native_app_glue.c)
+endif()
 
-add_dependency_external_projects(glslang)
-list(APPEND EXTERNALS glslang)
-include_directories(${GLSLANG_INCLUDE_DIRS})
-link_libraries(${GLSLANG_LIBRARIES})
+if (ANDROID)
+    add_definitions(-DVK_USE_PLATFORM_ANDROID_KHR)
+elseif (WIN32)
+    add_definitions(-DVK_USE_PLATFORM_WIN32_KHR)
+else()
+    add_definitions(-DVK_USE_PLATFORM_XCB_KHR)
+    find_package(XCB REQUIRED)
+    link_libraries(${XCB_LIBRARIES})
+endif()
 
 add_subdirectory(base)
 
 include_directories(base)
-link_libraries(common)
 if (NOT WIN32)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
     link_libraries(${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-
 add_subdirectory(examples)
-

base/CMakeLists.txt

@@ -1,6 +1,34 @@
-file(GLOB COMMON_SOURCE *.cpp *.h *.hpp)
-add_library(common ${COMMON_SOURCE})
-set_target_properties(common PROPERTIES FOLDER "examples")
-foreach(EXTERNAL ${EXTERNALS})
-    add_dependencies(common ${EXTERNAL})
+set(TARGET_NAME base)
+
+set(SHADER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../data/shaders")
+file(GLOB_RECURSE SHADERS
+    ${SHADER_DIR}/*.vert
+    ${SHADER_DIR}/*.frag
+    ${SHADER_DIR}/*.comp
+    ${SHADER_DIR}/*.tesc
+    ${SHADER_DIR}/*.tese
+    ${SHADER_DIR}/*.geom
+)
+
+GroupSources("base")
+GroupSources("data/shaders")
+foreach(SHADER ${SHADERS})
+    compile_spirv_shader(${SHADER})
+    list(APPEND COMPILED_SHADERS ${COMPILE_SPIRV_SHADER_RETURN})
+    source_group("compiled" FILES ${COMPILE_SPIRV_SHADER_RETURN})
 endforeach()
+add_custom_target(shaders SOURCES ${SHADERS} ${COMPILED_SHADERS})
+
+file(GLOB_RECURSE COMMON_SOURCE *.cpp *.h *.hpp)
+add_library(${TARGET_NAME} STATIC ${COMMON_SOURCE})
+
+target_glfw3()
+target_glm()
+target_gli()
+target_vulkan()
+target_assimp()
+
+if (ANDROID)
+    add_dependencies(${TARGET_NAME} app-glue)
+    target_link_libraries(${TARGET_NAME} app-glue android log m)
+endif()

base/camera.hpp

@@ -119,6 +119,10 @@ class Camera {
         updateViewMatrix();
     };
 
+    void setPosition(const glm::vec3& translation) {
+        setTranslation(translation);
+    }
+
     void setTranslation(const glm::vec3& translation) {
         position = vec3(-translation.x, - translation.y, translation.z);
         updateViewMatrix();
@@ -188,7 +192,7 @@ class Camera {
         bool retVal = false;
 
         if (type == CameraType::firstperson) {
-            // Use the common console thumbstick layout		
+            // Use the common console thumbstick layout        
             // Left = view, right = move
 
             const float deadZone = 0.0015f;

base/common.cpp

@@ -1,6 +1,8 @@
 #include "common.hpp"
 
-
+#if defined(__ANDROID__)
+android_app* global_android_app { nullptr };
+#endif
 
 const vec3 Vectors::UNIT_X{ 1.0f, 0.0f, 0.0f };
 const vec3 Vectors::UNIT_Y{ 0.0f, 1.0f, 0.0f };

base/common.hpp

@@ -19,6 +19,7 @@
 #include <list>
 #include <memory>
 #include <mutex>
+#include <queue>
 #include <random>
 #include <set>
 #include <string>
@@ -29,9 +30,10 @@
 #include <thread>
 #include <vector>
 
-
-#ifdef GLEW_STATIC
-#include <GL/glew.h>
+#if defined(__ANDROID__)
+#include <android/native_activity.h>
+#include <android/asset_manager.h>
+#include <android_native_app_glue.h>
 #endif
 
 #include <glm/glm.hpp>
@@ -46,6 +48,13 @@
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/quaternion.hpp>
 
+// Image loading
+#include <gli/gli.hpp>
+
+// Vulkan!
+#include <vulkan/vulkan.hpp>
+
+
 using glm::ivec2;
 using glm::uvec2;
 using glm::vec2;
@@ -90,19 +99,54 @@ class Vectors {
     static const vec3 ZERO4;
 };
 
-
-// Image loading 
-#include <gli/gli.hpp>
-
-// Vulkan!
-#include <vulkan/vulkan.hpp>
-
-// Cross platform window management
-#include "glfw.hpp"
+#if defined(__ANDROID__)
+#include <android/keycodes.h>
+
+extern android_app* global_android_app;
+#define GLFW_KEY_F1 AKEYCODE_F1
+#define GLFW_KEY_ESCAPE AKEYCODE_ESCAPE
+#define GLFW_KEY_KP_ADD AKEYCODE_NUMPAD_ADD
+#define GLFW_KEY_KP_SUBTRACT AKEYCODE_NUMPAD_SUBTRACT
+#define GLFW_KEY_SPACE AKEYCODE_SPACE
+#define GLFW_KEY_A AKEYCODE_A
+#define GLFW_KEY_B AKEYCODE_B
+#define GLFW_KEY_D AKEYCODE_D
+#define GLFW_KEY_F AKEYCODE_F
+#define GLFW_KEY_G AKEYCODE_G
+#define GLFW_KEY_L AKEYCODE_L
+#define GLFW_KEY_O AKEYCODE_O
+#define GLFW_KEY_P AKEYCODE_P
+#define GLFW_KEY_R AKEYCODE_R
+#define GLFW_KEY_S AKEYCODE_S
+#define GLFW_KEY_T AKEYCODE_T
+#define GLFW_KEY_W AKEYCODE_W
+
+
+#else
+// Cross platform window management (except android)
+#include "glfw/glfw.hpp"
+#endif
 
 // Boilerplate for running an example
+#if defined(__ANDROID__)
+#define ENTRY_POINT_START \
+        void android_main(android_app* state) { \
+            global_android_app = state;
+
+#define ENTRY_POINT_END \
+        }
+#else
+#define ENTRY_POINT_START \
+        int main(const int argc, const char *argv[]) {
+
+#define ENTRY_POINT_END \
+            return 0; \
+        }
+#endif
+
 #define RUN_EXAMPLE(ExampleType) \
-    int main(const int argc, const char *argv[]) { \
-        ExampleType().run(); \
-        return 0; \
-    }
+    ENTRY_POINT_START \
+        ExampleType* example = new ExampleType(); \
+        example->run(); \
+        delete(example); \
+    ENTRY_POINT_END