diff --git a/ext/ghoul b/ext/ghoul index 528bc4e87d..c3c9b88e52 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 528bc4e87d6bc7a81ec62f5338e2b7d9fe706057 +Subproject commit c3c9b88e524228fb8613c310605cc2126ed9c5bd diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h index 473641efb3..f06b61f356 100644 --- a/include/openspace/engine/openspaceengine.h +++ b/include/openspace/engine/openspaceengine.h @@ -125,7 +125,7 @@ private: bool _hasScheduledAssetLoading = false; std::string _scheduledAssetPathToLoad; - glm::vec2 _mousePosition; + glm::vec2 _mousePosition = glm::vec2(0.f); //grabs json from each module to pass to the documentation engine. std::string _documentationJson; diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h index 608c5d47b4..dd8ce176a9 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.h +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h @@ -161,7 +161,7 @@ private: glm::vec3 _ozoneExtinctionCoeff = glm::vec3(0.f); glm::vec3 _mieScatteringCoeff = glm::vec3(0.f); glm::vec3 _mieExtinctionCoeff = glm::vec3(0.f); - glm::dvec3 _ellipsoidRadii = glm::vec3(0.f); + glm::dvec3 _ellipsoidRadii = glm::dvec3(0.0); // Atmosphere Textures Dimmensions glm::ivec2 _transmittanceTableSize = glm::ivec2(256, 64); diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp index 52485c23af..267042bb33 100644 --- a/modules/base/rendering/grids/renderablesphericalgrid.cpp +++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp @@ -230,11 +230,11 @@ void RenderableSphericalGrid::update(const UpdateData&) { normal = glm::normalize(normal); } - glm::vec4 tmp(x, y, z, 1); + glm::vec4 tmp(x, y, z, 1.f); glm::mat4 rot = glm::rotate( - glm::mat4(1), + glm::mat4(1.f), glm::half_pi(), - glm::vec3(1, 0, 0) + glm::vec3(1.f, 0.f, 0.f) ); tmp = glm::vec4(glm::dmat4(rot) * glm::dvec4(tmp)); diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index e4b5898bab..abe30c7099 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -80,7 +80,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution(); addProperty(_size); - _size.set(glm::vec4(0, 0, resolution.x,resolution.y)); + _size.set(glm::vec4(0.f, 0.f, resolution.x, resolution.y)); } ScreenSpaceFramebuffer::~ScreenSpaceFramebuffer() {} // NOLINT diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp index a861503af6..00e4e78826 100644 --- a/modules/galaxy/rendering/galaxyraycaster.cpp +++ b/modules/galaxy/rendering/galaxyraycaster.cpp @@ -44,7 +44,7 @@ namespace { namespace openspace { GalaxyRaycaster::GalaxyRaycaster(ghoul::opengl::Texture& texture) - : _boundingBox(glm::vec3(1.0)) + : _boundingBox(glm::vec3(1.f)) , _texture(texture) , _textureUnit(nullptr) {} @@ -133,7 +133,7 @@ bool GalaxyRaycaster::isCameraInside(const RenderData& data, glm::vec3& localPos glm::vec4 modelPos = glm::inverse(modelViewTransform(data)) * glm::vec4(0.f, 0.f, 0.f, 1.f); - localPosition = (glm::vec3(modelPos) + glm::vec3(0.5)); + localPosition = (glm::vec3(modelPos) + glm::vec3(0.5f)); return (localPosition.x > 0 && localPosition.x < 1 && localPosition.y > 0 && localPosition.y < 1 && diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp index 7dbb215593..5a8da230fd 100644 --- a/modules/globebrowsing/src/globelabelscomponent.cpp +++ b/modules/globebrowsing/src/globelabelscomponent.cpp @@ -202,17 +202,17 @@ documentation::Documentation GlobeLabelsComponent::Documentation() { GlobeLabelsComponent::GlobeLabelsComponent() : properties::PropertyOwner({ "Labels" }) , _enabled(EnabledInfo, false) - , _fontSize(FontSizeInfo, 30, 1, 300) + , _fontSize(FontSizeInfo, 30.f, 1.f, 300.f) , _minMaxSize(MinMaxSizeInfo, glm::ivec2(1, 1000), glm::ivec2(1), glm::ivec2(1000)) , _size(SizeInfo, 2.5, 0, 30) - , _heightOffset(HeightOffsetInfo, 100.0, 0.0, 10000.0) + , _heightOffset(HeightOffsetInfo, 100.f, 0.f, 10000.f) , _color(ColorInfo, glm::vec3(1.f, 1.f, 0.f), glm::vec3(0.f), glm::vec3(1.f)) , _opacity(OpacityInfo, 1.f, 0.f, 1.f) , _fadeDistances( FadeDistancesInfo, - glm::vec2(1e4, 1e6), + glm::vec2(1e4f, 1e6f), glm::vec2(1.f), - glm::vec2(1e8) + glm::vec2(1e8f) ) , _fadeInEnabled(FadeInEnabledInfo, false) , _fadeOutEnabled(FadeOutEnabledInfo, false) diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index e6176e1ac4..fdfef77894 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -82,7 +82,7 @@ namespace { const openspace::globebrowsing::AABB3 CullingFrustum{ glm::vec3(-1.f, -1.f, 0.f), - glm::vec3( 1.f, 1.f, 1e35) + glm::vec3( 1.f, 1.f, 1e35f) }; constexpr const float DefaultHeight = 0.f; @@ -464,7 +464,7 @@ std::array boundingCornersForChunk(const Chunk& chunk, cornerGeodetic.geodetic2.lat += latDiff; } - corners[i] = glm::dvec4(ellipsoid.cartesianPosition(cornerGeodetic), 1); + corners[i] = glm::dvec4(ellipsoid.cartesianPosition(cornerGeodetic), 1.0); } return corners; @@ -1357,7 +1357,7 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d const glm::dvec3 cornerModelSpace = _ellipsoid.cartesianSurfacePosition(corner); cornersModelSpace[i] = cornerModelSpace; const glm::dvec3 cornerCameraSpace = glm::dvec3( - modelViewTransform * glm::dvec4(cornerModelSpace, 1) + modelViewTransform * glm::dvec4(cornerModelSpace, 1.0) ); cornersCameraSpace[i] = cornerCameraSpace; } @@ -2311,11 +2311,11 @@ bool RenderableGlobe::isCullableByHorizon(const Chunk& chunk, // position needs to be transformed with the inverse model matrix const GeodeticPatch& patch = chunk.surfacePatch; const float maxHeight = heights.max; - const glm::dvec3 globePos = glm::dvec3(0, 0, 0); // In model space it is 0 + const glm::dvec3 globePos = glm::dvec3(0.0, 0.0, 0.0); // In model space it is 0 const double minimumGlobeRadius = _ellipsoid.minimumRadius(); const glm::dvec3 cameraPos = glm::dvec3( - _cachedInverseModelTransform * glm::dvec4(renderData.camera.positionVec3(), 1) + _cachedInverseModelTransform * glm::dvec4(renderData.camera.positionVec3(), 1.0) ); const glm::dvec3 globeToCamera = cameraPos; diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp index c54bb66491..129fd9bf76 100644 --- a/modules/globebrowsing/src/ringscomponent.cpp +++ b/modules/globebrowsing/src/ringscomponent.cpp @@ -420,7 +420,7 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass, const glm::dmat4 inverseModelTransform = glm::inverse(modelTransform); glm::vec3 sunPositionObjectSpace = glm::normalize( - glm::vec3(inverseModelTransform * glm::vec4(_sunPosition, 0.0)) + glm::vec3(inverseModelTransform * glm::vec4(_sunPosition, 0.f)) ); _shader->setUniform( diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h index b39c832b2a..66f4cf6a40 100644 --- a/modules/globebrowsing/src/shadowcomponent.h +++ b/modules/globebrowsing/src/shadowcomponent.h @@ -54,8 +54,8 @@ namespace documentation { struct Documentation; } class ShadowComponent : public properties::PropertyOwner { public: struct ShadowMapData { - glm::dmat4 shadowMatrix; - GLuint shadowDepthTexture; + glm::dmat4 shadowMatrix = glm::dmat4(1.0); + GLuint shadowDepthTexture = 0; }; ShadowComponent(const ghoul::Dictionary& dictionary); diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp index 944e309d26..f01b3c2b3b 100644 --- a/modules/iswa/rendering/iswacygnet.cpp +++ b/modules/iswa/rendering/iswacygnet.cpp @@ -71,17 +71,17 @@ IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary) _data.id = static_cast(dictionary.value("Id")); _data.updateTime = static_cast(dictionary.value("UpdateTime")); - _data.spatialScale = glm::dvec4(0.f); + _data.spatialScale = glm::dvec4(0.0); if (dictionary.hasValue("SpatialScale")) { _data.spatialScale = dictionary.value("SpatialScale"); } - _data.gridMin = glm::dvec3(0.f); + _data.gridMin = glm::dvec3(0.0); if (dictionary.hasValue("GridMin")) { _data.gridMin = dictionary.value("GridMin"); } - _data.gridMax = glm::dvec3(0.f); + _data.gridMax = glm::dvec3(0.0); if (dictionary.hasValue("GridMax")) { _data.gridMax = dictionary.value("GridMax"); } @@ -94,7 +94,7 @@ IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary) } - double xOffset = 0.f; + double xOffset = 0.0; if (dictionary.hasValue("XOffset")) { xOffset = dictionary.value("XOffset"); } diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp index fef5801605..97d542348a 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp @@ -231,8 +231,8 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict return; } - //_pscOffset = psc(glm::vec4(0.0)); - //_boxScaling = glm::vec3(1.0); + //_pscOffset = psc(glm::vec4(0.f)); + //_boxScaling = glm::vec3(1.f); /*if (dictionary.hasKey(KeyBoxScaling)) { diff --git a/modules/space/speckloader.h b/modules/space/speckloader.h index a733b3f02c..ec2f9d63ad 100644 --- a/modules/space/speckloader.h +++ b/modules/space/speckloader.h @@ -53,7 +53,7 @@ struct Dataset { int orientationDataIndex = -1; struct Entry { - glm::vec3 position; + glm::vec3 position = glm::vec3(0.f); std::vector data; std::optional comment; }; @@ -67,7 +67,7 @@ struct Labelset { int textColorIndex = -1; struct Entry { - glm::vec3 position; + glm::vec3 position = glm::vec3(0.f); std::string text; }; std::vector entries; diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index cae7df51d4..03fff127c4 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -1202,7 +1202,7 @@ void TouchInteraction::resetToDefault() { _centroidStillThreshold.set(0.0018f); _interpretPan.set(0.015f); _slerpTime.set(3.0f); - _friction.set(glm::vec4(0.025, 0.025, 0.02, 0.02)); + _friction.set(glm::vec4(0.025f, 0.025f, 0.02f, 0.02f)); } void TouchInteraction::tap() { diff --git a/src/interaction/keyframenavigator.cpp b/src/interaction/keyframenavigator.cpp index d4441b912d..e3a59ebdef 100644 --- a/src/interaction/keyframenavigator.cpp +++ b/src/interaction/keyframenavigator.cpp @@ -142,7 +142,7 @@ bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose prevPose, // Linear interpolation t = std::max(0.0, std::min(1.0, t)); - glm::dvec3 nowCameraPosition = prevKeyframeCameraPosition * (1 - t) + + glm::dvec3 nowCameraPosition = prevKeyframeCameraPosition * (1.0 - t) + nextKeyframeCameraPosition * t; glm::dquat nowCameraRotation = glm::slerp( prevKeyframeCameraRotation, @@ -160,7 +160,7 @@ bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose prevPose, const float prevInvScaleExp = glm::log(1.f / prevPose.scale); const float nextInvScaleExp = glm::log(1.f / nextPose.scale); const float interpolatedInvScaleExp = static_cast( - prevInvScaleExp * (1 - t) + nextInvScaleExp * t + prevInvScaleExp * (1.0 - t) + nextInvScaleExp * t ); camera->setScaling(1.f / glm::exp(interpolatedInvScaleExp)); } diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp index a2c139ea67..2e54fce454 100644 --- a/src/interaction/orbitalnavigator.cpp +++ b/src/interaction/orbitalnavigator.cpp @@ -1423,7 +1423,7 @@ SurfacePositionHandle OrbitalNavigator::calculateSurfacePositionHandle( { const glm::dmat4 inverseModelTransform = glm::inverse(node.modelTransform()); const glm::dvec3 cameraPositionModelSpace = - glm::dvec3(inverseModelTransform * glm::dvec4(cameraPositionWorldSpace, 1)); + glm::dvec3(inverseModelTransform * glm::dvec4(cameraPositionWorldSpace, 1.0)); const SurfacePositionHandle posHandle = node.calculateSurfacePositionHandle(cameraPositionModelSpace); diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp index 6e5f93b1d9..a2a69b9eb1 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -612,7 +612,7 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target, ); } else { - return glm::dvec3(); + return glm::dvec3(0.0); } } else if (targetHasCoverage && observerHasCoverage) { @@ -1150,7 +1150,7 @@ glm::dvec3 SpiceManager::getEstimatedPosition(const std::string& target, throw SpiceException(fmt::format("No position for '{}' at any time", target)); } else { - return glm::dvec3(); + return glm::dvec3(0.0); } } diff --git a/support/coding/codegen b/support/coding/codegen index af8906ff56..49199f28e9 160000 --- a/support/coding/codegen +++ b/support/coding/codegen @@ -1 +1 @@ -Subproject commit af8906ff56c4b02d2f4a30c02d56477225dd10ce +Subproject commit 49199f28e90dbd94df45f4f0b736aceb11cf4f82