From b31899b38a038f0b49ad2399f64e1dd8254f8bc2 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Fri, 23 Jan 2026 21:34:42 +0300 Subject: [PATCH] Update (action nodes, jolt, lots of other updates) --- .gitignore | 5 +++++ .gitmodules | 4 ++++ CMakeLists.txt | 19 +++++++++++++++++-- assimp | 2 +- bullet3 | 2 +- flecs | 2 +- freetype | 2 +- jolt | 2 +- nanoflann | 1 + ogre | 2 +- ogre-pagedgeometry | 2 +- ogre-procedural | 2 +- ogre-projects/world2 | 2 +- 13 files changed, 36 insertions(+), 11 deletions(-) create mode 160000 nanoflann diff --git a/.gitignore b/.gitignore index 708d57d..5223e32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ build_linux_*/** lib/** +ogre-sdk-static/** +ogre-sdk/** +tmp/ +tmp2/ +blender-bin/ diff --git a/.gitmodules b/.gitmodules index 4429e91..6321292 100644 --- a/.gitmodules +++ b/.gitmodules @@ -158,3 +158,7 @@ path = freetype url = https://github.com/freetype/freetype branch = master +[submodule "nanoflann"] + path = nanoflann + url = https://github.com/jlblancoc/nanoflann + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index ad69bf8..2655a48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,6 +296,7 @@ ExternalProject_Add(ogre-static -DASSIMP_BUILD_ASSIMP_TOOLS=ON -DOGRE_STATIC=TRUE ${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug + PATCH_COMMAND ${CMAKE_COMMAND} -E make_directory Dependencies/include/bullet DEPENDS core-deps-static freetype-static assimp-static glslang-static zlib-static ) @@ -361,12 +362,14 @@ ExternalProject_Add(jolt SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jolt/Build CMAKE_ARGS ${CUSTOM_OPTS} -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DCPP_RTTI_ENABLED=ON -DDEBUG_RENDERER_IN_DISTRIBUTION=ON + -DJPH_USE_DX12=OFF -DJPH_USE_DXC=OFF -DJPH_USE_VK=OFF -DJPH_USE_MTL=OFF -DJPH_USE_CPU_COMPUTE=OFF -DDOUBLE_PRECISION=ON ) ExternalProject_Add(jolt-static SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jolt/Build CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug -DCPP_RTTI_ENABLED=ON -DDEBUG_RENDERER_IN_DISTRIBUTION=ON + -DJPH_USE_DX12=OFF -DJPH_USE_DXC=OFF -DJPH_USE_VK=OFF -DJPH_USE_MTL=OFF -DJPH_USE_CPU_COMPUTE=OFF -DDOUBLE_PRECISION=ON ) ExternalProject_Add(json @@ -381,16 +384,28 @@ ExternalProject_Add(json-static ${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug ) +ExternalProject_Add(nanoflann + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nanoflann + CMAKE_ARGS + ${CUSTOM_OPTS} -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF +) + +ExternalProject_Add(nanoflann-static + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nanoflann + CMAKE_ARGS + ${CUSTOM_OPTS_STATIC} -DCMAKE_BUILD_TYPE=Debug +) + ExternalProject_Add(world2 SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2 CMAKE_ARGS ${CUSTOM_OPTS} -DBLENDER=${CMAKE_CURRENT_BINARY_DIR}/blender-bin/bin/blender - DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs blender json + DEPENDS ogre ogre-procedural ogre-pagedgeometry flecs blender json nanoflann ) ExternalProject_Add(world2-static SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ogre-projects/world2 CMAKE_ARGS ${CUSTOM_OPTS_STATIC} -DBLENDER=${CMAKE_CURRENT_BINARY_DIR}/blender-bin/bin/blender - DEPENDS ogre-static ogre-procedural-static ogre-pagedgeometry-static flecs-static json-static blender + DEPENDS ogre-static ogre-procedural-static ogre-pagedgeometry-static flecs-static json-static nanoflann-static blender ) ExternalProject_Add(jolt-demo diff --git a/assimp b/assimp index db0bde7..522c703 160000 --- a/assimp +++ b/assimp @@ -1 +1 @@ -Subproject commit db0bde758e5043546cb2f45126c5693d2d9550f3 +Subproject commit 522c703bb913a73040590681c93d153cd2bbf354 diff --git a/bullet3 b/bullet3 index 2c204c4..63c4d67 160000 --- a/bullet3 +++ b/bullet3 @@ -1 +1 @@ -Subproject commit 2c204c49e56ed15ec5fcfa71d199ab6d6570b3f5 +Subproject commit 63c4d67e337017f9d8b298c900e9aabdb69296e7 diff --git a/flecs b/flecs index 60c5290..a7293a9 160000 --- a/flecs +++ b/flecs @@ -1 +1 @@ -Subproject commit 60c5290d50a699a2177b3f3ac95741cac5a57fe6 +Subproject commit a7293a9455f2a5feffa2642f43bc670c06b03558 diff --git a/freetype b/freetype index 23b6cd2..341049a 160000 --- a/freetype +++ b/freetype @@ -1 +1 @@ -Subproject commit 23b6cd27ff19b70cbf98e058cd2cf0647d5284ff +Subproject commit 341049a95bacfc5debf6c9daf537b7acec27f3dd diff --git a/jolt b/jolt index 1262f85..7fd7a71 160000 --- a/jolt +++ b/jolt @@ -1 +1 @@ -Subproject commit 1262f855966a35cecf2c16fb05c44f3ce5f03b31 +Subproject commit 7fd7a7159c6025baa8525fb85c4e85d5305e3247 diff --git a/nanoflann b/nanoflann new file mode 160000 index 0000000..ba47cfc --- /dev/null +++ b/nanoflann @@ -0,0 +1 @@ +Subproject commit ba47cfcb127c3597d69196d87f5aa9ca8811b0a9 diff --git a/ogre b/ogre index 2579adf..79bfa33 160000 --- a/ogre +++ b/ogre @@ -1 +1 @@ -Subproject commit 2579adf8f97aeb393a1458d9fd7d474aff124578 +Subproject commit 79bfa33370061a43311d6094358c2b5175b5961c diff --git a/ogre-pagedgeometry b/ogre-pagedgeometry index a324fc9..5297d3d 160000 --- a/ogre-pagedgeometry +++ b/ogre-pagedgeometry @@ -1 +1 @@ -Subproject commit a324fc98277262162da947592370d57ef70c1833 +Subproject commit 5297d3d3f7deed4cf98217078c0fdf80eb28d19c diff --git a/ogre-procedural b/ogre-procedural index 912e0ce..338a565 160000 --- a/ogre-procedural +++ b/ogre-procedural @@ -1 +1 @@ -Subproject commit 912e0ce892db601a099e3ea5c20a624da83ec2bb +Subproject commit 338a56566d70ff9c34ed196e79a2a178d83c3c7c diff --git a/ogre-projects/world2 b/ogre-projects/world2 index 81a7899..4cf0ea5 160000 --- a/ogre-projects/world2 +++ b/ogre-projects/world2 @@ -1 +1 @@ -Subproject commit 81a78990ce31d8892bbd2d6b43da5be792dc0dd5 +Subproject commit 4cf0ea53213e73b21164239563e8b9c4a669c93a