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

Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts

Browse Source 
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
This commit is contained in:
Emma Broman
2021-07-09 15:43:17 +02:00
parent 771aa46fcd 5da4f104e8
commit 16173d7afe
92 changed files with 1015 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/engine/openspaceengine.cpp
View File

@@ -1092,7 +1092,7 @@ void OpenSpaceEngine::preSynchronization() {
global::memoryManager->TemporaryMemory.reset();
if (_hasScheduledAssetLoading) {
LINFO(fmt::format("Loading asset: {}", _scheduledAssetPathToLoad));
LINFO(fmt::format("Loading asset: {}", absPath(_scheduledAssetPathToLoad)));
global::profile->setIgnoreUpdates(true);
loadSingleAsset(_scheduledAssetPathToLoad);
global::profile->setIgnoreUpdates(false);
@@ -1270,7 +1270,6 @@ void OpenSpaceEngine::drawOverlays() {
for (const std::function<void()>& func : *global::callback::draw2D) {
ZoneScopedN("[Module] draw2D")
func();
}

5
src/engine/openspaceengine_lua.inl
View File

@@ -332,7 +332,10 @@ int createSingleColorImage(lua_State* L) {
const glm::dvec3 color = colorDict.value<glm::dvec3>(key);
std::string fileName = FileSys.cacheManager()->cachedFilename(name + ".ppm", "");
std::filesystem::path fileName = FileSys.cacheManager()->cachedFilename(
name + ".ppm",
""
);
const bool hasCachedFile = std::filesystem::is_regular_file(fileName);
if (hasCachedFile) {
LDEBUGC("OpenSpaceEngine", fmt::format("Cached file '{}' used", fileName));