Resolved conflicts

Author: Przemog1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Report a bug or problem encountered while using Nabla
+labels: bug
+---
+
+## Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+## Steps to Reproduce
+<!-- Please describe how the bug you've encountered can be reproduced -->
+
+## Expected vs observed behavior
+<!-- Clearly describe what you get, and how it goes across your expectations. -->
+
+## Environment
+<!-- Please provide the following information -->
+
+* **OS:**
+* **CPU:**
+* **GPU:**
+* **GPU driver version:**
+* **Compiler:**
+* **branch:**
+* **commit hash:**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+labels: enhancement
+---
+
+## Description
+<!-- Please describe your suggestion -->
+
+## Description of the related problem
+<!-- Is your feature request related to a problem? Please provide
+A clear and concise description of what the problem is. -->
+
+## Solution proposal
+<!-- A clear and concise description of what you want to happen. -->
+
+## Additional context
+<!-- Add any other context or screenshots about the feature request here. -->
+
+
+

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+## Description
+<!-- Describe what problem this is solving, and how it's solved. -->
+
+## Testing 
+<!-- Explain how this change was tested. -->
+
+## TODO list:
+<!-- A list of things that have to be finished before this PR can be merged -->
+
+<!--
+By creating this pull request into Nabla, you agree to release all your past (even from previous commits) and present contributions in the Nabla repository under the Apache 2.0 license. If you're not the sole contributor, ensure that all contributors have signed the CLA agreeing to this.
+-->

.github/workflows/repo_mirroring_workflow.yml

@@ -0,0 +1,28 @@
+name: repo_mirroring
+
+on:
+  schedule:
+  - cron:  "*/60 * * * *"
+  workflow_dispatch:
+
+jobs:
+  repo-sync:
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        persist-credentials: false
+    - name: repo-sync-master
+      uses: repo-sync/github-sync@v2
+      with:
+        source_repo: "buildaworldnet/IrrlichtBAW"
+        source_branch: "master"
+        destination_branch: "master_irrlichtbaw"
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+    - name: repo-sync-shader-pipeline
+      uses: repo-sync/github-sync@v2
+      with:
+        source_repo: "buildaworldnet/IrrlichtBAW"
+        source_branch: "shader_pipeline"
+        destination_branch: "shader_pipeline_irrlichtbaw"
+        github_token: ${{ secrets.GITHUB_TOKEN }}

3rdparty/CMakeLists.txt

@@ -1,16 +1,6 @@
-# Copyright (c) 2019 DevSH Graphics Programming Sp. z O.O.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+# This file is part of the "Nabla Engine".
+# For conditions of distribution and use, see copyright notice in nabla.h
 
 include(../cmake/common.cmake)
 
@@ -178,8 +168,8 @@ set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
 set(BUILD_TESTING ${_OLD_BUILD_TESTING})
 
 #gli
-option(_IRR_COMPILE_WITH_GLI_ "Build with GLI library" ON)
-if(_IRR_COMPILE_WITH_GLI_)
+option(_NBL_COMPILE_WITH_GLI_ "Build with GLI library" ON)
+if(_NBL_COMPILE_WITH_GLI_)
 	set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 	set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
 	set(_OLD_BUILD_TESTING ${BUILD_TESTING})
@@ -245,13 +235,13 @@ add_library(aesGladman OBJECT
 	aesGladman/sha1.c
 )
 
-if (IRR_BUILD_CEGUI) # I absolutely hate and despise GLM
+if (NBL_BUILD_CEGUI) # I absolutely hate and despise GLM
 	set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 	set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
 	set(BUILD_SHARED_LIBS OFF)
 	set(BUILD_STATIC_LIBS OFF)
 	option(GLM_TEST_ENABLE_CXX_14 "Enable C++ 14" ON)
-	if (IRR_FAST_MATH)
+	if (NBL_FAST_MATH)
 	   option(GLM_TEST_ENABLE_FAST_MATH "Enable fast math optimizations" ON)
 	endif()
 	option(GLM_TEST_ENABLE_SIMD_SSE4_2 "Enable SSE 4.2 optimizations" ON)
