Merge branch 'android' of github.com:Devsh-Graphics-Programming/Nabla into android

Author: devshgraphicsprogramming

CMakeLists.txt

@@ -7,57 +7,65 @@ cmake_minimum_required(VERSION 3.20)
 cmake_policy(SET CMP0072 OLD) #not yet, would need to get pointers to all OpenGL functions
 set(OpenGL_GL_PREFERENCE LEGACY)
 #cmake_policy(SET CMP )
-option(NBL_BUILD_ANDROID "Build for Android?" OFF)
+set(NBL_BUILD_ANDROID OFF)
 
-if(DEFINED CMAKE_TOOLCHAIN_FILE) # TODO - validate paths due to CMake path-policy (errors when no path passed in)
-	cmake_path(GET CMAKE_TOOLCHAIN_FILE FILENAME _NBL_CMAKE_TOOLCHAIN_FILENAME_)
+if(DEFINED CMAKE_TOOLCHAIN_FILE)
+
+	if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
+		cmake_path(GET CMAKE_TOOLCHAIN_FILE FILENAME _NBL_CMAKE_TOOLCHAIN_FILENAME_)
+	else()
+		message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE as '${CMAKE_TOOLCHAIN_FILE}' is invalid!")
+	endif()
 
 	if(${_NBL_CMAKE_TOOLCHAIN_FILENAME_} STREQUAL "android.toolchain.cmake")
 		message(STATUS "Found Android toolchain! Validating...")
 
-		set(_NBL_SUPPORTED_NDK_ "android-ndk-r22b") # supported NDK version
-		set(_NBL_SUPPORTED_ABI_ "x86_64")			# supported ABI
-		
-		# quering ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_}/${_NBL_SUPPORTED_NDK_}/build/cmake/android.toolchain.cmake
-		cmake_path(GET CMAKE_TOOLCHAIN_FILE PARENT_PATH _NBL_TOOLCHAIN_NDK_CMAKE_DIRECTORY_)
-		cmake_path(GET _NBL_TOOLCHAIN_NDK_CMAKE_DIRECTORY_ PARENT_PATH _NBL_TOOLCHAIN_NDK_BUILD_DIRECTORY_)
-		cmake_path(GET _NBL_TOOLCHAIN_NDK_BUILD_DIRECTORY_ PARENT_PATH _NBL_TOOLCHAIN_NDK_ROOT_DIRECTORY_)
-		cmake_path(GET _NBL_TOOLCHAIN_NDK_ROOT_DIRECTORY_ PARENT_PATH _NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_)
-		
-		string(LENGTH ${CMAKE_TOOLCHAIN_FILE} _NBL_CMAKE_TOOLCHAIN_FILE_LENGTH_)
-		string(LENGTH ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_} _NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_LENGTH_)
-		math(EXPR _NBL_PARENT_NDK_TO_TOOLCHAIN_FILE_LENGTH_ "${_NBL_CMAKE_TOOLCHAIN_FILE_LENGTH_} - ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_LENGTH_}" OUTPUT_FORMAT DECIMAL)
-		string(SUBSTRING ${CMAKE_TOOLCHAIN_FILE} ${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_LENGTH_} ${_NBL_PARENT_NDK_TO_TOOLCHAIN_FILE_LENGTH_} _NBL_PARENT_NDK_TO_TOOLCHAIN_FILEPATH_)
-		
-		if(${_NBL_PARENT_NDK_TO_TOOLCHAIN_FILEPATH_} STREQUAL "/${_NBL_SUPPORTED_NDK_}/build/cmake/android.toolchain.cmake")
-			message(STATUS "Found Android NDK '${_NBL_SUPPORTED_NDK_}' is appropriate!")
-		else()
-			message(FATAL_ERROR "Found Android NDK version isn't appropriate. Use '${_NBL_SUPPORTED_NDK_}'!")
-		endif()
+		set(_NBL_SUPPORTED_ABI_ 
+			"x86_64"
+			# "arm64-v8a" in future
+		)
 
-		if(EXISTS "${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_}/build-tools")
-			if(DEFINED ANDROID_ABI)
-				if(${ANDROID_ABI} STREQUAL ${_NBL_SUPPORTED_ABI_})
-					message(STATUS "Supported '${_NBL_SUPPORTED_ABI_}' ABI!")
-				
-				else()
-					message(FATAL_ERROR "Found '${ANDROID_ABI}' isn't appropriate. Use '${_NBL_SUPPORTED_ABI_}'!")
+		if(DEFINED ANDROID_ABI) # see _NBL_SUPPORTED_ABI_
+			set(FOUND 0)
+			foreach(CURRENT_ABI IN LISTS _NBL_SUPPORTED_ABI_)
+				if("${CURRENT_ABI}" STREQUAL ${ANDROID_ABI})
+					message(STATUS "Selecting found ${CURRENT_ABI} ABI!")
+					set(FOUND 1)
+					break()
 				endif()
