mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 10:59:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/new formatting (#547)

Browse Source 
* Change to new logging format (closes #542)
 * Adds a screenshots folder that uses the application startup time
 * Creating focus nodes for VRT files if the info files contain location information
 * Fix issue with removing virtual properties
 * Add a method for returning the cartesian coordinates for a geolocation on a planet
This commit is contained in:
Alexander Bock
2018-03-07 18:10:32 -05:00
committed by GitHub
parent 4675554471
commit a3c849843f
131 changed files with 1229 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/modelgeometry.cpp
+21 -8
View File
@@ -29,6 +29,7 @@
#include <openspace/util/factorymanager.h>
#include <ghoul/filesystem/cachemanager.h>
#include <ghoul/filesystem/file.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/misc/dictionary.h>
#include <ghoul/misc/invariants.h>
@@ -208,7 +209,11 @@ bool ModelGeometry::loadObj(const std::string& filename) {
const bool hasCachedFile = FileSys.fileExists(cachedFile);
if (hasCachedFile) {
LINFO("Cached file '" << cachedFile << "' used for file '" << filename << "'");
LINFO(fmt::format(
"Cached file '{}' used for file '{}",
cachedFile,
filename
));
const bool success = loadCachedFile(cachedFile);
if (success) {
@@ -221,12 +226,14 @@ bool ModelGeometry::loadObj(const std::string& filename) {
// file for the next run
}
else {
LINFO(
"Cached file '" << cachedFile << "' for file '" << filename << "' not found"
);
LINFO(fmt::format(
"Cached file '{}' for file '{}' not found",
cachedFile,
filename
));
}
LINFO("Loading Model file '" << filename << "'");
LINFO(fmt::format("Loading Model file '{}'", filename));
const bool modelSuccess = loadModel(filename);
if (!modelSuccess) {
@@ -262,7 +269,7 @@ bool ModelGeometry::saveCachedFile(const std::string& filename) {
return fileStream.good();
}
else {
LERROR("Error opening file '" << filename << "' for save cache file");
LERROR(fmt::format("Error opening file '{}' for save cache file", filename));
return false;
}
}
@@ -284,7 +291,10 @@ bool ModelGeometry::loadCachedFile(const std::string& filename) {
fileStream.read(reinterpret_cast<char*>(&iSize), sizeof(int64_t));
if (vSize == 0 || iSize == 0) {
LERROR("Error opening file '" << filename << "' for loading cache file");
LERROR(fmt::format(
"Error opening file '{}' for loading cache file",
filename
));
return false;
}
@@ -300,7 +310,10 @@ bool ModelGeometry::loadCachedFile(const std::string& filename) {
return fileStream.good();
}
else {
LERROR("Error opening file '" << filename << "' for loading cache file");
LERROR(fmt::format(
"Error opening file '{}' for loading cache file",
filename
));
return false;
}
}