Skip to content

Commit bd57c8f

Browse files
committed
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla into docker
2 parents 7b17a40 + 08f54ba commit bd57c8f

File tree

1,399 files changed

+519872
-297121
lines changed

Some content is hidden

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

1,399 files changed

+519872
-297121
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,10 @@ android-sample/bin/*
2929
preprocessed.hlsl
3030
compiled.spv
3131
.vs/*
32+
tools/nsc/__main__.py
33+
tools/nsc/.vscode/*
34+
tools/nsc/.profiles/*
35+
tools/nsc/bin/*
3236
*/__pycache__/*
3337
__pycache__/*
38+
*.pyc

.gitmodules

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
[submodule "3rdparty/libpng"]
1818
path = 3rdparty/libpng
1919
url = git@github.com:Devsh-Graphics-Programming/libpng.git
20-
[submodule "3rdparty/openssl/openssl"]
21-
path = 3rdparty/openssl/openssl
22-
url = git@github.com:Devsh-Graphics-Programming/openssl.git
23-
branch = OpenSSL_1_0_2-stable
2420
[submodule "3rdparty/libjpeg-turbo"]
2521
path = 3rdparty/libjpeg-turbo
2622
url = git@github.com:Devsh-Graphics-Programming/libjpeg-turbo.git
@@ -74,6 +70,10 @@
7470
[submodule "examples_tests"]
7571
path = examples_tests
7672
url = git@github.com:Devsh-Graphics-Programming/Nabla-Examples-and-Tests.git
73+
[submodule "3rdparty/msdfgen"]
74+
path = 3rdparty/msdfgen
75+
url = git@github.com:Chlumsky/msdfgen.git
76+
branch = master
7777
[submodule "3rdparty/dxc/dxc"]
7878
path = 3rdparty/dxc/dxc
7979
url = git@github.com:Devsh-Graphics-Programming/DirectXShaderCompiler.git
@@ -90,3 +90,27 @@
9090
[submodule "3rdparty/boost/superproject"]
9191
path = 3rdparty/boost/superproject
9292
url = git@github.com:boostorg/boost.git
93+
[submodule "3rdparty/argparse"]
94+
path = 3rdparty/argparse
95+
url = git@github.com:p-ranav/argparse.git
96+
[submodule "3rdparty/nlohmann_json"]
97+
path = 3rdparty/nlohmann_json
98+
url = git@github.com:Devsh-Graphics-Programming/json.git
99+
[submodule "3rdparty/blake"]
100+
path = 3rdparty/blake
101+
url = git@github.com:Devsh-Graphics-Programming/BLAKE3.git
102+
[submodule "3rdparty/imguizmo"]
103+
path = 3rdparty/imguizmo
104+
url = git@github.com:Devsh-Graphics-Programming/ImGuizmo.git
105+
[submodule "3rdparty/imgui_test_engine"]
106+
path = 3rdparty/imgui_test_engine
107+
url = git@github.com:ocornut/imgui_test_engine.git
108+
[submodule "3rdparty/git-version-tracking"]
109+
path = 3rdparty/git-version-tracking
110+
url = git@github.com:Devsh-Graphics-Programming/cmake-git-version-tracking.git
111+
[submodule "3rdparty/imath"]
112+
path = 3rdparty/imath
113+
url = git@github.com:AcademySoftwareFoundation/Imath.git
114+
[submodule "3rdparty/libdeflate"]
115+
path = 3rdparty/libdeflate
116+
url = git@github.com:Devsh-Graphics-Programming/libdeflate.git

.vsconfig

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Component.CoreEditor",
5+
"Microsoft.VisualStudio.Workload.CoreEditor",
6+
"Microsoft.Component.MSBuild",
7+
"Microsoft.VisualStudio.Component.VC.CoreIde",
8+
"Microsoft.VisualStudio.Component.Windows10SDK",
9+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
10+
"Microsoft.VisualStudio.Component.Graphics.Tools",
11+
"Microsoft.VisualStudio.Component.VC.DiagnosticTools",
12+
"Microsoft.VisualStudio.Component.Windows11SDK.22621",
13+
"Microsoft.VisualStudio.Component.VC.ATL",
14+
"Microsoft.VisualStudio.Component.SecurityIssueAnalysis",
15+
"Microsoft.VisualStudio.Component.VC.ATLMFC",
16+
"Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
17+
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake",
18+
"Microsoft.VisualStudio.Component.VC.CMake.Project",
19+
"Microsoft.VisualStudio.Component.VC.ASAN",
20+
"Microsoft.VisualStudio.Workload.NativeDesktop",
21+
"Microsoft.Net.ComponentGroup.TargetingPacks.Common"
22+
],
23+
"extensions": []
24+
}

0 commit comments

Comments
 (0)