Bgfx old changes

.gitmodules

@@ -0,0 +1,17 @@
+[submodule "extern/rendering"]
+	path = extern/rendering
+	url = https://github.com/greentwip/bgfx.cmake
+
+[submodule "extern/math/glm"]
+	path = extern/math/glm
+	url = https://github.com/g-truc/glm
+
+[submodule "extern/rendering/bgfx"]
+	path = extern/rendering/bgfx
+	url = https://github.com/greentwip/bgfx
+[submodule "extern/rendering/bimg"]
+	path = extern/rendering/bimg
+	url = https://github.com/bkaradzic/bimg
+[submodule "extern/rendering/bx"]
+	path = extern/rendering/bx
+	url = https://github.com/bkaradzic/bx

CMakeLists.txt

@@ -25,10 +25,64 @@ include(AutoSetup)
 
 option(STORM_ENABLE_STEAM "Enable Steam integration" OFF)
 
+set(BGFX_BUILD_EXAMPLES OFF)
+set(BGFX_INSTALL_EXAMPLES OFF)
+
+set(BGFX_BUILD_TOOLS OFF)
+
 set(STORM_RESOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/res")
 set(STORM_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set(STORM_EXTERN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extern")
+set(STORM_EXTERN_RENDERING_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extern/rendering")
+set(STORM_EXTERN_MATH_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extern/math")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
+include_directories(${STORM_EXTERN_RENDERING_DIR}/bgfx/examples/common
+						${STORM_EXTERN_RENDERING_DIR}/bgfx/3rdparty 
+						${STORM_EXTERN_RENDERING_DIR}/bgfx/3rdparty/dxsdk/include 
+						${STORM_EXTERN_RENDERING_DIR}/bgfx/3rdparty/khronos
+						$<BUILD_INTERFACE:${STORM_EXTERN_RENDERING_DIR}/bgfx/include>
+						$<BUILD_INTERFACE:${STORM_EXTERN_RENDERING_DIR}/bgfx/examples/common>
+						$<BUILD_INTERFACE:${STORM_EXTERN_RENDERING_DIR}/bgfx/tools/brtshaderc>
+						$<BUILD_INTERFACE:${STORM_EXTERN_RENDERING_DIR}/bimg/include>
+						$<BUILD_INTERFACE:${STORM_EXTERN_RENDERING_DIR}/bx/include>
+						$<BUILD_INTERFACE:${STORM_EXTERN_RENDERING_DIR}/bx/3rdparty>
+						${STORM_EXTERN_MATH_DIR}/glm/glm
+						${GLSL-OPTIMIZER_INCLUDES}
+						${GLSLLANG_INCLUDES}
+						${SPIRV_CROSS_INCLUDES}
+						${SPIRV_TOOLS_INCLUDES}
+						${WEBGPU_INCLUDES})
+
+# Build system specific configurations
+if( MSVC )
+	include_directories($<BUILD_INTERFACE:${BX_DIR}/include/compat/msvc>
+						$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/msvc>)
+elseif( MINGW )
+	include_directories($<BUILD_INTERFACE:${BX_DIR}/include/compat/mingw>
+		    			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/mingw> )
+elseif( APPLE )
+	include_directories($<BUILD_INTERFACE:${BX_DIR}/include/compat/osx>
+		    			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/compat/osx> )
+endif()
+
+include_directories()
+
+
+
+add_definitions("-D_CRT_SECURE_NO_WARNINGS" "-D__STDC_FORMAT_MACROS")
+
+
 add_subdirectory(src)
+
+target_link_libraries(engine PRIVATE bgfx dear-imgui meshoptimizer brtshaderc fcpp bx bimg bgfx-vertexlayout bgfx-shader-spirv fcpp glsl-optimizer glslang spirv-cross spirv-tools webgpu example-common)
+
+
+add_subdirectory(${STORM_EXTERN_RENDERING_DIR})
+
+add_subdirectory(${STORM_EXTERN_MATH_DIR}/glm)
+
+
+
+

CMakeSettings.json

@@ -8,8 +8,9 @@
       "buildRoot": "${projectDir}\\build\\${name}",
       "cmakeCommandArgs": "-DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl",
       "buildCommandArgs": "",
-      "enableClangTidyCodeAnalysis": true,
-      "variables": []
+      "addressSanitizerEnabled": true,
+      "addressSanitizerRuntimeFlags": "windows_hook_legacy_allocators=true:halt_on_error=0",
+      "enableClangTidyCodeAnalysis": true
     },
     {
       "name": "msvc-release",
@@ -19,8 +20,7 @@
       "buildRoot": "${projectDir}\\build\\${name}",
       "cmakeCommandArgs": "-DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl",
       "buildCommandArgs": "",
-      "enableClangTidyCodeAnalysis": true,
-      "variables": []
+      "enableClangTidyCodeAnalysis": true
     }
   ]
-}
+}

extern/rendering/.gitignore

@@ -0,0 +1,15 @@
+[Bb]uild/
+*.swp
+CMakeCache.txt
+CMakeFiles/
+Debug/
+Release/
+*.vcxproj
+*.vcxproj.filters
+*.dir/
+*.sln
+install/
+install_manifest.txt
+generated/*
+!generated/*.in
+cmake_install.cmake

extern/rendering/.travis.yml

@@ -0,0 +1,164 @@
+language: cpp
+
+addons:
+  apt_packages:
+    - libgl1-mesa-dev
+  homebrew:
+    packages:
+     - cmake
+    update: true
+
+matrix:
+  include:
+
+  - name: "Linux gcc"
+    os: linux
+    dist: xenial
+    compiler: gcc
+    env:
+      - AMALGAMATED=OFF
+
+  - name: "Linux gcc Amalgamated"
+    os: linux
+    dist: xenial
+    compiler: gcc
+    env:
+      - AMALGAMATED=ON
+
+  - name: "Linux clang"
+    os: linux
+    dist: xenial
+    compiler: clang
+    env:
+      - AMALGAMATED=OFF
+
+  - name: "Linux clang Amalgamated"
+    os: linux
+    dist: xenial
+    compiler: clang
+    env:
+      - AMALGAMATED=ON
+
+  - name: "macOS Xcode 10"
+    os: osx
+    osx_image: xcode10
+    env:
+      - CMAKE_FLAGS="-GXcode"
+      - AMALGAMATED=OFF
+
+  - name: "macOS Xcode 10 Amalgamated"
+    os: osx
+    osx_image: xcode10
+    env:
+      - CMAKE_FLAGS="-GXcode"
+      - AMALGAMATED=ON
+
+  - name: "macOS Xcode 10 (Makefiles)"
+    os: osx
+    osx_image: xcode10
+    env:
+      - AMALGAMATED=OFF
+
+  - name: "macOS Xcode 10 Amalgamated (Makefiles)"
+    os: osx
+    osx_image: xcode10
+    env:
+      - AMALGAMATED=ON
+
+  #- name: "iOS Xcode 10"
+  #  os: osx
+  #  osx_image: xcode10
+  #  env:
+  #   - CMAKE_FLAGS="-GXcode -DCMAKE_SYSTEM_NAME=iOS -DBGFX_BUILD_TOOLS=OFF -DCMAKE_OSX_SYSROOT=iphonesimulator"
+  #   - AMALGAMATED=OFF
+
+  #- name: "iOS Xcode 10 Amalgamated"
+  #  os: osx
+  #  osx_image: xcode10
+  #  env:
+  #   - CMAKE_FLAGS="-GXcode -DCMAKE_SYSTEM_NAME=iOS -DBGFX_BUILD_TOOLS=OFF -DCMAKE_OSX_SYSROOT=iphonesimulator"
+  #   - AMALGAMATED=ON
+
+  - name: "Visual studio 15 2017"
+    os: windows
+    env:
+      - AMALGAMATED=OFF
+
+
+  - name: "Visual studio 15 2017 Amalgamated"
+    os: windows
+    env:
+      - AMALGAMATED=ON
+
+  - name: "Emscripten"
+    os: linux
+    dist: xenial
+    language: node_js
+    services:
+      - docker
+    before_script: 
+      - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash
+    script:
+      - docker exec -it emscripten emconfigure cmake . -DBGFX_BUILD_TOOLS=OFF -DBGFX_AMALGAMATED=$AMALGAMATED -DBX_AMALGAMATED=$AMALGAMATED
+      - docker exec -it emscripten emmake make
+    env:
+      - AMALGAMATED=OFF
+
+  - name: "Emscripten Amalgamated"
+    os: linux
+    dist: xenial
+    language: node_js
+    services:
+      - docker
+    before_script: 
+      - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash
+    script:
+      - docker exec -it emscripten emconfigure cmake . -DBGFX_BUILD_TOOLS=OFF -DBGFX_AMALGAMATED=$AMALGAMATED -DBX_AMALGAMATED=$AMALGAMATED
+      - docker exec -it emscripten emmake make
+    env:
+      - AMALGAMATED=OFF
+
+  - name: "Android armeabi-v7a"
+    language: android
+    android: &androidComponents
+      components:
+        - tools
+        - platform-tools
+        - build-tools-26.0.1
+    env:
+      - CMAKE_FLAGS="-DCMAKE_SYSTEM_NAME=Android -DBGFX_BUILD_TOOLS=OFF -DBGFX_BUILD_EXAMPLES=OFF -DCMAKE_ANDROID_NDK=$TRAVIS_BUILD_DIR/android-ndk-r18b -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26"
+      - AMALGAMATED=OFF
+    install: &androidInstall
+      - echo y | sdkmanager "cmake;3.10.2.4988404"
+      - sudo ln -sf /usr/local/android-sdk/cmake/3.10.2.4988404/bin/cmake /usr/bin/cmake
+      - wget https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip
+      - unzip -qq android-ndk-r18b-linux-x86_64.zip
+
+  - name: "Android armeabi-v7a Amalgamated"
+    language: android
+    android: *androidComponents
+    env:
+      - CMAKE_FLAGS="-DCMAKE_SYSTEM_NAME=Android -DBGFX_BUILD_TOOLS=OFF -DBGFX_BUILD_EXAMPLES=OFF -DCMAKE_ANDROID_NDK=$TRAVIS_BUILD_DIR/android-ndk-r18b -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26"
+      - AMALGAMATED=ON
+    install: *androidInstall
+
+  - name: "Android x86"
+    language: android
+    android: *androidComponents
+    env:
+      - CMAKE_FLAGS="-DCMAKE_SYSTEM_NAME=Android -DBGFX_BUILD_TOOLS=OFF -DBGFX_BUILD_EXAMPLES=OFF -DCMAKE_ANDROID_NDK=$TRAVIS_BUILD_DIR/android-ndk-r18b -DCMAKE_ANDROID_ARCH_ABI=x86 -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26"
+      - AMALGAMATED=OFF
+    install: *androidInstall
+
+  - name: "Android x86 Amalgamated"
+    language: android
+    android: *androidComponents
+    env:
+      - CMAKE_FLAGS="-DCMAKE_SYSTEM_NAME=Android -DBGFX_BUILD_TOOLS=OFF -DBGFX_BUILD_EXAMPLES=OFF -DCMAKE_ANDROID_NDK=$TRAVIS_BUILD_DIR/android-ndk-r18b -DCMAKE_ANDROID_ARCH_ABI=x86 -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26"
+      - AMALGAMATED=ON
+    install: *androidInstall
+
+script:
+  - mkdir build && cd build
+  - cmake $CMAKE_FLAGS -DBGFX_INSTALL_EXAMPLES=ON -DBGFX_AMALGAMATED=$AMALGAMATED -DBX_AMALGAMATED=$AMALGAMATED ..
+  - cmake --build .