+			endforeach()
+			
+			if(NOT FOUND)
+				message(FATAL_ERROR "Selected ${ANDROID_ABI} isn't appropriate. Supported ABIs: ${_NBL_SUPPORTED_ABI_}!")
 			else()
-				message(STATUS "Could not find 'ANDROID_ABI', using supported ABI: '${_NBL_SUPPORTED_ABI_}'")
-				set(ANDROID_ABI ${_NBL_SUPPORTED_ABI_} CACHE INTERNAL "" FORCE)
+				unset(FOUND)
 			endif()
+		else()
+			message(FATAL_ERROR "ANDROID_ABI must be specified at the very beginning of execution!")
+		endif()
 
-			message(STATUS "'${_NBL_SUPPORTED_NDK_}' located in Android SDK path. Building Nabla with Android toolchain!")
+		if(NOT DEFINED ANDROID_PLATFORM) # android-28
+			message(FATAL_ERROR "ANDROID_PLATFORM must be specified at the very beginning of execution!")
+		endif()
+	
+		include(${CMAKE_TOOLCHAIN_FILE})
+
+		if(${ANDROID_NDK_MAJOR} LESS 22) 
+			message(FATAL_ERROR "Update your NDK to at least 22. We don't support ${ANDROID_NDK_REVISION} NDK version!")
+		endif()
 
-			set(ANDROID_SDK_ROOT_PATH "${_NBL_EXPECTED_ANDROID_SDK_ROOT_DIRECTORY_}")
-			set(ANDROID_NDK_ROOT_PATH ${ANDROID_SDK_ROOT_PATH}/${_NBL_SUPPORTED_NDK_})
-				
-			set(NBL_BUILD_ANDROID ON)
-			set(_NBL_ANDROID_VALIDATED_ ON)
-		else()
-			message(FATAL_ERROR "${_NBL_SUPPORTED_NDK_} must be placed in Android SDK path!")
+		# note that we assume NDK has been installed using Android Studio, so the existing paths should look as followning:
+		# ${ANDROID_SDK_ROOT_PATH}/ndk/${ANDROID_NDK_REVISION}/build/cmake/android.toolchain.cmake
+		
+		set(ANDROID_NDK_ROOT_PATH ${CMAKE_ANDROID_NDK})
+		get_filename_component(ANDROID_SDK_ROOT_PATH "${ANDROID_NDK_ROOT_PATH}/../../" ABSOLUTE)
+		
+		if(EXISTS "${ANDROID_SDK_ROOT_PATH}/build-tools")
+			message(STATUS "Building Nabla with ${ANDROID_NDK_REVISION} NDK!")
 		endif()
+		
+		set(NBL_BUILD_ANDROID ON)
+		set(_NBL_ANDROID_VALIDATED_ ON)
 	endif()
 
 	# TODO - another toolchains in future
@@ -119,9 +127,6 @@ if(NBL_BUILD_ANDROID)
 
     #option(STRIP_ANDROID_LIBRARY "Strip the resulting android library" OFF)
 