@@ -267,7 +257,7 @@ option(GLM_TEST_ENABLE "Build unit tests" OFF)
 set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
 set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
 
-if (IRR_BUILD_MITSUBA_LOADER)
+if (NBL_BUILD_MITSUBA_LOADER)
    update_git_submodule(./libexpat)
 
    option(BUILD_tools "EXPAT: build the xmlwf tool for expat library" OFF)
@@ -290,7 +280,7 @@ if (IRR_BUILD_MITSUBA_LOADER)
    set(MITSUBA_LOADER_DEPENDENT_LIBS ${MITSUBA_LOADER_DEPENDENT_LIBS} PARENT_SCOPE)
 endif()
 
-if (IRR_BUILD_CEGUI)
+if (NBL_BUILD_CEGUI)
 	update_git_submodule(./libexpat)
 	update_git_submodule(./CEGUI/pcre)
 	update_git_submodule(./CEGUI/glew)
@@ -417,7 +407,7 @@ if (IRR_BUILD_CEGUI)
 	)
 endif()
 
-if (IRR_BUILD_RADEON_RAYS)
+if (NBL_BUILD_RADEON_RAYS)
 	update_git_submodule(./radeonrays)
 
 	option(RR_NO_TESTS "RADEON_RAYS: don't do tests" ON)
@@ -437,7 +427,7 @@ if (IRR_BUILD_RADEON_RAYS)
 	set(RADEON_RAYS_DEPENDENT_LIBS ${RADEON_RAYS_DEPENDENT_LIBS} PARENT_SCOPE)
 endif()
 
