Skip to content

Commit 1a7d0c8

Browse files
committed
sync on 2026/04/24, rev 8329260ef9f0771cb0feeaadb2f312101ec6b18b
1 parent 210be6a commit 1a7d0c8

16,546 files changed

Lines changed: 1397082 additions & 675662 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,10 @@ PenaltyBreakOpenParenthesis: 1
5959
PenaltyBreakComment: 1
6060
SortIncludes: Never
6161
TabWidth: 2
62+
---
63+
Language: Java
64+
BasedOnStyle: Google
65+
ColumnLimit: 135
66+
IndentWidth: 4
67+
ContinuationIndentWidth: 8
6268
...

DagorEngine.rev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
af8aef9bee8bffe658e721d79b8611b893f4074b
1+
8329260ef9f0771cb0feeaadb2f312101ec6b18b

DagorEngine.sln

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

LICENSE

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,13 @@ first-party component as follows:
4747
prog/1stPartyLibs/daScript/dastest/LICENSE
4848
prog/1stPartyLibs/daScript/LICENSE
4949
prog/1stPartyLibs/daScript/modules/dasImgui/LICENSE
50+
prog/1stPartyLibs/daScript/modules/dasLLVM/LICENSE
5051
prog/1stPartyLibs/daScript/modules/dasQuirrel/LICENSE
5152
prog/1stPartyLibs/daScript/modules/dasStdDlg/LICENSE
5253
prog/1stPartyLibs/daScript/modules/dasStdDlg/stub/LICENSE
54+
prog/1stPartyLibs/daScript/utils/dasFormatter/LICENSE
5355
prog/1stPartyLibs/quirrel/quirrel/COPYRIGHT
56+
prog/1stPartyLibs/quirrel/quirrel/squirrel/compiler/COPYRIGHT
5457

5558
=======================================================================================
5659
Third-Party Software Distributed with Dagor Engine: Licensing and Copyright Information
@@ -73,6 +76,7 @@ We recommend consulting the respective LICENSE.txt or equivalent files for your
7376
guidance. You can find them in the respective directories of each
7477
third-party component as follows:
7578

