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

Applied Ghoul cleanups

Browse Source
This commit is contained in:
Alexander Bock
2015-11-22 21:26:02 -05:00
parent 01c1586616
commit 3806318b0d
7 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/modelgeometry.cpp
+1 -2
View File
@@ -146,8 +146,7 @@ void ModelGeometry::deinitialize() {
}
bool ModelGeometry::loadObj(const std::string& filename) {
std::string cachedFile = "";
FileSys.cacheManager()->getCachedFile(filename, cachedFile, true);
std::string cachedFile = FileSys.cacheManager()->cachedFilename(filename, true);
bool hasCachedFile = FileSys.fileExists(cachedFile);
if (hasCachedFile) {
modules/base/rendering/renderablestars.cpp
+1 -2
View File
@@ -349,8 +349,7 @@ void RenderableStars::update(const UpdateData& data) {
bool RenderableStars::loadData() {
std::string _file = _speckFile;
std::string cachedFile = "";
FileSys.cacheManager()->getCachedFile(_file, cachedFile, true);
std::string cachedFile = FileSys.cacheManager()->cachedFilename(_file, true);
bool hasCachedFile = FileSys.fileExists(cachedFile);
if (hasCachedFile) {
modules/onscreengui/src/gui.cpp
+2 -2
View File
@@ -150,8 +150,8 @@ void GUI::setEnabled(bool enabled) {
}
void GUI::initialize() {
std::string cachedFile;
FileSys.cacheManager()->getCachedFile(configurationFile, "", cachedFile, true);
std::string cachedFile = FileSys.cacheManager()->cachedFilename(configurationFile,
"", true);
char* buffer = new char[cachedFile.size() + 1];
modules/volume/rendering/renderablevolume.cpp
+3 -2
View File
@@ -140,9 +140,10 @@ ghoul::opengl::Texture* RenderableVolume::loadVolume(
std::stringstream ss;
ss << "." << dimensions[0] << "x" << dimensions[1] << "x" << dimensions[2] << "." << "." << variableCacheString << ".cache";
std::string cachepath; // = filepath + ss.str();
// = filepath + ss.str();
ghoul::filesystem::File ghlFile(filepath);
FileSys.cacheManager()->getCachedFile(ghlFile.baseName(), ss.str(), cachepath, true);
std::string cachepath = FileSys.cacheManager()->cachedFilename(ghlFile.baseName(),
ss.str(), true);
if (cache && FileSys.fileExists(cachepath)) {
#define VOLUME_LOAD_PROGRESSBAR