mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-25 06:19:02 -06:00
Remove erraneous enabled OpenGL checking code
Remove warnings Reset using the star glare texture as billboard for the Sun
This commit is contained in:
@@ -51,7 +51,7 @@ return {
|
||||
Size = 1.3*10^10.5,
|
||||
Origin = "Center",
|
||||
Billboard = true,
|
||||
Texture = "textures/sun-glare.png",
|
||||
Texture = "textures/halo.png",
|
||||
BlendMode = "Additive"
|
||||
},
|
||||
Transform = {
|
||||
|
||||
Submodule ext/ghoul updated: 7a4076c453...7463fe3cc0
@@ -32,7 +32,7 @@
|
||||
#include <openspace/interaction/navigationhandler.h>
|
||||
#include <openspace/rendering/renderengine.h>
|
||||
#include <openspace/scene/scenegraphnode.h>
|
||||
#include <openspace/util/distanceconversion.h>>
|
||||
#include <openspace/util/distanceconversion.h>
|
||||
#include <openspace/util/timeconversion.h>
|
||||
#include <openspace/util/timemanager.h>
|
||||
|
||||
|
||||
@@ -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 << "'");
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -267,7 +267,7 @@ void MemoryAwareTileCache::createTileAndPut(ProviderTileKey key,
|
||||
ghoul_assert(texture->dataOwnership(),
|
||||
"Texture must have ownership of old data to avoid leaks");
|
||||
texture->setPixelData(rawTile->imageData, Texture::TakeOwnership::Yes);
|
||||
size_t expectedDataSize = texture->expectedPixelDataSize();
|
||||
[[ maybe_unused ]] size_t expectedDataSize = texture->expectedPixelDataSize();
|
||||
size_t numBytes = rawTile->textureInitData->totalNumBytes();
|
||||
ghoul_assert(expectedDataSize == numBytes, "Pixel data size is incorrect");
|
||||
_numTextureBytesAllocatedOnCPU += numBytes - previousExpectedDataSize;
|
||||
|
||||
@@ -54,7 +54,19 @@
|
||||
|
||||
#ifdef GLOBEBROWSING_USE_GDAL
|
||||
#include <gdal.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (push)
|
||||
// CPL throws warning about missing DLL interface
|
||||
#pragma warning (disable : 4251)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#include <cpl_string.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (pop)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#endif // GLOBEBROWSING_USE_GDAL
|
||||
|
||||
#include "globebrowsingmodule_lua.inl"
|
||||
|
||||
@@ -37,12 +37,22 @@
|
||||
#include <ghoul/misc/assert.h>
|
||||
#include <ghoul/misc/dictionary.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (push)
|
||||
// CPL throws warning about missing DLL interface
|
||||
#pragma warning (disable : 4251)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#include <ogr_featurestyle.h>
|
||||
#include <ogr_spatialref.h>
|
||||
#include <cpl_virtualmem.h>
|
||||
|
||||
#include <gdal_priv.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (pop)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
namespace openspace::globebrowsing {
|
||||
|
||||
@@ -361,8 +361,8 @@ PixelRegion::PixelCoordinate RawTileDataReader::geodeticToPixel(
|
||||
// ref: https://www.wolframalpha.com/input/?i=X+%3D+a0+%2B+a1P+%2B+a2L,
|
||||
// +Y+%3D+b0+%2B+b1P+%2B+b2L,+solve+for+P+and+L
|
||||
|
||||
double Xp = a[0] + P*a[1] + L*a[2];
|
||||
double Yp = b[0] + P*b[1] + L*b[2];
|
||||
[[ maybe_unused ]] double Xp = a[0] + P*a[1] + L*a[2];
|
||||
[[ maybe_unused ]] double Yp = b[0] + P*b[1] + L*b[2];
|
||||
|
||||
ghoul_assert(std::abs(X - Xp) < 1e-10, "inverse should yield X as before");
|
||||
ghoul_assert(std::abs(Y - Yp) < 1e-10, "inverse should yield Y as before");
|
||||
|
||||
@@ -25,8 +25,19 @@
|
||||
#include <modules/globebrowsing/tile/rawtiledatareader/tiledatatype.h>
|
||||
|
||||
#ifdef GLOBEBROWSING_USE_GDAL
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (push)
|
||||
// CPL throws warning about missing DLL interface
|
||||
#pragma warning (disable : 4251)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#include <ogr_featurestyle.h>
|
||||
#include <ogr_spatialref.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (pop)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#endif // GLOBEBROWSING_USE_GDAL
|
||||
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
|
||||
@@ -173,7 +173,7 @@ void DataProcessor::calculateFilterValues(std::vector<int> selectedOptions) {
|
||||
standardDeviation,
|
||||
_normValues
|
||||
);
|
||||
filterWidth = fabs(0.5-normalizeWithStandardScore(
|
||||
filterWidth = fabs(0.5f-normalizeWithStandardScore(
|
||||
filterWidth,
|
||||
mean,
|
||||
standardDeviation,
|
||||
|
||||
@@ -26,7 +26,18 @@
|
||||
|
||||
#include <openspace/util/time.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>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning (pop)
|
||||
#endif // _MSC_VER
|
||||
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
|
||||
|
||||
|
||||
@@ -297,11 +297,7 @@ bool HongKangParser::augmentWithSpice(Image& image, std::string spacecraft,
|
||||
std::vector<std::string> potentialTargets)
|
||||
{
|
||||
image.target = "VOID";
|
||||
// we have (?) to cast to int, unfortunately
|
||||
// Why? --abock
|
||||
// because: old comment --m
|
||||
|
||||
int exposureTime = image.timeRange.duration();
|
||||
int exposureTime = static_cast<int>(image.timeRange.duration());
|
||||
if (exposureTime == 0) {
|
||||
exposureTime = 1;
|
||||
}
|
||||
|
||||
@@ -1034,11 +1034,11 @@ void TouchInteraction::step(double dt) {
|
||||
directionToCenter = normalize(-centerToCam);
|
||||
dvec3 lookUpWhenFacingCenter = globalCamRot *
|
||||
dvec3(_camera->lookUpVectorCameraSpace());
|
||||
dmat4 lookAtMat = lookAt(
|
||||
dmat4 lookAtMatrix = lookAt(
|
||||
dvec3(0, 0, 0),
|
||||
directionToCenter,
|
||||
lookUpWhenFacingCenter);
|
||||
globalCamRot = normalize(quat_cast(inverse(lookAtMat)));
|
||||
globalCamRot = normalize(quat_cast(inverse(lookAtMatrix)));
|
||||
}
|
||||
{ // Zooming
|
||||
centerToBoundingSphere = -directionToCenter * boundingSphere;
|
||||
|
||||
@@ -92,8 +92,8 @@ return {
|
||||
ShowNodeNames = true,
|
||||
ShowProgressbar = true
|
||||
},
|
||||
CheckOpenGLState = true,
|
||||
LogEachOpenGLCall = true,
|
||||
CheckOpenGLState = false,
|
||||
LogEachOpenGLCall = false,
|
||||
|
||||
ShutdownCountdown = 3,
|
||||
-- OnScreenTextScaling = "framebuffer",
|
||||
|
||||
@@ -56,7 +56,8 @@ function (set_openspace_compile_settings project)
|
||||
"/w44548" # expression before comma has no effect; expected expression with side-effect
|
||||
"/w44549" # 'operator': operator before comma has no effect; did you intend 'operator'?
|
||||
"/w44555" # expression has no effect; expected expression with side-effect
|
||||
"/w44574" # 'identifier' is defined to be '0': did you mean to use '#if identifier'?
|
||||
# This is disabled until GLM is updated to version 0.9.9 that removes occurrance of this warning
|
||||
# "/w44574" # 'identifier' is defined to be '0': did you mean to use '#if identifier'?
|
||||
"/w44608" # 'symbol1' has already been initialized by another union member in the initializer list, 'symbol2'
|
||||
"/w44619" # #pragma warning: there is no warning number 'number'
|
||||
"/w44628" # digraphs not supported with -Ze. Character sequence 'digraph' not interpreted as alternate token for 'char'
|
||||
|
||||
Reference in New Issue
Block a user