79+
prog/3rdPartyLibs/abseil/LICENSE
7680
prog/3rdPartyLibs/acl/LICENSE
7781
prog/3rdPartyLibs/AntiLag2/LICENSE.txt
7882
prog/3rdPartyLibs/arc/brotli/LICENSE
@@ -91,6 +95,7 @@ third-party component as follows:
9195
prog/3rdPartyLibs/binPack2D/LICENSE
9296
prog/3rdPartyLibs/breakpad/LICENSE
9397
prog/3rdPartyLibs/bsdiff/LICENSE
98+
prog/3rdPartyLibs/c-ares/LICENSE
9499
prog/3rdPartyLibs/cachesim/LICENSE
95100
prog/3rdPartyLibs/catch2/LICENSE.txt
96101
prog/3rdPartyLibs/cef3/v4896/libcef_dll/LICENSE
@@ -111,8 +116,8 @@ third-party component as follows:
111116
prog/3rdPartyLibs/crashpad/third_party/lss/lss/LICENSE
112117
prog/3rdPartyLibs/crashpad/third_party/mini_chromium/mini_chromium/base/third_party/icu/LICENSE
113118
prog/3rdPartyLibs/crashpad/third_party/mini_chromium/mini_chromium/LICENSE
114-
prog/3rdPartyLibs/Detour/LICENSE
115119
prog/3rdPartyLibs/doctest/LICENSE.txt
120+
prog/3rdPartyLibs/draco/LICENSE
116121
prog/3rdPartyLibs/eastl/LICENSE
117122
prog/3rdPartyLibs/enet/LICENSE
118123
prog/3rdPartyLibs/fast_float/LICENSE
@@ -127,6 +132,7 @@ third-party component as follows:
127132
prog/3rdPartyLibs/glm/copying.txt
128133
prog/3rdPartyLibs/hash/BLAKE3/LICENSE
129134
prog/3rdPartyLibs/hash/LICENSE
135+
prog/3rdPartyLibs/hash/SHA3IUF/LICENSE
130136
prog/3rdPartyLibs/image/avif/LICENSE
131137
prog/3rdPartyLibs/image/imageresampler/LICENSE
132138
prog/3rdPartyLibs/image/jpeg-6b/LICENSE
@@ -141,22 +147,23 @@ third-party component as follows:
141147
prog/3rdPartyLibs/ImGuizmo/LICENSE
142148
prog/3rdPartyLibs/jsoncpp/LICENSE
143149
prog/3rdPartyLibs/jsonsl/LICENSE
150+
prog/3rdPartyLibs/lexilla/LICENSE
144151
prog/3rdPartyLibs/libb64/LICENSE
145152
prog/3rdPartyLibs/libcurl/COPYING
146153
prog/3rdPartyLibs/libev/LICENSE
147154
prog/3rdPartyLibs/libunwind/LICENSE.TXT
148-
prog/3rdPartyLibs/lottie/COPYING
149155
prog/3rdPartyLibs/math/carve/LICENSE
150156
prog/3rdPartyLibs/math/clipper-4.x/license.txt
151157
prog/3rdPartyLibs/math/DelaunayTriangulator/LICENSE
152158
prog/3rdPartyLibs/math/MathLib/LICENSE.txt
153159
prog/3rdPartyLibs/math/misc/LICENSE
154160
prog/3rdPartyLibs/math/poly2tri/LICENSE
155161
prog/3rdPartyLibs/math/vhacd/LICENSE
162+
prog/3rdPartyLibs/memAllocators/dlmalloc/LICENSE
163+
prog/3rdPartyLibs/memAllocators/mimalloc/LICENSE
156164
prog/3rdPartyLibs/meshoptimizer/LICENSE.md
157165
prog/3rdPartyLibs/metal/SPIRV-Headers/LICENSE
158166
prog/3rdPartyLibs/metal/spirv2Metal/LICENSE
159-
prog/3rdPartyLibs/mimalloc/LICENSE
160167
prog/3rdPartyLibs/minhook/LICENSE
161168
prog/3rdPartyLibs/miniaudio/LICENSE
162169
prog/3rdPartyLibs/miniupnpc/LICENSE
@@ -178,18 +185,21 @@ third-party component as follows:
178185
prog/3rdPartyLibs/poisson-disk-generator/LICENSE
179186
prog/3rdPartyLibs/rapidjson/license.txt
180187
prog/3rdPartyLibs/reachability/LICENSE.txt
181-
prog/3rdPartyLibs/Recast/LICENSE
188+
prog/3rdPartyLibs/recastnavigation/Detour/LICENSE
189+
prog/3rdPartyLibs/recastnavigation/DetourTileCache/LICENSE
190+
prog/3rdPartyLibs/recastnavigation/Recast/LICENSE
191+
prog/3rdPartyLibs/scintilla/LICENSE
182192
prog/3rdPartyLibs/SMAA/LICENSE.txt
183193
prog/3rdPartyLibs/SnapdragonSuperResolution/LICENSE.txt
184194
prog/3rdPartyLibs/stb/LICENSE
185195
prog/3rdPartyLibs/udis86/LICENSE
186196
prog/3rdPartyLibs/unittest-cpp/LICENSE
187197
prog/3rdPartyLibs/uriparser/COPYING
188198
prog/3rdPartyLibs/uuidv7/LICENSE
189-
prog/3rdPartyLibs/vulkan/glslang/LICENSE
190-
prog/3rdPartyLibs/vulkan/hlslcc/license.txt
191-
prog/3rdPartyLibs/vulkan/hlslcc/src/cbstring/license.txt
192199
prog/3rdPartyLibs/vulkan/smol-v/LICENSE
193200
prog/3rdPartyLibs/vulkan/spirv-tools/external/spirv-headers/LICENSE
194201
prog/3rdPartyLibs/vulkan/spirv-tools/LICENSE
195202
prog/3rdPartyLibs/vulkan/spirv-tools/utils/vscode/src/lsp/LICENSE
203+
prog/3rdPartyLibs/wayland/LICENSE
204+
prog/3rdPartyLibs/webrtc-apm/avx2/LICENSE
205+
prog/3rdPartyLibs/webrtc-apm/LICENSE

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ After the script completes its work, the X:\develop\devtools folder will be conf
2929

3030
* Agility.SDK.1.614.1 - DirectX 12 Agility SDK
3131
* astcenc-4.6.1 - Adaptive Scalable Texture Compression (ASTC) Encoder
32-
* DXC-1.8.2407 - DirectX Compiler
32+
* DXC-1.8.2505.1 - DirectX Compiler
3333
* FidelityFX_SC - a library for image quality enhancement
3434
* fmod-studio-2.xx.xx [optional] - FMOD sound library
3535
* ispc-v1.23.0-windows - Implicit SPMD Program Compiler