-    if(NOT ANDROID_PLATFORM)
-        set(ANDROID_PLATFORM "android-25")
-    endif()
 	string(SUBSTRING
 		"${ANDROID_PLATFORM}"
 		8  # length of "android-"
@@ -152,7 +157,11 @@ if(NBL_BUILD_ANDROID)
         unset(__buildTools)
     endif()
 	set(ANDROID_BUILD_TOOLS "${ANDROID_SDK_ROOT_PATH}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}")
+	if(MSVC)
 	set(ANDROID_JAVA_BIN "${JAVA_HOME}")
+	else()
+	set(ANDROID_JAVA_BIN "${JAVA_HOME}/bin")
+	endif()
 	set(ANDROID_JAVA_RT_JAR "${JAVA_HOME}/jre/lib/rt.jar")
 
 	set(ANDROID_APK_TARGET_ID "" CACHE STRING "The Target ID to build the APK for like 'android-99', use <android list targets> to choose another one.")

README.md

@@ -160,7 +160,7 @@ Contact ***[@devshgraphicsprogramming](https://github.com/devshgraphicsprogrammi
 
 - [x] **Linux**
 
-- [ ] **Android 7.0 +**
+- [x] **Android 7.0 +**
 
 - [ ] **Mac OS**
 
@@ -174,7 +174,7 @@ Contact ***[@devshgraphicsprogramming](https://github.com/devshgraphicsprogrammi
 - **[CMake](https://cmake.org/download/)** 
 - **[MSVC](https://visualstudio.microsoft.com/pl/downloads/)** or **[GCC](https://sourceforge.net/projects/mingw-w64/)**
 - **[Vulkan SDK](https://vulkan.lunarg.com/sdk/home)**
-- **[Perl](https://www.perl.org/get.html)**
+- **[Perl 5.28 executable version](https://www.perl.org/get.html)**
 - **[NASM](https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D)**
 - **[Python 3.8](https://www.python.org/downloads/release/python-380/)** or later
 
@@ -205,20 +205,27 @@ After dealing with *CUDA* installing just install *Optix SKD*.
 **Required:**
 
 - **[Android Studio](https://developer.android.com/studio)**
-- **[NDK r22b](https://developer.android.com/ndk/downloads#stable-downloads)**
-- **[Java 8](https://www.java.com/download/)**
+- **[JDK 8](https://www.java.com/download/)**
 
-The first step is to install Android Studio and Java 8. When done, extract NDK r22b into *Android SDK root directory* usually located at `C:/Users/<your_user>/AppData/Local/AndroidSdk`. If you however can't find it, open Android Studio and go to **File** and **Project Structure** that will show you where your Android SDKs are installed.
+The first step is to install Android Studio and JDK 8. When done, open Android Studio and navigate to **Tools** -> **SDK Manager** -> **System Settings** -> **Android SDK**.
+Select *SDK Platforms* and install proper individual SDK components - install Android version with Android API level you will be targeting. Then switch to *SDK Tools* and make sure to install **Android SDK Build-Tools 32** and **NDK (Side by side)** - it's a *requirement*! Also you must make sure that your **JAVA_HOME** enviroment variable is set to proper JDK installation path.
 
-Now you can begin CMake generating. On Android Build there is an extra optional Ninja generator available. *Important note is that Nabla Android Build has been performed and tested so far on Windows as cross compile OS with **ninja** generator and on Linux as cross compile OS with **makefile** and **ninja** generators.* Before configuring you need to specify toolchain file for cross-compiling by passing path to `android.toolchain.cmake`. You can find it in NDK directory in `build/cmake/android.toolchain.cmake` and according to example of Android SDK root directory path it should look entirely like `C:/Users/<your_user>/AppData/Local/AndroidSdk/android-ndk-r22b/build/cmake/android.toolchain.cmake`.
+Now you can begin CMake'ing. We use **Ninja** generator tools as a generator for building Nabla for Android on both Windows and Linux Host-OSes. *Note that Nabla Android build has been performed and tested so far on Windows as cross compile OS with **Ninja** generator and on Linux as cross compile OS with **Makefile** and **Ninja** generators, but we recommend using **Ninja** for both OSes.* 
+
+Before configuring CMake you must add 2 cache variables:
+
+- **ANDROID_PLATFORM**
+- **ANDROID_ABI**
+
+**ANDROID_PLATFORM** is a target API platform that you pass as `android-x` where `x` is your android API level (you can pass 28 for instance). **ANDROID_ABI** is Application Binary Interface and note, that we support only `x86_64` currently. Those 2 cache variables *must be* specified before CMake configuration. Having done it you can specify toolchain file for cross-compiling by passing path to `android.toolchain.cmake`. You can find it in Android Studio's SDK directory in `ndk/<version>/build/cmake/android.toolchain.cmake`. Basically the entire path should look like this one `C:/Users/<your_user>/AppData/Local/AndroidSdk/ndk/<version>/build/cmake/android.toolchain.cmake`. With all of this feel free to generate.
 
 Having Nabla generated you need to enter build directory, launch the terminal and type `cmake --build . --target Nabla -j4 -v` or if you want build android sample example you would type `cmake --build . --target android_sample_apk -j4 -v`. The android sample example produces *.apk* file you can use for debugging and profiling.
 
-**Note:** each example provided by the engine builds as an executable with non-cross builds and with target of a name called *"a_target"*, in following example above it would be *"android_sample"*. When building cross-compile for android **to produce the APK file you need to add *"_apk"* postfix to the "*a_target"***, because "*a_target*" gets built then as a library.
+**Note:** each example provided by the engine builds as an executable with non-cross builds and with target of a name called `a_target`, in following example above it would be `android_sample`. When building cross-compile for android **to produce the APK file you need to add `_apk` postfix to the `a_target`, because `a_target` gets built then as a library.
 
 #### Chrome Book SDK version
 
-In order for the chromebook to work with the apk you build you need to install the right SDK version. Go to *Tools -> SDK Manager ->System and Settings -> Android SDK* then Select the *SDK Platforms* tab and tick the "Show Packake Details" checkbox in the bottom-right corner. After that select *Android 9.0 (Pie) -> Android SDK Platform 28* and hit "OK".
+In order for the chromebook to work with the apk you build you need to install the right SDK version. Go to **Tools** -> **SDK Manager** -> **System Settings** -> **Android SDK** then select the *SDK Platforms* tab and tick the "Show Packake Details" checkbox in the bottom-right corner. After that select *Android 9.0 (Pie) -> Android SDK Platform 28* and hit "OK".
 
 #### Chrome Book upload
 

cmake/common.cmake

@@ -364,7 +364,7 @@ macro(nbl_android_create_apk _TARGET)
 	)
 	set(D8_SCRIPT "${ANDROID_BUILD_TOOLS}/d8.bat")
     if(NOT EXISTS ${D8_SCRIPT})
-        set(DEX_COMMAND ${ANDROID_BUILD_TOOLS}/dx --dex --output=bin/classes.dex ./obj)
+        set(DEX_COMMAND ${ANDROID_BUILD_TOOLS}/d8 ./obj/eu/devsh/${TARGET_NAME}/Loader.class --output ./bin/)
     else()
         set(DEX_COMMAND ${D8_SCRIPT} --output ./bin/ ./obj/eu/devsh/${TARGET_NAME}/*.class)
     endif()
@@ -587,4 +587,4 @@ endmacro()
 
 macro(write_source_definitions NBL_FILE NBL_WRAPPER_CODE_TO_WRITE)
 	file(WRITE "${NBL_FILE}" "${NBL_WRAPPER_CODE_TO_WRITE}")
-endmacro()
+endmacro()

include/matrix4SIMD.h

@@ -169,6 +169,28 @@ class matrix4SIMD// : public AlignedBase<_NBL_SIMD_ALIGNMENT> don't inherit from
 
 		bool isBoxInFrustum(const aabbox3d<float>& bbox);
 
+		bool perspectiveTransformVect(core::vectorSIMDf& inOutVec)
+		{
+			transformVect(inOutVec);
+			const bool inFront = inOutVec[3] > 0.f;
+			inOutVec /= inOutVec.wwww();
+			return inFront;
+		}
+
+		core::vector2di fragCoordTransformVect(const core::vectorSIMDf& _in, const core::dimension2du& viewportDimensions)
+		{
+			core::vectorSIMDf pos(_in);
+			pos.w = 1.f;
+			if (perspectiveTransformVect(pos))
+				core::vector2di(-0x80000000, -0x80000000);
+
+			pos[0] *= 0.5f;
+			pos[1] *= 0.5f;
+			pos[0] += 0.5f;
+			pos[1] += 0.5f;
+
+			return core::vector2di(pos[0] * float(viewportDimensions.Width), pos[1] * float(viewportDimensions.Height));
+		}
 
 		static inline matrix4SIMD buildProjectionMatrixPerspectiveFovRH(float fieldOfViewRadians, float aspectRatio, float zNear, float zFar);
 		static inline matrix4SIMD buildProjectionMatrixPerspectiveFovLH(float fieldOfViewRadians, float aspectRatio, float zNear, float zFar);

include/nbl/system/ISystem.h

@@ -372,7 +372,7 @@ class ISystem : public core::IReferenceCounted
         bool deleteDirectory(const system::path& p)
         {
             if (std::filesystem::exists(p))
-                return std::filesystem::remove(p);
+                return std::filesystem::remove_all(p);
             else
                 return false;
         }

include/nbl/ui/CWindowManagerWin32.h

@@ -295,7 +295,16 @@ namespace nbl::ui
 				case ERT_CHANGE_CURSOR_VISIBILITY:
 				{
 					auto& params = req.changeCursorVisibilityParam;
-					ShowCursor(params.visible);
+					if(params.visible)
+					{
+						int ret = ShowCursor(true);
+						while (ret < 0)  ret = ShowCursor(true);
+					}
+					else
+					{
+						int ret = ShowCursor(false);
+						while (ret >= 0)  ret = ShowCursor(false);
+					}
 					break;
 				}
 				}
@@ -313,6 +322,10 @@ namespace nbl::ui
 				{
 					req.destroyWindowParam = std::move(params);
 				}
+				else if constexpr (std::is_same_v<RequestParams, SRequestParams_ChangeCursorVisibility&>)
+				{
+					req.changeCursorVisibilityParam = std::move(params);
+				}
 			}
 
 			bool wakeupPredicate() const { return true; }

src/nbl/builtin/CMakeLists.txt

@@ -18,6 +18,7 @@ function(nbl_add_builtin_resources)
 endfunction()
 
 set(nbl_resources_to_embed
+  "nbl/builtin/glsl/utils/acceleration_structures.glsl"
   "nbl/builtin/shader/loader/mtl/vertex_impl.glsl"
   "nbl/builtin/shader/loader/mtl/vertex_no_uv.vert" # TODO: remove naming tautology
   "nbl/builtin/shader/loader/mtl/vertex_uv.vert" # TODO: remove naming tautology