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

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

33
modules/space/rendering/renderablestars.cpp
View File

@@ -30,7 +30,8 @@
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderengine.h>
#include <ghoul/filesystem/filesystem>
#include <ghoul/filesystem/cachemanager.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/misc/templatefactory.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/opengl/programobject.h>
@@ -381,11 +382,9 @@ void RenderableStars::update(const UpdateData&) {
if (_vao == 0) {
glGenVertexArrays(1, &_vao);
LDEBUG("Generating Vertex Array id '" << _vao << "'");
}
if (_vbo == 0) {
glGenBuffers(1, &_vbo);
LDEBUG("Generating Vertex Buffer Object id '" << _vbo << "'");
}
glBindVertexArray(_vao);
glBindBuffer(GL_ARRAY_BUFFER, _vbo);
@@ -506,9 +505,10 @@ void RenderableStars::update(const UpdateData&) {
);
if (_pointSpreadFunctionTexture) {
LDEBUG("Loaded texture from '" <<
absPath(_pointSpreadFunctionTexturePath) << "'"
);
LDEBUG(fmt::format(
"Loaded texture from '{}'",
absPath(_pointSpreadFunctionTexturePath)
));
_pointSpreadFunctionTexture->uploadTexture();
}
_pointSpreadFunctionTexture->setFilter(
@@ -535,7 +535,10 @@ void RenderableStars::update(const UpdateData&) {
absPath(_colorTexturePath)
);
if (_colorTexture) {
LDEBUG("Loaded texture from '" << absPath(_colorTexturePath) << "'");
LDEBUG(fmt::format(
"Loaded texture from '{}'",
absPath(_colorTexturePath)
));
_colorTexture->uploadTexture();
}
@@ -574,7 +577,11 @@ bool RenderableStars::loadData() {
bool hasCachedFile = FileSys.fileExists(cachedFile);
if (hasCachedFile) {
LINFO("Cached file '" << cachedFile << "' used for Speck file '" << _file << "'");
LINFO(fmt::format(
"Cached file '{}' used for Speck file '{}'",
cachedFile,
_file
));
bool success = loadCachedFile(cachedFile);
if (success) {
@@ -587,9 +594,9 @@ bool RenderableStars::loadData() {
}
}
else {
LINFO("Cache for Speck file '" << _file << "' not found");
LINFO(fmt::format("Cache for Speck file '{}' not found", _file));
}
LINFO("Loading Speck file '" << _file << "'");
LINFO(fmt::format("Loading Speck file '{}'", _file));
bool success = readSpeckFile();
if (!success) {
@@ -606,7 +613,7 @@ bool RenderableStars::readSpeckFile() {
std::string _file = _speckFile;
std::ifstream file(_file);
if (!file.good()) {
LERROR("Failed to open Speck file '" << _file << "'");
LERROR(fmt::format("Failed to open Speck file '{}'", _file));
return false;
}
@@ -699,7 +706,7 @@ bool RenderableStars::loadCachedFile(const std::string& file) {
return success;
}
else {
LERROR("Error opening file '" << file << "' for loading cache file");
LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
return false;
}
}
@@ -727,7 +734,7 @@ bool RenderableStars::saveCachedFile(const std::string& file) const {
return success;
}
else {
LERROR("Error opening file '" << file << "' for save cache file");
LERROR(fmt::format("Error opening file '{}' for save cache file", file));
return false;
}
}