diff --git a/ext/ghoul b/ext/ghoul index c1daefdce9..1fc3d1f78d 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit c1daefdce9a252d9048c4b9225f904cda3eb5f90 +Subproject commit 1fc3d1f78dfd9227ee0068f388f96ea6b1b7bf9f diff --git a/ext/sgct b/ext/sgct index f1c7ddb602..ac291882d9 160000 --- a/ext/sgct +++ b/ext/sgct @@ -1 +1 @@ -Subproject commit f1c7ddb602148425424048285d457aeb7c57a7d6 +Subproject commit ac291882d9dba5636f3b7ef412f39f95e112d057 diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl index 7e83b15fa3..b3cb206af3 100644 --- a/include/openspace/properties/numericalproperty.inl +++ b/include/openspace/properties/numericalproperty.inl @@ -246,6 +246,7 @@ template NumericalProperty::NumericalProperty(PropertyInfo info, T value) : NumericalProperty( std::move(info), + std::move(value), PropertyDelegate>::template defaultMinimumValue(), PropertyDelegate>::template defaultMaximumValue(), PropertyDelegate>::template defaultSteppingValue() diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp index c67ec7eca0..268e2855e3 100644 --- a/modules/base/rendering/renderableplane.cpp +++ b/modules/base/rendering/renderableplane.cpp @@ -114,7 +114,7 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary) : Renderable(dictionary) , _texturePath(TextureInfo) , _billboard(BillboardInfo, false) - , _size(SizeInfo, 10.f, 0.f, 1e25) + , _size(SizeInfo, 10.f, 0.f, 1e25f) , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown) , _shader(nullptr) , _texture(nullptr) diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp index 30d2b03de5..a226bd7bda 100644 --- a/modules/base/rendering/renderablesphere.cpp +++ b/modules/base/rendering/renderablesphere.cpp @@ -128,7 +128,7 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary) : Renderable(dictionary) , _texturePath(TextureInfo) , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown) - , _size(SizeInfo, 1.f, 0.f, 1e35) + , _size(SizeInfo, 1.f, 0.f, 1e35f) , _segments(SegmentsInfo, 8, 4, 1000) , _transparency(TransparencyInfo, 1.f, 0.f, 1.f) , _shader(nullptr) @@ -187,7 +187,9 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary) } }); if (dictionary.hasKey(TransparencyInfo.identifier)) { - _transparency = dictionary.value(TransparencyInfo.identifier); + _transparency = static_cast( + dictionary.value(TransparencyInfo.identifier) + ); } addProperty(_transparency); diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp index 106e0ec8b2..d69d2adceb 100644 --- a/modules/base/rendering/renderabletrailorbit.cpp +++ b/modules/base/rendering/renderabletrailorbit.cpp @@ -139,7 +139,7 @@ documentation::Documentation RenderableTrailOrbit::Documentation() { RenderableTrailOrbit::RenderableTrailOrbit(const ghoul::Dictionary& dictionary) : RenderableTrail(dictionary) , _period(PeriodInfo, 0.0, 0.0, 1e9) - , _resolution(ResolutionInfo, 1e4, 1, 1e6) + , _resolution(ResolutionInfo, 10000, 1, 1000000) , _needsFullSweep(true) , _indexBufferDirty(true) , _previousTime(0) diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp index f82af3ab75..d44705a6f6 100644 --- a/modules/base/rendering/renderabletrailtrajectory.cpp +++ b/modules/base/rendering/renderabletrailtrajectory.cpp @@ -145,7 +145,7 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di , _startTime(StartTimeInfo) , _endTime(EndTimeInfo) , _sampleInterval(SampleIntervalInfo, 2.0, 2.0, 1e6) - , _timeStampSubsamplingFactor(TimeSubSampleInfo, 1, 1, 1e9) + , _timeStampSubsamplingFactor(TimeSubSampleInfo, 1, 1, 1000000000) , _renderFullTrail(RenderFullPathInfo, false) , _needsFullSweep(true) , _subsamplingIsDirty(true) diff --git a/modules/globebrowsing/cache/memoryawaretilecache.cpp b/modules/globebrowsing/cache/memoryawaretilecache.cpp index 5ad33722c5..f97d196be8 100644 --- a/modules/globebrowsing/cache/memoryawaretilecache.cpp +++ b/modules/globebrowsing/cache/memoryawaretilecache.cpp @@ -169,7 +169,8 @@ void MemoryAwareTileCache::setSizeEstimated(size_t estimatedSize) { size_t sumTextureTypeSize = std::accumulate( _textureContainerMap.cbegin(), - _textureContainerMap.cend(), 0, + _textureContainerMap.cend(), + size_t(0), [](size_t s, const std::pair& p) { diff --git a/modules/globebrowsing/other/pixelbuffercontainer.inl b/modules/globebrowsing/other/pixelbuffercontainer.inl index 2f9109145f..46c3d09d23 100644 --- a/modules/globebrowsing/other/pixelbuffercontainer.inl +++ b/modules/globebrowsing/other/pixelbuffercontainer.inl @@ -52,7 +52,7 @@ void* PixelBufferContainer::mapBuffer(KeyType key, PixelBuffer::Access _pixelBuffers[i]->unbind(); if (dataPtr) { // Success in mapping // Add this index to the map of mapped pixel buffers - _indexMap.emplace(key, i); + _indexMap.emplace(key, static_cast(i)); return dataPtr; } } diff --git a/modules/globebrowsing/rendering/gpu/gpulayerrendersettings.cpp b/modules/globebrowsing/rendering/gpu/gpulayerrendersettings.cpp index 450f6708cf..d2adf6d794 100644 --- a/modules/globebrowsing/rendering/gpu/gpulayerrendersettings.cpp +++ b/modules/globebrowsing/rendering/gpu/gpulayerrendersettings.cpp @@ -37,7 +37,7 @@ void GPULayerRenderSettings::setValue(ghoul::opengl::ProgramObject* programObjec gpuOffset.setValue(programObject, layerSettings.offset.value()); } -void GPULayerRenderSettings::bind(const LayerRenderSettings& layerSettings, +void GPULayerRenderSettings::bind(const LayerRenderSettings&, ghoul::opengl::ProgramObject* programObject, const std::string& nameBase) { diff --git a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp index 37902658f5..f8cb1ec335 100644 --- a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp +++ b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp @@ -98,7 +98,6 @@ void LayerRenderSettings::setValuesFromDictionary( float dictGamma; float dictMultiplier; float dictOffset; - float dictValueBlending; if (renderSettingsDict.getValue(keyOpacity, dictOpacity)) { opacity = dictOpacity; diff --git a/modules/globebrowsing/tile/rawtile.cpp b/modules/globebrowsing/tile/rawtile.cpp index ec36caa9fc..43a93496bc 100644 --- a/modules/globebrowsing/tile/rawtile.cpp +++ b/modules/globebrowsing/tile/rawtile.cpp @@ -42,7 +42,11 @@ RawTile RawTile::createDefault(const TileTextureInitData& initData) { RawTile defaultRes; defaultRes.textureInitData = std::make_shared(initData); defaultRes.imageData = new char[initData.totalNumBytes()]; - std::fill_n(static_cast(defaultRes.imageData), initData.totalNumBytes(), 0); + std::fill_n( + static_cast(defaultRes.imageData), + initData.totalNumBytes(), + char(0) + ); return defaultRes; } diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp index 9d60df5fdd..ce50ee17cd 100644 --- a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp +++ b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp @@ -33,8 +33,18 @@ #include #include + +#ifdef WIN32 +#pragma warning (push) +#pragma warning (disable : 4251) // needs to have dll-interface to be used by clients +#endif // WIN32 + #include +#ifdef WIN32 +#pragma warning (pop) +#endif // WIN32 + namespace { const char* _loggerCat = "GdalWrapper"; diff --git a/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp index 632c7f3207..f2b59bd4c0 100644 --- a/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp @@ -96,7 +96,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary) int tilePixelSize = 0; if (dictionary.getValue(KeyTilePixelSize, pixelSize)) { LDEBUG("Default pixel size overridden: " << pixelSize); - tilePixelSize = pixelSize; + tilePixelSize = static_cast(pixelSize); } TileTextureInitData initData(LayerManager::getTileTextureInitData( _layerGroupID, tilePixelSize)); diff --git a/modules/globebrowsing/tile/tileprovider/sizereferencetileprovider.cpp b/modules/globebrowsing/tile/tileprovider/sizereferencetileprovider.cpp index 448adff75e..4f02613a7c 100644 --- a/modules/globebrowsing/tile/tileprovider/sizereferencetileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/sizereferencetileprovider.cpp @@ -71,7 +71,9 @@ void SizeReferenceTileProvider::renderText(const ghoul::fontrendering::FontRende glm::vec2 textPosition; textPosition.x = 0; - textPosition.y = aboveEquator ? _fontSize / 2 : _initData.dimensionsWithPadding().y - 3 * _fontSize / 2; + textPosition.y = aboveEquator ? + _fontSize / 2.f : + _initData.dimensionsWithPadding().y - 3.f * _fontSize / 2.f; glm::vec4 color(1.0, 1.0, 1.0, 1.0); fontRenderer.render( @@ -80,7 +82,7 @@ void SizeReferenceTileProvider::renderText(const ghoul::fontrendering::FontRende color, " %.0f %s", tileLongitudalLength, unit.c_str() - ); + ); } int SizeReferenceTileProvider::roundedLongitudalLength(const TileIndex& tileIndex) const { @@ -95,7 +97,7 @@ int SizeReferenceTileProvider::roundedLongitudalLength(const TileIndex& tileInde if (useKm) { l /= 1000; } - l = std::round(l); + l = static_cast(std::round(l)); if (useKm) { l *= 1000; } diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp index 2982fe0496..fa9a609bdd 100644 --- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp @@ -71,7 +71,7 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary) try { filePath = absPath(filePath); } - catch (const std::runtime_error& e) { + catch (const std::runtime_error&) { // File path was not a path to a file but a GDAL config or empty } @@ -123,7 +123,7 @@ bool TemporalTileProvider::readFilePath() { ghoul::filesystem::File(_filePath.value()).directoryName() ); } - catch (const std::runtime_error& e) { + catch (const std::runtime_error&) { // File path was not a path to a file but a GDAL config or empty } diff --git a/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp b/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp index 0e1494db0f..cdf048d919 100644 --- a/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/texttileprovider.cpp @@ -47,7 +47,7 @@ TextTileProvider::TextTileProvider(const TileTextureInitData& initData, size_t f , _fontSize(fontSize) { _tileCache = OsEng.moduleEngine().module()->tileCache(); - _font = OsEng.fontManager().font("Mono", _fontSize); + _font = OsEng.fontManager().font("Mono", static_cast(_fontSize)); _fontRenderer = std::unique_ptr(FontRenderer::createDefault()); _fontRenderer->setFramebufferSize(_initData.dimensionsWithPadding()); diff --git a/modules/globebrowsing/tile/tileprovider/tileindextileprovider.cpp b/modules/globebrowsing/tile/tileprovider/tileindextileprovider.cpp index 72c12ec552..4baf0608a0 100644 --- a/modules/globebrowsing/tile/tileprovider/tileindextileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/tileindextileprovider.cpp @@ -30,7 +30,7 @@ namespace openspace::globebrowsing::tileprovider { -TileIndexTileProvider::TileIndexTileProvider(const ghoul::Dictionary& dict) +TileIndexTileProvider::TileIndexTileProvider(const ghoul::Dictionary&) : TextTileProvider(LayerManager::getTileTextureInitData( layergroupid::GroupID::ColorLayers )) diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp index e05a0bd3f8..9c6925050d 100644 --- a/modules/kameleon/src/kameleonwrapper.cpp +++ b/modules/kameleon/src/kameleonwrapper.cpp @@ -28,6 +28,11 @@ #include #include +#ifdef WIN32 +#pragma warning (push) +#pragma warning (disable : 4619) // #pragma warning: there is no warning number '4675' +#endif // WIN32 + #include #include #include @@ -35,6 +40,10 @@ #include #include +#ifdef WIN32 +#pragma warning (pop) +#endif // WIN32 + #define _USE_MATH_DEFINES #include #include @@ -940,9 +949,24 @@ void KameleonWrapper::getGridVariables(std::string& x, std::string& y, std::stri y = tokens.at(1); z = tokens.at(2); - std::transform(x.begin(), x.end(), x.begin(), ::tolower); - std::transform(y.begin(), y.end(), y.begin(), ::tolower); - std::transform(z.begin(), z.end(), z.begin(), ::tolower); + std::transform( + x.begin(), + x.end(), + x.begin(), + [](char c) { return static_cast(tolower(c)); } + ); + std::transform( + y.begin(), + y.end(), + y.begin(), + [](char c) { return static_cast(tolower(c)); } + ); + std::transform( + z.begin(), + z.end(), + z.begin(), + [](char c) { return static_cast(tolower(c)); } + ); } KameleonWrapper::GridType KameleonWrapper::getGridType( diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp index a68bc9c74b..5bde722d5e 100644 --- a/modules/kameleonvolume/kameleonvolumereader.cpp +++ b/modules/kameleonvolume/kameleonvolumereader.cpp @@ -28,7 +28,6 @@ #ifdef WIN32 #pragma warning (push) -#pragma warning (disable : 4345) // #pragma warning: there is no warning number '4345' #pragma warning (disable : 4619) // #pragma warning: there is no warning number '4619' #pragma warning (disable : 4675) // #pragma warning: there is no warning number '4675' #pragma warning (disable : 4800) // #pragma warning: there is no warning number '4800' diff --git a/modules/newhorizons/rendering/renderablemodelprojection.cpp b/modules/newhorizons/rendering/renderablemodelprojection.cpp index 459dc5c918..6b023ada05 100644 --- a/modules/newhorizons/rendering/renderablemodelprojection.cpp +++ b/modules/newhorizons/rendering/renderablemodelprojection.cpp @@ -139,7 +139,7 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di ); std::string name; - [[maybe_unused]] bool success = dictionary.getValue(SceneGraphNode::KeyName, name); + [[ maybe_unused ]] bool success = dictionary.getValue(SceneGraphNode::KeyName, name); ghoul_assert(success, "Name was not passed to RenderableModelProjection"); using ghoul::Dictionary; diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp index 28367c68d1..5c8c584d5d 100644 --- a/modules/space/rendering/renderablerings.cpp +++ b/modules/space/rendering/renderablerings.cpp @@ -128,7 +128,7 @@ documentation::Documentation RenderableRings::Documentation() { RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary) : Renderable(dictionary) , _texturePath(TextureInfo) - , _size(SizeInfo, 1.f, 0.f, 1e25) + , _size(SizeInfo, 1.f, 0.f, 1e25f) , _offset(OffsetInfo, glm::vec2(0.f, 1.f), glm::vec2(0.f), glm::vec2(1.f)) , _nightFactor(NightFactorInfo, 0.33f, 0.f, 1.f) , _transparency(TransparencyInfo, 0.15f, 0.f, 1.f) diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index ff414456da..ccdd5f5143 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -212,10 +212,14 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary) "RenderableStars" ); - _pointSpreadFunctionTexturePath = absPath(dictionary.value(KeyTexture)); + _pointSpreadFunctionTexturePath = absPath(dictionary.value( + PsfTextureInfo.identifier + )); _pointSpreadFunctionFile = std::make_unique(_pointSpreadFunctionTexturePath); - _colorTexturePath = absPath(dictionary.value(KeyColorMap)); + _colorTexturePath = absPath(dictionary.value( + ColorTextureInfo.identifier + )); _colorTextureFile = std::make_unique(_colorTexturePath); _speckFile = absPath(dictionary.value(KeyFile)); diff --git a/modules/space/rendering/simplespheregeometry.cpp b/modules/space/rendering/simplespheregeometry.cpp index 103e45855d..27c2f8a393 100644 --- a/modules/space/rendering/simplespheregeometry.cpp +++ b/modules/space/rendering/simplespheregeometry.cpp @@ -91,7 +91,6 @@ SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary) "SimpleSphereGeometry" ); - float sphereRadius = 0.f; glm::vec3 ellipsoidRadius; if (dictionary.hasKeyAndValue(RadiusInfo.identifier)) { const float r = static_cast( diff --git a/modules/touch/CMakeLists.txt b/modules/touch/CMakeLists.txt index 45a7400757..0cf5bc55f4 100644 --- a/modules/touch/CMakeLists.txt +++ b/modules/touch/CMakeLists.txt @@ -53,3 +53,5 @@ create_new_module( ) include_external_library(${touch_module} libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext) + +disable_external_warnings_for_file(${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp) diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp index adbf268aa3..81ecbe24bc 100644 --- a/src/engine/downloadmanager.cpp +++ b/src/engine/downloadmanager.cpp @@ -36,7 +36,16 @@ #include #ifdef OPENSPACE_CURL_ENABLED +#ifdef WIN32 +#pragma warning (push) +#pragma warning (disable: 4574) // 'INCL_WINSOCK_API_TYPEDEFS' is defined to be '0' +#endif // WIN32 + #include + +#ifdef WIN32 +#pragma warning (pop) +#endif // WIN32 #endif namespace { @@ -318,7 +327,7 @@ DownloadManager::downloadRequestFiles( LDEBUG("Request File: " << requestFile); bool isFinished = false; - auto callback = [&](const FileFuture& f) { + auto callback = [&](const FileFuture&) { LDEBUG("Finished: " << requestFile); std::ifstream temporary(requestFile); std::string line; diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp index 0407543276..aa817dd756 100644 --- a/src/network/parallelconnection.cpp +++ b/src/network/parallelconnection.cpp @@ -56,9 +56,15 @@ #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif + +#pragma warning (push) +#pragma warning (disable: 4574) // 'INCL_WINSOCK_API_TYPEDEFS' is defined to be '0' + #include #include #include + +#pragma warning (pop) #endif #include diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake index 2ae89cd8ec..318cd51c9b 100644 --- a/support/cmake/support_macros.cmake +++ b/support/cmake/support_macros.cmake @@ -170,7 +170,7 @@ function (add_external_dependencies) set(SGCT_LIGHT_ONLY ON CACHE BOOL "" FORCE) set(SGCT_CUSTOMOUTPUTDIRS OFF CACHE BOOL "" FORCE) set(JPEG_TURBO_WITH_SIMD OFF CACHE BOOL "" FORCE) - + add_subdirectory(${OPENSPACE_EXT_DIR}/sgct) target_include_directories(libOpenSpace SYSTEM PUBLIC ${OPENSPACE_EXT_DIR}/sgct/include) target_link_libraries( @@ -243,6 +243,7 @@ function (add_external_dependencies) set(CMAKE_PREFIX_PATH "~/Qt/5.6/clang_64/lib/cmake" "~/Qt/5.7/clang_64/lib/cmake" + "~/Qt/5.8/clang_64/lib/cmake" PARENT_SCOPE ) endif ()