sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework EnTT integration

Browse Source 
- Update EnTT to 3.11.1
- Moved EnTT wrapper to EnTTWorld, inheriting EntityWorld
- AppEntitySystemComponent can now handles multiple EntityWorld
- Headers relying on EnTT are now automatically included if NAZARA_ENTT is defined
- Renamed SystemGraph to EnttSystemGraph (as it depends on it for now)
This commit is contained in:
SirLynix
2023-01-28 18:16:10 +01:00
committed by Jérôme Leclercq
parent d5f281a768
commit 97fa4d98be
52 changed files with 361 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
xmake/actions/generateheaders.lua
View File

@@ -11,11 +11,11 @@ on_run(function ()
local paths = {}
local excludedFiles = {
["Components.hpp"] = true,
["Components.hpp"] = { Define = "NAZARA_ENTT" },
["ConfigCheck.hpp"] = true,
["Debug.hpp"] = true,
["DebugOff.hpp"] = true,
["Systems.hpp"] = true,
["Systems.hpp"] = { Define = "NAZARA_ENTT" },
["ThreadSafety.hpp"] = true,
["ThreadSafetyOff.hpp"] = true
}
@@ -73,7 +73,9 @@ on_run(function ()
end
paths["Audio"].Excludes["OpenALFunctions.hpp"] = true
paths["Core"].Excludes["AppEntitySystemComponent.hpp"] = true
paths["Core"].Excludes["AppEntitySystemComponent.hpp"] = { Define = "NAZARA_ENTT" }
paths["Core"].Excludes["EnttSystemGraph.hpp"] = { Define = "NAZARA_ENTT" }
paths["Core"].Excludes["EnttWorld.hpp"] = { Define = "NAZARA_ENTT" }
paths["OpenGLRenderer"].Excludes["Wrapper.hpp"] = true
paths["VulkanRenderer"].Excludes["Wrapper.hpp"] = true
@@ -127,6 +129,8 @@ on_run(function ()
header:write("#ifndef " .. v.HeaderGuard .. "\n")
header:write("#define " .. v.HeaderGuard .. "\n\n")
local gatedIncludes = {}
local count = 0
for _, filePath in pairs(files) do
local pathParts = path.split(filePath)
@@ -136,13 +140,31 @@ on_run(function ()
local include = table.concat(pathParts, "/")
local fileName = path.filename(filePath)
if (not v.Excludes[fileName]) then
local exclusion = v.Excludes[fileName]
if (not exclusion) then
header:write("#include <" .. include .. ">\n")
count = count + 1
elseif (type(exclusion) == "table" and exclusion.Define) then
local gatedFiles = gatedIncludes[exclusion.Define]
if not gatedFiles then
gatedFiles = {}
gatedIncludes[exclusion.Define] = gatedFiles
end
table.insert(gatedFiles, include)
end
end
header:write("\n#endif // " .. v.HeaderGuard .. "\n")
header:write("\n")
for _, gatedDefine in ipairs(table.orderkeys(gatedIncludes)) do
header:write("#ifdef " .. gatedDefine .. "\n\n")
for _, include in ipairs(gatedIncludes[gatedDefine]) do
header:write("#include <" .. include .. ">\n")
end
header:write("\n#endif\n\n")
end
header:write("#endif // " .. v.HeaderGuard .. "\n")
header:close()
print(string.format("-#include count: %d", count))