Skip to content

Commit 9354cdc

Browse files
AtraxusAtraxus
committed
Merge remote-tracking branch 'origin/development'
2 parents 84f2089 + 05afe8f commit 9354cdc

File tree

207 files changed

+7467
-6792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+7467
-6792
lines changed

‎.clang-format‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ UseTab: Never
1111
TabWidth: 4
1212
# extra
1313
# AlignConsecutiveAssignments: true
14-
# ColumnLimit: 150
15-
# AlignConsecutiveMacros : true
14+
ColumnLimit: 150
15+
# AlignConsecutiveMacros : true

‎.github/workflows/buildAndTest.yml‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎.github/workflows/testUbuntu.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: testUbuntu
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
7+
BUILD_TYPE: Release
8+
9+
jobs:
10+
build:
11+
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
12+
# You can convert this to a matrix build if you need cross-platform coverage.
13+
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v3
18+
19+
- name: Update all submodules
20+
run: |
21+
git submodule sync
22+
git submodule update --init --recursive
23+
24+
25+
- name: Install dependencies
26+
run: |
27+
sudo wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
28+
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.224-focal.list https://packages.lunarg.com/vulkan/1.3.224/lunarg-vulkan-1.3.224-focal.list
29+
sudo apt update --yes
30+
sudo apt install --yes vulkan-sdk
31+
32+
- name: Configure CMake
33+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
34+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
35+
run: cmake -B ${{github.workspace}}/build -DWERROR=YES -DH5=NO -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
36+
37+
- name: Build
38+
# Build your program with the given configuration
39+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
40+
41+
- name: Test
42+
working-directory: ${{github.workspace}}/build/bin/release
43+
run: ./RAYX_tst -x
44+

‎.github/workflows/testWindows.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: testWindows
2+
3+
on: [push, pull_request]
4+
5+
env:
6+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
7+
BUILD_TYPE: Release
8+
9+
jobs:
10+
build:
11+
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
12+
# You can convert this to a matrix build if you need cross-platform coverage.
13+
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
14+
runs-on: windows-latest
15+
16+
steps:
17+
- uses: actions/checkout@v3
18+
19+
- name: Update all submodules
20+
run: |
21+
git submodule sync
22+
git submodule update --init --recursive
23+
24+
- name: Configure CMake
25+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
26+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
27+
run: cmake -B ${{github.workspace}}/build -DWERROR=YES -DH5=NO -DVULKAN=NO -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
28+
29+
- name: Build
30+
# Build your program with the given configuration
31+
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
32+
33+
- name: Test
34+
working-directory: ${{github.workspace}}/build/bin/release
35+
run: ./RAYX_tst -x

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@
1010
[submodule "Extern/googletest"]
1111
path = Extern/googletest
1212
url = https://github.com/google/googletest
13+
[submodule "Extern/VMA"]
14+
path = Extern/VMA
15+
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator

‎.pre-commit‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
3+
# add this pre-commit hook with
4+
#
5+
# cd .git/hooks
6+
# ln -s ../../.pre-commit pre-commit
7+
#
8+
9+
echo formatting hook ..
10+
11+
while [[ ! -d .git ]]
12+
do
13+
cd ..
14+
done
15+
16+
exec ./format.sh

‎CMakeLists.txt‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
22

3-
set(CMAKE_CXX_STANDARD 20)
4-
53
project(RAYX)
4+
set(CMAKE_CXX_STANDARD 20)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
66

7-
# enable all warnings
8-
if(MSVC)
9-
message(STATUS "MSVC")
10-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
11-
else()
12-
message(STATUS "GCC")
13-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") # -Wconversion -Wsign-conversion")
14-
endif()
7+
add_subdirectory(Intern)
8+
add_subdirectory(Extern)
9+
add_subdirectory(Tests)
1510

16-
if("$ENV{CI}" STREQUAL "YES")
17-
# warnings are treated as errors
18-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Werror -D CI") # -O3 finds more errors!
19-
message(STATUS "CI mode")
20-
endif()
11+
option(WERROR "add -Werror option" "NO") # inactive per default
12+
option(VULKAN "include the VulkanTracer" "YES") # activated per default
13+
option(H5 "include the H5Writer" "YES") # active per default
2114

2215
# -------CodeCoverage-------
2316
option(BUILD_WITH_GCOV "Add Code Coverage to build" FALSE)
@@ -36,8 +29,4 @@ if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Debug" AND BUILD_WITH
3629
# setup_target_for_coverage_gcovr_html(NAME ${PROJECT_NAME}_coverage_gcovr_html
3730
# EXECUTABLE ${CMAKE_PROJECT_NAME}_tst)
3831
endif()
39-
4032
# ---------------------------
41-
add_subdirectory(Intern)
42-
add_subdirectory(Extern)
43-
add_subdirectory(Tests)

‎Extern/CLI11‎

Submodule CLI11 updated 118 files

‎Extern/HighFive‎

Submodule HighFive updated 130 files

‎Extern/VMA‎

Submodule VMA added at dd09767

0 commit comments

Comments
 (0)