diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp index 072022c65a..c2573cc381 100644 --- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp +++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp @@ -63,7 +63,7 @@ namespace { int startIndex = 0; std::string token = "${USER_ASSETS}/"; if (path.find(token) == 0) { - startIndex = token.length(); + startIndex = static_cast(token.length()); } const size_t slash = path.find_first_of('/', startIndex); const bool endOfPath = (slash == std::string::npos); diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index 78a6d1d949..0a316f386d 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -46,12 +46,12 @@ local initializeAndAddNodes = function() } local parentNode = { - Identifier = "ISSparentNode", + Identifier = "ISSModel", Parent = iss.Identifier, Transform = { Rotation = { Type = "FixedRotation", - Attached = "ISSparentNode", + Attached = "ISSModel", XAxis = { 0.01, -1.0, 0.56 }, XAxisOrthogonal = true, YAxis = transforms.EarthInertial.Identifier @@ -73,9 +73,8 @@ local initializeAndAddNodes = function() DisableFaceCulling = true }, GUI = { - Name = "ISSparentNode", - Path = "/Solar System/Planets/Earth/Satellites/ISS", - Hidden = true, + Name = "ISS Model", + Path = "/Solar System/Planets/Earth/Satellites/ISS" } } diff --git a/ext/ghoul b/ext/ghoul index d8430b5ac9..eef92b2f8f 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit d8430b5ac92329716f78093e5e8ff9a5cc63652e +Subproject commit eef92b2f8f0982b9d6eaff38213d21aaf2dcdd90 diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h index b2dec16915..effe727cbe 100644 --- a/include/openspace/network/messagestructures.h +++ b/include/openspace/network/messagestructures.h @@ -53,9 +53,9 @@ struct CameraKeyframe { bool&& followNodeRot, float&& scale) : _position(pos) , _rotation(rot) + , _followNodeRotation(followNodeRot) , _focusNode(focusNode) , _scale(scale) - , _followNodeRotation(followNodeRot) {} glm::dvec3 _position = glm::dvec3(0.0); diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp index b2948125fe..b26103a2fd 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp @@ -114,7 +114,10 @@ namespace { return; } - std::vector px(size.x * size.y * 3, unsigned char(255)); + std::vector px( + size.x * size.y * 3, + static_cast(255) + ); if (colorBufferAttachment != GL_DEPTH_ATTACHMENT) { glReadBuffer(colorBufferAttachment); diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 48ee1f6dc8..56e7b12635 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -262,8 +262,8 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary) glm::dmat3(1.0) ) , _rotationVec(RotationVecInfo, glm::dvec3(0.0), glm::dvec3(0.0), glm::dvec3(360.0)) - , _enableOpacityBlending(EnableOpacityBlendingInfo, false) , _disableDepthTest(DisableDepthTestInfo, false) + , _enableOpacityBlending(EnableOpacityBlendingInfo, false) , _blendingFuncOption( BlendingOptionInfo, properties::OptionProperty::DisplayType::Dropdown diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h index d1d2cbc9fa..39b9d3200d 100644 --- a/modules/base/rendering/renderablemodel.h +++ b/modules/base/rendering/renderablemodel.h @@ -88,7 +88,6 @@ private: properties::BoolProperty _enableAnimation; properties::FloatProperty _ambientIntensity; - properties::FloatProperty _diffuseIntensity; properties::FloatProperty _specularIntensity; diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 41fd2f8e23..c9c54ee569 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -67,7 +67,6 @@ namespace { "hasColorMap", "enabledRectSizeControl", "hasDvarScaling" }; - constexpr int8_t CurrentCacheVersion = 1; constexpr double PARSEC = 0.308567756E17; constexpr const int RenderOptionViewDirection = 0; diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index 11a2c5ddd9..d62af2fc38 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -59,7 +59,6 @@ namespace { constexpr const int RenderOptionViewDirection = 0; constexpr const int RenderOptionPositionNormal = 1; - constexpr const int8_t CurrentCacheVersion = 1; constexpr const double PARSEC = 0.308567756E17; constexpr openspace::properties::Property::PropertyInfo TextColorInfo = { diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h index 020e76d0c1..f159488469 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.h +++ b/modules/digitaluniverse/rendering/renderabledumeshes.h @@ -139,7 +139,6 @@ private: std::vector _fullData; speck::Labelset _labelset; - int _nValuesPerAstronomicalObject = 0; std::unordered_map _meshColorMap; std::unordered_map _renderingMeshesMap; diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp index 7a09a11a7c..fe26da6e43 100644 --- a/modules/globebrowsing/src/globelabelscomponent.cpp +++ b/modules/globebrowsing/src/globelabelscomponent.cpp @@ -51,7 +51,6 @@ namespace { constexpr const char* _loggerCat = "GlobeLabels"; constexpr const double LabelFadeOutLimitAltitudeMeters = 25000.0; - constexpr const double RangeAngularCoefConst = 0.8; constexpr const float MinOpacityValueConst = 0.009f; enum LabelRenderingAlignmentType { diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp index d540d75906..33776b2041 100644 --- a/modules/space/rendering/renderablehabitablezone.cpp +++ b/modules/space/rendering/renderablehabitablezone.cpp @@ -40,7 +40,7 @@ #include namespace { - constexpr const char _loggerCat[] = "RenderableHabitableZone"; + constexpr const char* _loggerCat = "RenderableHabitableZone"; constexpr const std::array UniformNames = { "modelViewProjectionTransform", "opacity", "width", "transferFunctionTexture", diff --git a/modules/space/speckloader.cpp b/modules/space/speckloader.cpp index 1e35654b7f..996ba3ab73 100644 --- a/modules/space/speckloader.cpp +++ b/modules/space/speckloader.cpp @@ -421,7 +421,7 @@ std::optional loadCachedFile(std::filesystem::path path) { uint64_t nEntries; file.read(reinterpret_cast(&nEntries), sizeof(uint64_t)); result.entries.reserve(nEntries); - for (int i = 0; i < nEntries; i += 1) { + for (uint64_t i = 0; i < nEntries; i += 1) { Dataset::Entry e; file.read(reinterpret_cast(&e.position.x), sizeof(float)); file.read(reinterpret_cast(&e.position.y), sizeof(float)); @@ -797,7 +797,7 @@ ColorMap loadFile(std::filesystem::path path, SkipAllZeroLines) { } } - if (nColorLines != res.entries.size()) { + if (nColorLines != static_cast(res.entries.size())) { LWARNINGC("SpeckLoader", fmt::format( "While loading color map, the expected number of color values '{}' was " "different from the actual number of color values '{}'", diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp index 3894fbeb42..3c9c7bcb5c 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.cpp +++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp @@ -56,13 +56,6 @@ namespace { "corners of the field of view." }; - constexpr openspace::properties::Property::PropertyInfo DrawSolidInfo = { - "SolidDraw", - "Solid Draw", - "This value determines whether the field of view should be rendered as a solid " - "or as lines only." - }; - constexpr openspace::properties::Property::PropertyInfo StandoffDistanceInfo = { "StandOffDistance", "Standoff Distance Factor", diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h index 539198cd43..9e258310ca 100644 --- a/modules/spacecraftinstruments/util/imagesequencer.h +++ b/modules/spacecraftinstruments/util/imagesequencer.h @@ -175,12 +175,6 @@ private: */ std::vector _captureProgression; - // time between current simulation time and an upcoming capture - double _intervalLength = 0.0; - - // next consecutive capture in time - double _nextCapture = 0.0; - // default capture image std::string _defaultCaptureImage; diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp index ac37fd32ad..1289b1054f 100644 --- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp +++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp @@ -37,8 +37,6 @@ namespace { constexpr const char* _loggerCat = "InstrumentTimesParser"; - constexpr const char* KeyTargetBody = "Target"; - constexpr const char* KeyInstruments = "Instruments"; constexpr const char* KeyInstrument = "Instrument"; constexpr const char* KeyInstrumentFiles = "Files"; diff --git a/modules/sync/tasks/syncassettask.cpp b/modules/sync/tasks/syncassettask.cpp index 5c15a7d3e0..cfdfd11e43 100644 --- a/modules/sync/tasks/syncassettask.cpp +++ b/modules/sync/tasks/syncassettask.cpp @@ -44,7 +44,6 @@ #include namespace { - constexpr const char* KeyAsset = "Asset"; constexpr std::chrono::milliseconds ProgressPollInterval(200); struct [[codegen::Dictionary(SyncAssetTask)]] Parameters { diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp index 199b622775..88d24850e7 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -49,13 +49,9 @@ namespace { constexpr const char* _loggerCat = "RenderableTimeVaryingVolume"; -} // namespace - -namespace { const char* KeyStepSize = "StepSize"; const char* KeyGridType = "GridType"; - const char* KeyTransferFunction = "TransferFunction"; const float SecondsInOneDay = 60 * 60 * 24; constexpr const float VolumeMaxOpacity = 500; diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp index 6a7cd15a0f..fe61d423e6 100644 --- a/modules/webbrowser/src/defaultbrowserlauncher.cpp +++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp @@ -33,7 +33,7 @@ namespace openspace { bool DefaultBrowserLauncher::OnBeforePopup(CefRefPtr, CefRefPtr, - const CefString& targetUrl, const CefString&, + const CefString&, const CefString&, CefLifeSpanHandler::WindowOpenDisposition, bool, const CefPopupFeatures&, CefWindowInfo&, CefRefPtr&, CefBrowserSettings&, diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp index bb7020a158..edd45b9846 100644 --- a/modules/webgui/webguimodule.cpp +++ b/modules/webgui/webguimodule.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include namespace { diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp index 39cf1bcb97..cfa790b3d0 100644 --- a/src/rendering/helper.cpp +++ b/src/rendering/helper.cpp @@ -126,7 +126,6 @@ void main() { } // namespace -#pragma optimize ("", off) namespace openspace::rendering::helper { namespace detail {