From eceb0f6bccf2f5171e358025bdf78c465e159532 Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Mon, 11 Dec 2023 13:04:58 +0100 Subject: [PATCH] Deleting redundant submodules --- .gitmodules | 41 +------------------------------ external/assimp | 1 - external/entt | 1 - external/freetype | 1 - external/glfw | 1 - external/glm | 1 - external/json | 1 - external/ktx | 1 - external/odeint | 1 - external/slang | 1 - external/stb | 1 - external/thread-pool | 1 - external/ttf-parser | 1 - external/zlib | 1 - res/shaders/MeshletBasePass.slang | 10 ++++---- src/Engine/Containers/Array.h | 9 ++++++- 16 files changed, 14 insertions(+), 59 deletions(-) delete mode 160000 external/assimp delete mode 160000 external/entt delete mode 160000 external/freetype delete mode 160000 external/glfw delete mode 160000 external/glm delete mode 160000 external/json delete mode 160000 external/ktx delete mode 160000 external/odeint delete mode 160000 external/slang delete mode 160000 external/stb delete mode 160000 external/thread-pool delete mode 160000 external/ttf-parser delete mode 160000 external/zlib diff --git a/.gitmodules b/.gitmodules index 102d888..91ee4d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,45 +1,6 @@ -[submodule "external/glm"] - path = external/glm - url = https://github.com/g-truc/glm.git -[submodule "external/glfw"] - path = external/glfw - url = https://github.com/glfw/glfw.git -[submodule "external/json"] - path = external/json - url = https://github.com/nlohmann/json.git -[submodule "external/assimp"] - path = external/assimp - url = https://github.com/assimp/assimp.git -[submodule "external/stb"] - path = external/stb - url = https://github.com/nothings/stb -[submodule "external/slang"] - path = external/slang - url = https://github.com/shader-slang/slang.git -[submodule "external/ktx"] - path = external/ktx - url = https://github.com/KhronosGroup/KTX-Software -[submodule "external/ttf-parser"] - path = external/ttf-parser - url = git@github.com:kv01/ttf-parser.git -[submodule "external/freetype"] - path = external/freetype - url = https://gitlab.freedesktop.org/freetype/freetype.git -[submodule "external/entt"] - path = external/entt - url = git@github.com:skypjack/entt.git -[submodule "external/thread-pool"] - path = external/thread-pool - url = https://github.com/DeveloperPaul123/thread-pool.git -[submodule "external/zlib"] - path = external/zlib - url = https://github.com/madler/zlib.git [submodule "external/CRCpp"] path = external/CRCpp url = https://github.com/d-bahr/CRCpp.git -[submodule "external/odeint"] - path = external/odeint - url = https://github.com/headmyshoulder/odeint-v2.git [submodule "external/vcpkg"] path = external/vcpkg - url = https://github.com/Microsoft/vcpkg.git + url = https://github.com/Microsoft/vcpkg.git \ No newline at end of file diff --git a/external/assimp b/external/assimp deleted file mode 160000 index 8f0c6b0..0000000 --- a/external/assimp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f0c6b04b2257a520aaab38421b2e090204b69df diff --git a/external/entt b/external/entt deleted file mode 160000 index ebc0c18..0000000 --- a/external/entt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ebc0c18534a33afcd49878cadea2620bac5cc6bf diff --git a/external/freetype b/external/freetype deleted file mode 160000 index e50798b..0000000 --- a/external/freetype +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e50798b72043c8b378caa46e0a854519f9028ae4 diff --git a/external/glfw b/external/glfw deleted file mode 160000 index d973acc..0000000 --- a/external/glfw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d973acc123826666ecc9e6fd475682e3d84c54a6 diff --git a/external/glm b/external/glm deleted file mode 160000 index bf71a83..0000000 --- a/external/glm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bf71a834948186f4097caa076cd2663c69a10e1e diff --git a/external/json b/external/json deleted file mode 160000 index bc889af..0000000 --- a/external/json +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d diff --git a/external/ktx b/external/ktx deleted file mode 160000 index 5ab6d75..0000000 --- a/external/ktx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5ab6d7595e6d1f1e9ab5d7bfcced612dc44dd07a diff --git a/external/odeint b/external/odeint deleted file mode 160000 index 2bfbe61..0000000 --- a/external/odeint +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2bfbe61a0001cdd2aa6954c59518502218f33305 diff --git a/external/slang b/external/slang deleted file mode 160000 index 4fb3b10..0000000 --- a/external/slang +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4fb3b10b81cf8c976ebd1ebb7fcde7708f022957 diff --git a/external/stb b/external/stb deleted file mode 160000 index b42009b..0000000 --- a/external/stb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b42009b3b9d4ca35bc703f5310eedc74f584be58 diff --git a/external/thread-pool b/external/thread-pool deleted file mode 160000 index dad69c1..0000000 --- a/external/thread-pool +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dad69c1661983379af6cecbf5e33e83f764cd61d diff --git a/external/ttf-parser b/external/ttf-parser deleted file mode 160000 index 065fcd9..0000000 --- a/external/ttf-parser +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 065fcd9db7c2d7256b1ae77480a269db1f689d8e diff --git a/external/zlib b/external/zlib deleted file mode 160000 index 09155ea..0000000 --- a/external/zlib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851 diff --git a/res/shaders/MeshletBasePass.slang b/res/shaders/MeshletBasePass.slang index 007a455..410264c 100644 --- a/res/shaders/MeshletBasePass.slang +++ b/res/shaders/MeshletBasePass.slang @@ -75,13 +75,13 @@ struct PrimitiveAttributes void meshMain( in uint threadID: SV_GroupIndex, in uint groupID: SV_GroupID, - in payload MeshPayload meshPayload, + //in payload MeshPayload meshPayload, out Vertices vertices, out Indices indices ){ - InstanceData inst = pScene.instances[meshPayload.instanceId[groupID]]; - MeshData md = pScene.meshData[meshPayload.instanceId[groupID]]; - MeshletDescription m = pScene.meshletInfos[meshPayload.meshletId[groupID]]; + InstanceData inst = pScene.instances[0];//meshPayload.instanceId[groupID]]; + MeshData md = pScene.meshData[0];//meshPayload.instanceId[groupID]]; + MeshletDescription m = pScene.meshletInfos[0];//meshPayload.meshletId[groupID]]; SetMeshOutputCounts(m.vertexCount, m.primitiveCount); uint p = min(threadID, m.primitiveCount - 1); @@ -118,7 +118,7 @@ void meshMain( { uint v = min(i, m.vertexCount - 1); { - int vertexIndex = pScene.vertexIndices[m.vertexOffset + v]; + uint vertexIndex = pScene.vertexIndices[m.vertexOffset + v]; vertices[v] = pVertexData.getAttributes(md.indicesOffset + vertexIndex).getParameter(inst.transformMatrix); } } diff --git a/src/Engine/Containers/Array.h b/src/Engine/Containers/Array.h index ef65c3d..7344ed1 100644 --- a/src/Engine/Containers/Array.h +++ b/src/Engine/Containers/Array.h @@ -495,7 +495,14 @@ public: if(new_cap > allocated) { T* temp = allocateArray(new_cap); - std::uninitialized_move_n(begin(), arraySize, temp); + if constexpr (std::is_trivially_copyable_v) + { + std::memcpy(temp, _data, sizeof(T) * arraySize); + } + else + { + std::uninitialized_move_n(begin(), arraySize, temp); + } _data = temp; } allocated = new_cap;