_docs/.quirrel_modules.qdox

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
"paths": ["prog/gameLibs/daRg"], //folders or files list, required,
3131
"doc_chapter": "quirrel-modules/darg_framework", //internal folder name, required
3232
"chapter_desc": "Docs for daRG - Dagor Reactive GUI framework, based on Quirrel language and Functional Reactive Programming (FRP).", //displayed title, optional
33-
"chapter_desc_files": ["prog/gameLibs/daRg/daRg_readme.rst"],
33+
"chapter_desc_files": [
34+
"prog/gameLibs/daRg/_doc/overview.rst",
35+
"prog/gameLibs/daRg/_doc/behaviors.rst",
36+
"prog/gameLibs/daRg/_doc/render_objects.rst"
37+
],
3438
"chapter_title": "daRG Framework", //displayed title, optional
3539
"extensions": [".cpp"], //optional, list of extensions of files
3640
"exclude_dirs_re": [], //optional, list of regexps that should full match to exclude dirs in recursive search

_docs/build_all_docs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ def shell(cmd):
99

1010
def main():
1111
prevd = os.getcwd()
12-
shell(["python3", "qdoc_main.py", "-o", "source/api-references/quirrel-modules", "-c", ".quirrel_modules.qdox", "-t", "Dagor Quirrel Modules Docs"])
13-
shell(["python3", "qdoc_main.py", "-o", "source/_internal/api-references/projects-quirrel-modules", "-c", ".internal_quirrel_modules.qdox", "-t", "Internal Projects Quirrel Modules Docs", "--quiet"])
14-
shell(["python3", "qdoc_main.py", "-o", "source/api-references/dagor-engine-docs", "-c", ".engine.qdox", "-t", "Engine Libraries Docs"])
12+
shell(["python", "qdoc_main.py", "-o", "source/api-references/quirrel-modules", "-c", ".quirrel_modules.qdox", "-t", "Dagor Quirrel Modules Docs"])
13+
shell(["python", "qdoc_main.py", "-o", "source/_internal/api-references/projects-quirrel-modules", "-c", ".internal_quirrel_modules.qdox", "-t", "Internal Projects Quirrel Modules Docs", "--quiet"])
14+
shell(["python", "qdoc_main.py", "-o", "source/api-references/dagor-engine-docs", "-c", ".engine.qdox", "-t", "Engine Libraries Docs"])
1515
os.chdir(prevd)
1616

1717
if __name__ == "__main__":

_docs/qdoc_docstring_parse.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ def parse_docstring(docstring, comments=None):
3636

3737
# 1. Detect and remove 'pure' with flexible whitespace
3838
is_pure = False
39+
vargved = False
3940
m = re.match(r'^pure\s+(.*)', docstring, re.IGNORECASE)
4041
if m:
4142
is_pure = True
4243
docstring = m.group(1).lstrip()
4344

4445
# 2. Match function signature with flexible spaces:
4546
# name ( arg1, [arg2: type = default] ): rtype
46-
fn_re = re.match(r'^(\w+)\s*\((.*)\)\s*:\s*([\w\.]+)', docstring)
47+
fn_re = re.match(r'^([\w\.]+)\s*\((.*)\)\s*:\s*([\w\.]+)', docstring)
4748
if not fn_re:
4849
print("Invalid docstring:", docstring)
4950
raise ValueError("Invalid docstring: " + docstring)
@@ -99,6 +100,9 @@ def parse_docstring(docstring, comments=None):
99100
})
100101
typemask_parts.append(mask)
101102
paramsnum += 1
103+
elif part=="...":
104+
# Argument may be vargv type , ...) or , ...:string)
105+
vargved=True
102106
else:
103107
# Argument may be name only (no type)
104108
bare_match = re.match(r'^\[?(\w+)\]?$', part)
@@ -131,6 +135,7 @@ def parse_docstring(docstring, comments=None):
131135
"paramsnum": paramsnum,
132136
"typemask": typemask,
133137
"is_pure": is_pure,
138+
"vargved": vargved,
134139
"members": comments.splitlines() if comments else None, #FIXME: parse everything for params and return type and comments
135140
}
136141
if __name__ == "__main__":

_docs/qdoc_parse.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ def parse_native_function(line):
404404
name = parsed["name"]
405405
typemask = parsed["typemask"]
406406
paramsnum = parsed["paramsnum"]
407+
vargved = parsed["vargved"]
407408
members = parsed["members"]
408409
params = parsed["args"]
409410
retdesc = {"rtype": parsed["rtype"], "description": None}

_docs/source/api-references/dagor-dshl/index/directives.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Consider the following example:
2727
no_dynstcode;
2828
2929
texture tex = material.texture.diffuse;
30-
(ps) { diffuse_tex@static = tex; }
30+
(ps) { diffuse_tex@staticSmp = tex; }
3131
// diffuse_tex is now accessible inside hlsl(ps){...} blocks
3232
3333
supports common_scene_block;

0 commit comments

Comments
 (0)