Skip to content

Commit 11a4944

Browse files
Merge pull request #241 from Devsh-Graphics-Programming/erfan_revive_raytracer
Raytracer Slight Revive
2 parents 1d5b85a + 430a326 commit 11a4944

File tree

107 files changed

+7276
-3329
lines changed

Some content is hidden

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

107 files changed

+7276
-3329
lines changed

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# CEGUI's downloaded dependencies on Windows
1717
3rdparty/CEGUI/cegui-deps-0.8.x-src.zip
1818
# usually where people build
19-
build/*
19+
build*/*
2020
# default install paths
2121
install/*
2222
# legacy temporary and output directories
@@ -25,8 +25,5 @@ doctemp/*
2525
source/obj
2626
source/Irrlicht/libIrrlichtServer.a
2727
# stuff output by examples
28-
examples_tests/06.MeshLoaders/bin/cow.baw
29-
examples_tests/06.MeshLoaders/bin/extrusionLogo_TEST_fixed.baw
30-
examples_tests/07.HardwareSkinning/bin/dwarf.baw
31-
examples_tests/39.DenoiserTonemapper/bin/*
32-
28+
examples_tests/*/bin/*
29+
examples_tests/tmp/*

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[submodule "3rdparty/glslang"]
88
path = 3rdparty/glslang
99
url = https://github.com/devshgraphicsprogramming/glslang.git
10-
branch = master
10+
branch = nabla
1111
[submodule "3rdparty/shaderc"]
1212
path = 3rdparty/shaderc
1313
url = https://github.com/google/shaderc.git
@@ -87,7 +87,7 @@
8787
url = https://github.com/greg7mdp/parallel-hashmap
8888
[submodule "3rdparty/radeonrays"]
8989
path = 3rdparty/radeonrays
90-
url = https://github.com/devshgraphicsprogramming/RadeonRays_SDK.git
90+
url = git@github.com:devshgraphicsprogramming/RadeonRays_SDK.git
9191
branch = baw
9292
[submodule "3rdparty/jitify"]
9393
path = 3rdparty/jitify

3rdparty/glslang

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
include(common RESULT_VARIABLE RES)
3+
if(NOT RES)
4+
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
5+
endif()
6+
7+
nbl_create_executable_project("" "" "" "")

0 commit comments

Comments
 (0)