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

Feature/filesystem cleanup (#1587)

Browse Source 
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
This commit is contained in:
Alexander Bock
2021-05-16 20:26:49 +02:00
committed by GitHub
parent 2ca7101b6c
commit ccdc5a5dc3
87 changed files with 648 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/openspaceengine_lua.inl
View File

@@ -193,7 +193,7 @@ int setScreenshotFolder(lua_State* L) {
std::string arg = ghoul::lua::value<std::string>(L);
lua_pop(L, 0);
std::string folder = FileSys.absolutePath(arg);
std::string folder = absPath(arg);
if (!std::filesystem::exists(folder)) {
std::filesystem::create_directory(folder);
}
@@ -332,13 +332,8 @@ int createSingleColorImage(lua_State* L) {
const glm::dvec3 color = colorDict.value<glm::dvec3>(key);
const std::string& fileName = FileSys.cacheManager()->cachedFilename(
fmt::format("{}.ppm", name),
"",
ghoul::filesystem::CacheManager::Persistent::Yes
);
const bool hasCachedFile = FileSys.fileExists(fileName);
std::string 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));
ghoul::lua::push(L, fileName);