al streaming fix

This commit is contained in:
MihailRis
2024-03-04 13:32:04 +03:00
parent 75ee269db3
commit d41973583c
4 changed files with 25 additions and 13 deletions
+20 -7
View File
@@ -155,8 +155,15 @@ Engine::~Engine() {
std::cout << "-- engine finished" << std::endl;
}
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;
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 "";
}
@@ -172,15 +179,20 @@ void Engine::loadContent() {
std::string missingDependency;
std::unordered_set<std::string> loadedPacks, existingPacks;
for (const auto& item : srcPacks) { existingPacks.insert(item.id); }
for (const auto& item : srcPacks) {
existingPacks.insert(item.id);
}
while(existingPacks.size() > loadedPacks.size()) {
while (existingPacks.size() > loadedPacks.size()) {
for (auto& pack : srcPacks) {
if(loadedPacks.find(pack.id) != loadedPacks.end()) continue;
if(loadedPacks.find(pack.id) != loadedPacks.end()) {
continue;
}
missingDependency = checkPacks(existingPacks, pack.dependencies);
if(!missingDependency.empty())
if (!missingDependency.empty()) {
throw contentpack_error(pack.id, pack.folder, "missing dependency '"+missingDependency+"'");
if(pack.dependencies.empty() || checkPacks(loadedPacks, pack.dependencies).empty()) {
}
if (pack.dependencies.empty() || checkPacks(loadedPacks, pack.dependencies).empty()) {
loadedPacks.insert(pack.id);
resRoots.push_back(pack.folder);
contentPacks.push_back(pack);
@@ -226,6 +238,7 @@ double Engine::getDelta() const {
}
void Engine::setScreen(std::shared_ptr<Screen> screen) {
audio::reset();
this->screen = screen;
}