-if (IRR_BUILD_BULLET)
+if (NBL_BUILD_BULLET)
 	update_git_submodule(./bullet3)
 	set(BULLET_INCLUDE_PATH
 		${CMAKE_CURRENT_SOURCE_DIR}/bullet3/src
@@ -447,11 +437,11 @@ if (IRR_BUILD_BULLET)
 endif()
 
 
-if (IRR_COMPILE_WITH_CUDA)
+if (NBL_COMPILE_WITH_CUDA)
 	update_git_submodule(./jitify)
 endif()
 
-set(IRR_3RDPARTY_TARGETS
+set(NBL_3RDPARTY_TARGETS
 				lzma
 				lz4
 				aesGladman
@@ -476,13 +466,13 @@ set(IRR_3RDPARTY_TARGETS
 				SPIRV-Tools
 				SPIRV-Tools-opt )
 #TODO insert more targets that are conditionally built
-if (IRR_BUILD_MITSUBA_LOADER)
-	list(APPEND IRR_3RDPARTY_TARGETS expat)
+if (NBL_BUILD_MITSUBA_LOADER)
+	list(APPEND NBL_3RDPARTY_TARGETS expat)
 endif()
 if(ENABLE_HLSL)
-	list(APPEND IRR_3RDPARTY_TARGETS HLSL)
+	list(APPEND NBL_3RDPARTY_TARGETS HLSL)
 endif()
-foreach(trgt IN LISTS IRR_3RDPARTY_TARGETS)
+foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
 		set_property(TARGET ${trgt} PROPERTY
              MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 endforeach()

CMakeLists.txt

@@ -1,17 +1,6 @@
-# Copyright (c) 2019 DevSH Graphics Programming Sp. z O.O.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+# This file is part of the "Nabla Engine".
+# For conditions of distribution and use, see copyright notice in nabla.h
 
 cmake_minimum_required(VERSION 3.16)
 #policies
@@ -29,27 +18,27 @@ else()
 	message(STATUS "Vulkan driver is not enabled")
 endif()
 
-option(IRR_COMPILE_WITH_CUDA "Compile with CUDA interop?" OFF)
+option(NBL_COMPILE_WITH_CUDA "Compile with CUDA interop?" OFF)
 
 # CUDA test
 include(CheckLanguage)
 check_language(CUDA)
 #if(NOT CMAKE_CUDA_COMPILER OR CMAKE_CUDA_COMPILER_VERSION VERSION_LESS "9.0")
 if(NOT CMAKE_CUDA_COMPILER)
-	if (IRR_COMPILE_WITH_CUDA)
+	if (NBL_COMPILE_WITH_CUDA)
 		#message(WARNING "CUDA not found or version (${CMAKE_CUDA_COMPILER_VERSION}) lower than 9.0 found, version 9.0+ needed for C++14 support.")
 		message(WARNING "CUDA not found.")
 	endif()
 else()
-	if (IRR_COMPILE_WITH_CUDA)
+	if (NBL_COMPILE_WITH_CUDA)
 		enable_language(CUDA)
 	else()
-		message(STATUS "CUDA version 9.0+ found, you can enable the IRR_COMPILE_WITH_CUDA option.")
+		message(STATUS "CUDA version 9.0+ found, you can enable the NBL_COMPILE_WITH_CUDA option.")
 	endif()
 endif()
 
 #
-get_filename_component(IRR_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
+get_filename_component(NBL_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
 
 # Configure CCache if available
 find_program(CCACHE_FOUND ccache)
@@ -67,7 +56,7 @@ set(CMAKE_CODELITE_USE_TARGETS ON CACHE BOOL "")
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # Cause CUDA is a special snowflake
-if (IRR_COMPILE_WITH_CUDA)
+if (NBL_COMPILE_WITH_CUDA)
 	set(CMAKE_CUDA_STANDARD 14)
 	set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 endif()
@@ -84,17 +73,17 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 if (DEFINED ENV{NUMBER_OF_PROCESSORS})
-	set(IRR_PARALLEL_BUILD_JOBS $ENV{NUMBER_OF_PROCESSORS})
+	set(NBL_PARALLEL_BUILD_JOBS $ENV{NUMBER_OF_PROCESSORS})
 else()
-	set(IRR_PARALLEL_BUILD_JOBS 8)
+	set(NBL_PARALLEL_BUILD_JOBS 8)
 endif()
 
 macro(irr_adjust_flags)
-	option(IRR_GCC_SANITIZE_ADDRESS OFF)
-	option(IRR_GCC_SANITIZE_THREAD OFF)
+	option(NBL_GCC_SANITIZE_ADDRESS OFF)
+	option(NBL_GCC_SANITIZE_THREAD OFF)
 
 	if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-		if (NOT IRR_BUILD_CEGUI)
+		if (NOT NBL_BUILD_CEGUI)
 			add_compile_options(-fno-exceptions)
 		endif()
 
@@ -121,10 +110,10 @@ macro(irr_adjust_flags)
 			#"$<$<CONFIG:RELEASE>:-O3>" # added by default and apparently cmake is not clever enough to filter duplicates for this one
 			"$<$<CONFIG:RELEASE>:-fexpensive-optimizations>"
 		)
-		if (IRR_GCC_SANITIZE_ADDRESS)
+		if (NBL_GCC_SANITIZE_ADDRESS)
 			add_compile_options(-fsanitize=address)
 		endif()
-		if (IRR_GCC_SANITIZE_THREAD)
+		if (NBL_GCC_SANITIZE_THREAD)
 			add_compile_options(-fsanitize=thread)
 		endif()
 		if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.1)
@@ -190,46 +179,46 @@ macro(irr_adjust_definitions)
 endmacro()
 
 if(WIN32)
-	set(_IRR_PLATFORM_WINDOWS_ 1)
+	set(_NBL_PLATFORM_WINDOWS_ 1)
 elseif(UNIX)
-	set(_IRR_PLATFORM_LINUX_ 1)
+	set(_NBL_PLATFORM_LINUX_ 1)
 endif()
 
 #uncomment in the future
-#option(IRR_TARGET_ARCH_ARM "Build for ARM?" OFF)
+#option(NBL_TARGET_ARCH_ARM "Build for ARM?" OFF)
 
-option(IRR_COMPILE_WITH_OPENGL "Compile with OpenGL backend?" ON)
-option(IRR_COMPILE_WITH_OPENCL "Compile with OpenCL interop?" ON)
+option(NBL_COMPILE_WITH_OPENGL "Compile with OpenGL backend?" ON)
+option(NBL_COMPILE_WITH_OPENCL "Compile with OpenCL interop?" ON)
 
-option(IRR_PCH "Enable pre-compiled header" ON)
+option(NBL_PCH "Enable pre-compiled header" ON)
 
-option(IRR_FAST_MATH "Enable fast low-precision math" ON)
+option(NBL_FAST_MATH "Enable fast low-precision math" ON)
 
-option(IRR_BUILD_EXAMPLES "Enable building examples" ON)
+option(NBL_BUILD_EXAMPLES "Enable building examples" ON)
 
-option(IRR_BUILD_TOOLS "Enable building tools (just convert2BAW as for now)" ON)
+option(NBL_BUILD_TOOLS "Enable building tools (just convert2BAW as for now)" ON)
 
-option(IRR_BUILD_MITSUBA_LOADER "Enable irr::ext::MitsubaLoader?" ON)
+option(NBL_BUILD_MITSUBA_LOADER "Enable irr::ext::MitsubaLoader?" ON)
 
-option(IRR_BUILD_RADEON_RAYS "Enable irr::ext::RadeonRays?" OFF)
+option(NBL_BUILD_RADEON_RAYS "Enable irr::ext::RadeonRays?" OFF)
 
-if (IRR_COMPILE_WITH_CUDA)
+if (NBL_COMPILE_WITH_CUDA)
 	find_package(OPTIX)
 	if (OPTIX_FOUND)
-		message(STATUS "CUDA and OptiX found, you can enable IRR_BUILD_OPTIX")
+		message(STATUS "CUDA and OptiX found, you can enable NBL_BUILD_OPTIX")
 	else()
 		message(STATUS "OptiX not found")
 	endif()
-	option(IRR_BUILD_OPTIX "Enable irr::ext::OptiX?" OFF)
+	option(NBL_BUILD_OPTIX "Enable irr::ext::OptiX?" OFF)
 else()
-	message(STATUS "Because IRR_COMPILE_WITH_CUDA is not enabled, the IRR_BUILD_OPTIX option will be hidden.")
+	message(STATUS "Because NBL_COMPILE_WITH_CUDA is not enabled, the NBL_BUILD_OPTIX option will be hidden.")
 endif()
 
-option(IRR_BUILD_CEGUI "Enable CEGUI building and integration?" OFF)
+option(NBL_BUILD_CEGUI "Enable CEGUI building and integration?" OFF)
 
-option(IRR_BUILD_BULLET "Enable Bullet Physics building and integration?" OFF)
+option(NBL_BUILD_BULLET "Enable Bullet Physics building and integration?" OFF)
 
-option(IRR_BUILD_DOCS "Enable building documentation?" ON)
+option(NBL_BUILD_DOCS "Enable building documentation?" ON)
 
 set(THIRD_PARTY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty")
 set(THIRD_PARTY_BINARY_DIR "${PROJECT_BINARY_DIR}/3rdparty")
@@ -240,23 +229,23 @@ execute_process(COMMAND git submodule sync --recursive
 		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
 add_subdirectory(${THIRD_PARTY_SOURCE_DIR})
 
-OPTION(IRR_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" ON)
+OPTION(NBL_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" ON)
 
 
 add_subdirectory(src/irr) # Irrlicht code	|	Moved cmakelists.txt from source/Irrlicht to src/irr
 
 
 
-if(IRR_BUILD_TOOLS)
+if(NBL_BUILD_TOOLS)
 	add_subdirectory(tools) # convert2BAW
 endif()
 
 add_subdirectory(ext)
 
-if(IRR_BUILD_EXAMPLES)
+if(NBL_BUILD_EXAMPLES)
 	add_subdirectory(examples_tests)
 endif()
 
-if(IRR_BUILD_DOCS)
+if(NBL_BUILD_DOCS)
 	add_subdirectory(docs)
 endif()