diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index c651841a49..669fbc16a9 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit c651841a49c468f2371713f23e90561f0c080d52 +Subproject commit 669fbc16a9910b28333427f5e07235baa43ea7a6 diff --git a/ext/ghoul b/ext/ghoul index 71bf9d8f51..1413844185 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 71bf9d8f51e4d11acac24846f1dd84c90e65b86b +Subproject commit 1413844185b244559b8b90a06e03ddcea33fb2b5 diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h index 1862dfe7eb..dddea2fb66 100644 --- a/modules/globebrowsing/src/shadowcomponent.h +++ b/modules/globebrowsing/src/shadowcomponent.h @@ -123,14 +123,6 @@ private: GLboolean _depthIsEnabled; GLboolean _blendIsEnabled = false; - GLenum _faceToCull; - GLenum _depthFunction; - - GLfloat _polygonOffSetFactor; - GLfloat _polygonOffSetUnits; - GLfloat _colorClearValue[4]; - GLfloat _depthClearValue; - glm::vec3 _sunPosition = glm::vec3(0.f); glm::dmat4 _shadowMatrix = glm::dmat4(1.0); diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp index 64d0f887d7..f808be2147 100644 --- a/modules/space/rendering/renderablesatellites.cpp +++ b/modules/space/rendering/renderablesatellites.cpp @@ -90,13 +90,13 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary) _updateStartRenderIdxSelect = [this]() { if ((_numObjects - _startRenderIdx) < _sizeRender) { - _sizeRender = _numObjects - _startRenderIdx; + _sizeRender = static_cast(_numObjects - _startRenderIdx); } updateBuffers(); }; _updateRenderSizeSelect = [this]() { if (_sizeRender > (_numObjects - _startRenderIdx)) { - _startRenderIdx = _numObjects - _sizeRender; + _startRenderIdx = static_cast(_numObjects - _sizeRender); } updateBuffers(); }; diff --git a/modules/space/rendering/renderablesmallbody.cpp b/modules/space/rendering/renderablesmallbody.cpp index 0a0259eb98..72414c3453 100644 --- a/modules/space/rendering/renderablesmallbody.cpp +++ b/modules/space/rendering/renderablesmallbody.cpp @@ -113,8 +113,8 @@ documentation::Documentation RenderableSmallBody::Documentation() { RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary) : RenderableOrbitalKepler(dictionary) - , _upperLimit(UpperLimitInfo, 1000, 1, 1000000) , _contiguousMode(ContiguousModeInfo, false) + , _upperLimit(UpperLimitInfo, 1000, 1, 1000000) { codegen::bake(dictionary); @@ -142,7 +142,7 @@ RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary) _updateStartRenderIdxSelect = std::function([this] { if (_contiguousMode) { if ((_numObjects - _startRenderIdx) < _sizeRender) { - _sizeRender = _numObjects - _startRenderIdx; + _sizeRender = static_cast(_numObjects - _startRenderIdx); } _updateDataBuffersAtNextRender = true; } @@ -150,7 +150,7 @@ RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary) _updateRenderSizeSelect = std::function([this] { if (_contiguousMode) { if (_sizeRender > (_numObjects - _startRenderIdx)) { - _startRenderIdx = _numObjects - _sizeRender; + _startRenderIdx = static_cast(_numObjects - _sizeRender); } _updateDataBuffersAtNextRender = true; } @@ -221,7 +221,7 @@ void RenderableSmallBody::readDataFile(const std::string& filename) { else { lineSkipFraction = static_cast(_upperLimit) / static_cast(_numObjects); - endElement = _numObjects - 1; + endElement = static_cast(_numObjects - 1); } if (line.compare(expectedHeaderLine) != 0) { diff --git a/modules/space/rendering/renderablesmallbody.h b/modules/space/rendering/renderablesmallbody.h index 1be028b539..b55c114d65 100644 --- a/modules/space/rendering/renderablesmallbody.h +++ b/modules/space/rendering/renderablesmallbody.h @@ -59,7 +59,6 @@ private: /// The index array that is potentially used in the draw call. If this is empty, no /// element draw call is used. std::vector _indexBufferData; - bool contiguousMode = true; properties::BoolProperty _contiguousMode; properties::UIntProperty _upperLimit; properties::Property::OnChangeHandle _contiguousModeCallbackhandle; diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index 17d576693e..1ce1c04748 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -771,8 +771,8 @@ void RenderableStars::loadPSFTexture() { void RenderableStars::renderPSFToTexture() { // Saves current FBO first - GLint defaultFBO; - defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer(); + // GLint defaultFBO; + // defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer(); // GLint m_viewport[4]; // global::renderEngine.openglStateCache().viewPort(m_viewport); diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp index 5f2d224c3b..be21ff31a0 100644 --- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp @@ -45,12 +45,6 @@ namespace { constexpr const char* _loggerCat = "RenderablePlaneProjection"; - constexpr const char* KeySpacecraft = "Spacecraft"; - constexpr const char* KeyInstrument = "Instrument"; - constexpr const char* KeyMoving = "Moving"; - constexpr const char* KeyTexture = "Texture"; - constexpr const char* KeyName = "Name"; - constexpr const char* KeyTarget = "DefaultTarget"; constexpr const char* GalacticFrame = "GALACTIC"; struct [[codegen::Dictionary(RenderablePlaneProjection)]] Parameters { diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp index 0f6bc61aa9..b1c75a80a6 100644 --- a/modules/sync/syncs/urlsynchronization.cpp +++ b/modules/sync/syncs/urlsynchronization.cpp @@ -41,12 +41,6 @@ #include namespace { - constexpr const char* KeyUrl = "Url"; - constexpr const char* KeyIdentifier = "Identifier"; - constexpr const char* KeyOverride = "Override"; - constexpr const char* KeyUseHash = "UseHash"; - constexpr const char* KeyFilename = "Filename"; - constexpr const char* TempSuffix = ".tmp"; struct [[codegen::Dictionary(UrlSynchronization)]] Parameters { @@ -130,7 +124,7 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict, documentation::TestResult res; res.success = false; documentation::TestResult::Offense o; - o.offender = std::string(KeyIdentifier) + "|" + KeyUseHash; + o.offender = "Identifier|UseHash"; o.reason = documentation::TestResult::Offense::Reason::MissingKey; res.offenses.push_back(o); throw documentation::SpecificationError(std::move(res), "UrlSynchronization"); diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp index e0774bec63..53372f91f8 100644 --- a/modules/volume/tasks/generaterawvolumetask.cpp +++ b/modules/volume/tasks/generaterawvolumetask.cpp @@ -41,14 +41,6 @@ #include namespace { - constexpr const char* KeyRawVolumeOutput = "RawVolumeOutput"; - constexpr const char* KeyDictionaryOutput = "DictionaryOutput"; - constexpr const char* KeyDimensions = "Dimensions"; - constexpr const char* KeyTime = "Time"; - constexpr const char* KeyValueFunction = "ValueFunction"; - constexpr const char* KeyLowerDomainBound = "LowerDomainBound"; - constexpr const char* KeyUpperDomainBound = "UpperDomainBound"; - struct [[codegen::Dictionary(GenerateRawVolumeTask)]] Parameters { // The Lua function used to compute the cell values std::string valueFunction [[codegen::annotation("A Lua expression that returns a " diff --git a/support/coding/codegen b/support/coding/codegen index 1aac589ded..d1e354f072 160000 --- a/support/coding/codegen +++ b/support/coding/codegen @@ -1 +1 @@ -Subproject commit 1aac589ded45ff416cc7f8673fcfd37095819bc2 +Subproject commit d1e354f07257d37b241d7c8d3a85eef3d0cb62bd