PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix dependency load order + minor cmake change

Browse Source
This commit is contained in:
NigthLier 2024-01-28 17:28:53 +03:00
parent 04293c926d
commit 1fc415b8b9
2 changed files with 25 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -79,6 +79,8 @@ endif()
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(glfw3 REQUIRED)
find_package(glm REQUIRED)
find_package(OpenAL REQUIRED)
find_package(ZLIB REQUIRED)
@ -86,15 +88,11 @@ if (WIN32)
if(VOXELENGINE_BUILD_WINDOWS_VCPKG)
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
find_package(glfw3 REQUIRED)
find_package(spng REQUIRED)
find_package(glm REQUIRED)
set(PNGLIB spng::spng)
else()
find_package(Lua REQUIRED)
set(PNGLIB spng)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
endif()
find_package(spng REQUIRED)
set(PNGLIB spng::spng)
else()
# luajit has no CMakeLists.txt to use it as subdirectory, so install it manually
find_package(Lua REQUIRED)

63
src/engine.cpp
View File

@ -6,6 +6,7 @@
#include <vector>
#include <glm/glm.hpp>
#include <filesystem>
#include <unordered_set>
#define GLEW_STATIC
#include "audio/Audio.h"
@ -134,33 +135,9 @@ Engine::~Engine() {
std::cout << "-- engine finished" << std::endl;
}
size_t npos = std::numeric_limits<size_t>::max();
inline size_t findPack(const std::string& id, const std::vector<ContentPack>& packs) {
for (size_t i = 0; i < packs.size(); i++) {
if (packs[i].id == id) {
return i;
}
}
return npos;
}
inline void addPack(
const ContentPack& pack,
const std::vector<ContentPack>& srcPacks,
std::vector<ContentPack>& contentPacks
) {
if (findPack(pack.id, contentPacks) != npos) {
return;
}
for (auto& dependecy : pack.dependencies) {
size_t index = findPack(dependecy, srcPacks);
if (index == npos)
throw contentpack_error(pack.id, pack.folder,
"missing dependency '"+dependecy+"'");
addPack(srcPacks[index], srcPacks, contentPacks);
}
contentPacks.push_back(pack);
inline const std::string checkPacks(const std::unordered_set<std::string>& packs, const std::vector<std::string>& dependencies) {
for (const std::string& str : dependencies) if (packs.find(str) == packs.end()) return str;
return "";
}
void Engine::loadContent() {
@ -173,21 +150,23 @@ void Engine::loadContent() {
std::vector<ContentPack> srcPacks = contentPacks;
contentPacks.clear();
for (auto& pack : srcPacks) {
if (pack.dependencies.empty())
continue;
ContentLoader loader(&pack);
loader.load(&contentBuilder);
resRoots.push_back(pack.folder);
addPack(pack, srcPacks, contentPacks);
}
for (auto& pack : srcPacks) {
if (!pack.dependencies.empty())
continue;
ContentLoader loader(&pack);
loader.load(&contentBuilder);
resRoots.push_back(pack.folder);
addPack(pack, srcPacks, contentPacks);
std::string missingDependency;
std::unordered_set<std::string> loadedPacks, existingPacks;
for (const auto& item : srcPacks) { existingPacks.insert(item.id); }
while(existingPacks.size() > loadedPacks.size()) {
for (auto& pack : srcPacks) {
if(loadedPacks.find(pack.id) != loadedPacks.end()) continue;
missingDependency = checkPacks(existingPacks, pack.dependencies);
if(!missingDependency.empty()) throw contentpack_error(pack.id, pack.folder, "missing dependency '"+missingDependency+"'");
if(pack.dependencies.empty() || checkPacks(loadedPacks, pack.dependencies).empty()) {
loadedPacks.insert(pack.id);
resRoots.push_back(pack.folder);
contentPacks.push_back(pack);
ContentLoader loader(&pack);
loader.load(&contentBuilder);
}
}
}
content.reset(contentBuilder.build());