mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-12 06:30:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rearranged profile initializations and verified that all init correctly

Browse Source
This commit is contained in:
GPayne
2021-09-12 21:05:00 -06:00
parent 284c68f952
commit 51f6c9d45b
17 changed files with 231 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/engine/moduleengine.cpp
View File

@@ -164,29 +164,6 @@ ghoul::systemcapabilities::Version ModuleEngine::requiredOpenGLVersion() const {
return version;
}
void ModuleEngine::setFromProfile_modules(const Profile& p)
{
for (Profile::Module mod : p.modules) {
const std::vector<OpenSpaceModule*>& m = modules();
if (std::find(m.begin(), m.end(), mod.name) != m.end()) {
if (mod.loadedInstruction.has_value()) {
global::scriptEngine->queueScript(
mod.loadedInstruction.value(),
scripting::ScriptEngine::RemoteScripting::Yes
);
}
}
else {
if (mod.notLoadedInstruction.has_value()) {
global::scriptEngine->queueScript(
mod.notLoadedInstruction.value(),
scripting::ScriptEngine::RemoteScripting::Yes
);
}
}
}
}
scripting::LuaLibrary ModuleEngine::luaLibrary() {
return {
"modules",