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

Update Ghoul version to accommodate public API bool parameter changes

Browse Source
This commit is contained in:
Alexander Bock
2016-03-06 08:08:06 +01:00
parent ff7f4f61db
commit df0d0d1258
18 changed files with 101 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/base/rendering/modelgeometry.cpp
View File

@@ -84,7 +84,7 @@ ModelGeometry::ModelGeometry(const ghoul::Dictionary& dictionary)
}
_file = FileSys.absolutePath(_file);
if (!FileSys.fileExists(_file, true))
if (!FileSys.fileExists(_file, ghoul::filesystem::FileSystem::RawPath::Yes))
LERROR("Could not load OBJ file '" << _file << "': File not found");
@@ -145,7 +145,10 @@ void ModelGeometry::deinitialize() {
}
bool ModelGeometry::loadObj(const std::string& filename) {
std::string cachedFile = FileSys.cacheManager()->cachedFilename(filename, true);
std::string cachedFile = FileSys.cacheManager()->cachedFilename(
filename,
ghoul::filesystem::CacheManager::Persistent::Yes
);
bool hasCachedFile = FileSys.fileExists(cachedFile);
if (hasCachedFile) {