mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 09:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved profile-to-asset conversion to openspaceengine and using temp dir

Browse Source
This commit is contained in:
GPayne
2019-12-20 14:12:25 -07:00
parent 8feb6d1d2b
commit 797c674f12
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSpace/main.cpp
-39
View File
@@ -84,9 +84,6 @@ constexpr const char* _loggerCat = "main";
constexpr const char* SpoutTag = "Spout";
constexpr const char* OpenVRTag = "OpenVR";
constexpr const char* ProfileToSceneConverter
= "${BASE}/scripts/convertProfileToScene.lua";
sgct::Engine* SgctEngine;
sgct::SharedVector<char> _synchronizationBuffer;
@@ -1187,42 +1184,6 @@ int main(int argc, char** argv) {
parseLuaState(global::configuration);
}
// Convert profile to scene file (if was provided in configuration file)
if (!global::configuration.profile.empty()) {
LINFO(fmt::format("Run Lua script to convert {}.profile to scene",
global::configuration.profile));
ghoul::lua::LuaState lState;
// Get path where .scene files reside. Need to add extra escape slashes to
// accomodate lua parser.
std::string outputScenePath = absPath("${BASE}/data/assets");
std::string search = "\\";
std::string replace = "\\\\";
for (std::string::size_type i = outputScenePath.find(search);
i != std::string::npos;
i = outputScenePath.find(search, i))
{
outputScenePath.replace(i, search.length(), replace);
i += replace.length();
}
std::string setProfileFilenameInLuaState = fmt::format(R"(
openspace = {{}}
openspace.profile = {{}}
function openspace.profile.getFilename()
return "{}.profile"
end
function openspace.profile.getPath()
return "{}"
end
)",
global::configuration.profile, outputScenePath
);
ghoul::lua::runScript(lState, setProfileFilenameInLuaState);
ghoul::lua::runScriptFile(lState, absPath(ProfileToSceneConverter));
}
// Determining SGCT configuration file
LDEBUG("SGCT Configuration file: " + global::configuration.windowConfiguration);
src/engine/openspaceengine.cpp
+39
View File
@@ -98,6 +98,9 @@
namespace {
constexpr const char* _loggerCat = "OpenSpaceEngine";
constexpr const int CacheVersion = 1;
constexpr const char* ProfileToSceneConverter
= "${BASE}/scripts/convertProfileToScene.lua";
} // namespace
namespace openspace {
@@ -292,6 +295,42 @@ void OpenSpaceEngine::initialize() {
LDEBUG("Registering Lua libraries");
registerCoreClasses(global::scriptEngine);
// Convert profile to scene file (if was provided in configuration file)
if (!global::configuration.profile.empty()) {
LINFO(fmt::format("Run Lua script to convert {}.profile to scene",
global::configuration.profile));
ghoul::lua::LuaState lState;
// Get path where .scene files reside. Need to add extra escape slashes to
// accomodate lua parser.
std::string outputScenePath = absPath("${TEMPORARY}");
std::string search = "\\";
std::string replace = "\\\\";
for (std::string::size_type i = outputScenePath.find(search);
i != std::string::npos;
i = outputScenePath.find(search, i))
{
outputScenePath.replace(i, search.length(), replace);
i += replace.length();
}
std::string setProfileFilenameInLuaState = fmt::format(R"(
openspace = {{}}
openspace.profile = {{}}
function openspace.profile.getFilename()
return "{}.profile"
end
function openspace.profile.getPath()
return "{}"
end
)",
global::configuration.profile, outputScenePath
);
ghoul::lua::runScript(lState, setProfileFilenameInLuaState);
ghoul::lua::runScriptFile(lState, absPath(ProfileToSceneConverter));
}
// Set up asset loader
std::unique_ptr<SynchronizationWatcher> w =
std::make_unique<SynchronizationWatcher>();