mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 07:49:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove erraneous enabled OpenGL checking code

Browse Source 
Remove warnings
Reset using the star glare texture as billboard for the Sun
This commit is contained in:
Alexander Bock
2017-12-12 13:07:56 -05:00
parent 0f0fb78a63
commit a08c678bb0
16 changed files with 85 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/fieldlinessequence/rendering/renderablefieldlinessequencesetup.cpp
+12 -2
View File
@@ -342,7 +342,12 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
[inputFileTypeString](std::string str) {
const size_t extLength = inputFileTypeString.length();
std::string sub = str.substr(str.length() - extLength, extLength);
std::transform(sub.begin(), sub.end(), sub.begin(), ::tolower);
std::transform(
sub.begin(),
sub.end(),
sub.begin(),
[](char c) { return static_cast<char>(::tolower(c)); }
);
return sub != inputFileTypeString;
}), _sourceFiles.end());
// Ensure that there are available and valid source files left
@@ -416,7 +421,12 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
bool RenderableFieldlinesSequence::extractJsonInfoFromDictionary(fls::Model& model) {
std::string modelStr;
if (_dictionary->getValue(KeyJsonSimulationModel, modelStr)) {
std::transform(modelStr.begin(), modelStr.end(), modelStr.begin(), ::tolower);
std::transform(
modelStr.begin(),
modelStr.end(),
modelStr.begin(),
[](char c) { return static_cast<char>(::tolower(c)); }
);
model = fls::stringToModel(modelStr);
} else {
LERROR(_name << ": Must specify '" << KeyJsonSimulationModel << "'");
modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+15 -3
View File
@@ -28,9 +28,21 @@
#include <modules/fieldlinessequence/util/fieldlinesstate.h>
#ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
#include <ccmc/Kameleon.h>
#include <ccmc/KameleonInterpolator.h>
#include <modules/kameleon/include/kameleonhelper.h>
#ifdef _MSC_VER
#pragma warning (push)
// Boost throws #pragma warning: there is no warning number '4675'
#pragma warning (disable : 4619)
#endif // _MSC_VER
#include <ccmc/Kameleon.h>
#include <ccmc/KameleonInterpolator.h>
#include <modules/kameleon/include/kameleonhelper.h>
#ifdef _MSC_VER
#pragma warning (pop)
#endif // _MSC_VER
#endif // OPENSPACE_MODULE_KAMELEON_ENABLED
#include <ghoul/logging/logmanager.h>