mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-01 16:29:43 -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/globebrowsing/cache/memoryawaretilecache.cpp
Vendored
+1 -1
View File
@@ -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;
modules/globebrowsing/globebrowsingmodule.cpp
+12
View File
@@ -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"
modules/globebrowsing/tile/rawtiledatareader/gdalrawtiledatareader.cpp
+10
View File
@@ -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 {
modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.cpp
+2 -2
View File
@@ -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");
modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
+11
View File
@@ -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>