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

Fixed profile parser so it gets the profile input file first

Browse Source
This commit is contained in:
GPayne
2020-01-10 15:22:26 -07:00
parent 3ef1b8d511
commit 1ac68f8236
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/openspace/engine/openspaceengine.h
View File

@@ -106,6 +106,7 @@ private:
void runGlobalCustomizationScripts();
void configureLogging();
std::string generateFilePath(std::string openspaceRelativePath);
std::unique_ptr<Scene> _scene;
std::unique_ptr<AssetManager> _assetManager;

9
scripts/convertProfileToScene.lua
View File

@@ -464,10 +464,11 @@ parsingSections = {
{section = "MarkNodes", func = parseMarkNodes}
}
profileFilename = openspace.profile.getFilename()
profilePath = openspace.profile.getPath()
profilePathIn = openspace.profile.getProfileInputPath()
scenePathOut = openspace.profile.getSceneOutputPath()
assetOut = profilePath..".scene"
profileIn = profilePathIn..".profile"
assetOut = scenePathOut..".scene"
local resultTable = parseProfile(profilePath)
local resultTable = parseProfile(profileIn)
generateAsset(resultTable, assetOut)

47
src/engine/openspaceengine.cpp
View File

@@ -301,24 +301,8 @@ void OpenSpaceEngine::initialize() {
global::configuration.profile));
ghoul::lua::LuaState lState;
// Generate path to temp dir where output .scene file will reside.
// Needs to handle either windows (which seems to require double back-slashes)
// or unix path slashes.
std::string outputScenePath = absPath("${TEMPORARY}");
const std::string search = "\\";
const std::string replace = "\\\\";
if (outputScenePath.find(search) != std::string::npos) {
size_t start_pos = 0;
while((start_pos = outputScenePath.find(search, start_pos)) != std::string::npos) {
outputScenePath.replace(start_pos, search.length(), replace);
start_pos += replace.length();
}
outputScenePath.append(replace);
}
else {
outputScenePath.append("/");
}
outputScenePath.append(global::configuration.profile);
std::string inputProfilePath = generateFilePath("${BASE}/data/assets");
std::string outputScenePath = generateFilePath("${TEMPORARY}");
std::string setProfileFilenameInLuaState = fmt::format(R"(
openspace = {{}}
@@ -326,11 +310,14 @@ void OpenSpaceEngine::initialize() {
function openspace.profile.getFilename()
return "{}.profile"
end
function openspace.profile.getPath()
function openspace.profile.getProfileInputPath()
return "{}"
end
function openspace.profile.getSceneOutputPath()
return "{}"
end
)",
global::configuration.profile, outputScenePath
global::configuration.profile, inputProfilePath, outputScenePath
);
ghoul::lua::runScript(lState, setProfileFilenameInLuaState);
@@ -385,6 +372,26 @@ void OpenSpaceEngine::initialize() {
LTRACE("OpenSpaceEngine::initialize(end)");
}
std::string OpenSpaceEngine::generateFilePath(std::string openspaceRelativePath) {
std::string path = absPath(openspaceRelativePath);
// Needs to handle either windows (which seems to require double back-slashes)
// or unix path slashes.
const std::string search = "\\";
const std::string replace = "\\\\";
if (path.find(search) != std::string::npos) {
size_t start_pos = 0;
while ((start_pos = path.find(search, start_pos)) != std::string::npos) {
path.replace(start_pos, search.length(), replace);
start_pos += replace.length();
}
path.append(replace);
}
else {
path.append("/");
}
return path.append(global::configuration.profile);
}
void OpenSpaceEngine::initializeGL() {
LTRACE("OpenSpaceEngine::initializeGL(begin)");