From 9491f73803e0e889ba7ba1018209dc33b9f87ee2 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 10 Feb 2020 01:18:27 +0100 Subject: [PATCH] More GLM initialization fixes --- apps/OpenSpace/main.cpp | 2 +- .../openspace/properties/numericalproperty.inl | 1 + .../rendering/atmospheredeferredcaster.h | 2 +- .../rendering/renderableatmosphere.cpp | 2 +- .../base/dashboard/dashboarditemdistance.cpp | 2 +- modules/base/rendering/renderableboxgrid.cpp | 16 ++++++++-------- modules/base/rendering/renderablenodeline.cpp | 2 +- modules/base/rendering/renderablenodeline.h | 4 ++-- .../rendering/renderabledebugplane.cpp | 2 +- .../rendering/renderablebillboardscloud.cpp | 2 +- .../rendering/renderabledumeshes.cpp | 2 +- .../rendering/renderableplanescloud.cpp | 2 +- .../rendering/renderablefieldlines.cpp | 2 +- modules/galaxy/rendering/galaxyraycaster.h | 2 +- modules/galaxy/rendering/renderablegalaxy.cpp | 12 ++++++------ modules/galaxy/rendering/renderablegalaxy.h | 2 +- modules/globebrowsing/src/ellipsoid.cpp | 2 +- modules/globebrowsing/src/renderableglobe.cpp | 14 +++++++------- modules/globebrowsing/src/ringscomponent.h | 2 +- modules/globebrowsing/src/shadowcomponent.h | 6 +++--- modules/imgui/src/gui.cpp | 2 +- modules/iswa/rendering/iswacygnet.cpp | 10 +++++----- modules/iswa/rendering/kameleonplane.h | 2 +- modules/iswa/util/iswamanager.cpp | 2 +- .../rendering/renderablemultiresvolume.cpp | 2 +- modules/space/rendering/renderablesatellites.h | 2 +- .../dashboard/dashboarditeminstruments.cpp | 4 ++-- .../rendering/renderableplaneprojection.cpp | 1 + modules/touch/include/directinputsolver.h | 6 +++--- modules/touch/src/touchinteraction.cpp | 18 +++++++++--------- .../rendering/renderabletoyvolume.cpp | 4 ++-- src/interaction/navigationhandler.cpp | 2 +- src/interaction/orbitalnavigator.cpp | 6 +++--- src/properties/matrix/mat2property.cpp | 8 ++++---- src/properties/matrix/mat2x3property.cpp | 8 ++++---- src/properties/matrix/mat2x4property.cpp | 8 ++++---- src/properties/matrix/mat3property.cpp | 8 ++++---- src/properties/matrix/mat3x2property.cpp | 4 ++-- src/properties/matrix/mat3x4property.cpp | 8 ++++---- src/properties/matrix/mat4property.cpp | 8 ++++---- src/properties/matrix/mat4x2property.cpp | 8 ++++---- src/properties/matrix/mat4x3property.cpp | 8 ++++---- src/properties/vector/bvec2property.cpp | 2 +- src/properties/vector/bvec3property.cpp | 2 +- src/properties/vector/bvec4property.cpp | 2 +- src/properties/vector/dvec2property.cpp | 2 +- src/properties/vector/dvec3property.cpp | 2 +- src/properties/vector/dvec4property.cpp | 2 +- src/properties/vector/ivec2property.cpp | 2 +- src/properties/vector/ivec3property.cpp | 2 +- src/properties/vector/ivec4property.cpp | 2 +- src/properties/vector/uvec2property.cpp | 2 +- src/properties/vector/uvec3property.cpp | 2 +- src/properties/vector/uvec4property.cpp | 2 +- src/properties/vector/vec2property.cpp | 2 +- src/properties/vector/vec3property.cpp | 2 +- src/properties/vector/vec4property.cpp | 2 +- src/util/blockplaneintersectiongeometry.cpp | 1 + src/util/spicemanager.cpp | 2 +- 59 files changed, 123 insertions(+), 120 deletions(-) diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index af1aee4d42..712bfa5b8e 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -989,7 +989,7 @@ void setSgctDelegateFunctions() { sgctDelegate.viewportPixelCoordinates = []() { sgct::SGCTWindow* window = sgct::Engine::instance()->getCurrentWindowPtr(); if (!window || !window->getCurrentViewport()) { - return glm::ivec4(0, 0, 0, 0); + return glm::ivec4(0); } else { const int* data = sgct::Engine::instance()->getCurrentViewportPixelCoords(); diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl index 186b493126..c8856169ac 100644 --- a/include/openspace/properties/numericalproperty.inl +++ b/include/openspace/properties/numericalproperty.inl @@ -23,6 +23,7 @@ ****************************************************************************************/ #include +#include namespace openspace::properties { diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h index 8bde5e9624..8ad24d6e5c 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.h +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h @@ -189,7 +189,7 @@ private: // Eclipse Shadows std::vector _shadowConfArray; - bool _hardShadowsEnabled = false + bool _hardShadowsEnabled = false; // Atmosphere Debugging float _calculationTextureScale = 1.f; diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp index 9d1332374d..b3c5addf07 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.cpp +++ b/modules/atmosphere/rendering/renderableatmosphere.cpp @@ -412,7 +412,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary) if (success) { // Not using right now. - glm::vec3 rayleighWavelengths; + glm::vec3 rayleighWavelengths = glm::vec3(0.f); rayleighDictionary.getValue( "Coefficients.Wavelengths", rayleighWavelengths diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp index 7cb68aac93..6e4465b88b 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -385,7 +385,7 @@ std::pair DashboardItemDistance::positionAndLabel( return { mainComp.node->worldPosition(), mainComp.node->guiName() }; case Type::NodeSurface: { - glm::dvec3 otherPos; + glm::dvec3 otherPos = glm::dvec3(0.0); if (otherComp.type == Type::NodeSurface) { // We are only interested in the direction, and we want to prevent // infinite recursion diff --git a/modules/base/rendering/renderableboxgrid.cpp b/modules/base/rendering/renderableboxgrid.cpp index 0ea998333f..2a2eeaf0fa 100644 --- a/modules/base/rendering/renderableboxgrid.cpp +++ b/modules/base/rendering/renderableboxgrid.cpp @@ -265,14 +265,14 @@ void RenderableBoxGrid::update(const UpdateData&) { // 0 -> 1 -> 2 -> 3 -> 0 -> 4 -> 5 -> 6 -> 7 -> 4 -> 5(d) -> 1 -> 2(d) -> 6 // -> 7(d) -> 3 - const glm::vec3 v0 = { llf.x, llf.y, llf.z }; - const glm::vec3 v1 = { urb.x, llf.y, llf.z }; - const glm::vec3 v2 = { urb.x, urb.y, llf.z }; - const glm::vec3 v3 = { llf.x, urb.y, llf.z }; - const glm::vec3 v4 = { llf.x, llf.y, urb.z }; - const glm::vec3 v5 = { urb.x, llf.y, urb.z }; - const glm::vec3 v6 = { urb.x, urb.y, urb.z }; - const glm::vec3 v7 = { llf.x, urb.y, urb.z }; + const glm::vec3 v0 = glm::vec3(llf.x, llf.y, llf.z); + const glm::vec3 v1 = glm::vec3(urb.x, llf.y, llf.z); + const glm::vec3 v2 = glm::vec3(urb.x, urb.y, llf.z); + const glm::vec3 v3 = glm::vec3(llf.x, urb.y, llf.z); + const glm::vec3 v4 = glm::vec3(llf.x, llf.y, urb.z); + const glm::vec3 v5 = glm::vec3(urb.x, llf.y, urb.z); + const glm::vec3 v6 = glm::vec3(urb.x, urb.y, urb.z); + const glm::vec3 v7 = glm::vec3(llf.x, urb.y, urb.z); // First add the bounds _varray.push_back({ v0.x, v0.y, v0.z }); diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp index 7725b8e4ab..6253fa07e7 100644 --- a/modules/base/rendering/renderablenodeline.cpp +++ b/modules/base/rendering/renderablenodeline.cpp @@ -123,7 +123,7 @@ documentation::Documentation RenderableNodeLine::Documentation() { RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary) : Renderable(dictionary) - , _lineColor(LineColorInfo, glm::vec3(1.f, 1.f, 1.f), glm::vec3(0.f), glm::vec3(1.f)) + , _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f)) , _lineWidth(LineWidthInfo, 2.f, 1.f, 20.f) , _start(StartNodeInfo, Root) , _end(EndNodeInfo, Root) diff --git a/modules/base/rendering/renderablenodeline.h b/modules/base/rendering/renderablenodeline.h index 5c7f4f6a88..15489765e9 100644 --- a/modules/base/rendering/renderablenodeline.h +++ b/modules/base/rendering/renderablenodeline.h @@ -76,8 +76,8 @@ private: GLuint _vBufferId = 0; std::vector _vertexArray; - glm::dvec3 _startPos; - glm::dvec3 _endPos; + glm::dvec3 _startPos = glm::dvec3(0.0); + glm::dvec3 _endPos = glm::dvec3(0.0); properties::StringProperty _start; properties::StringProperty _end; diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp index 1ba47a690c..71081d53a9 100644 --- a/modules/debugging/rendering/renderabledebugplane.cpp +++ b/modules/debugging/rendering/renderabledebugplane.cpp @@ -208,7 +208,7 @@ void RenderableDebugPlane::deinitializeGL() { } void RenderableDebugPlane::render(const RenderData& data, RendererTasks&) { - glm::mat4 transform = glm::mat4(1.0); + glm::mat4 transform = glm::mat4(1.f); if (_billboard) { transform = glm::inverse(glm::mat4(data.camera.viewRotationMatrix())); } diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 86324f09c9..9be7e66ba5 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -1474,7 +1474,7 @@ bool RenderableBillboardsCloud::readLabelFile() { std::stringstream str(line); - glm::vec3 position; + glm::vec3 position = glm::vec3(0.f); for (int j = 0; j < 3; ++j) { str >> position[j]; } diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index 2c1780348c..06f1aa47f2 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -861,7 +861,7 @@ bool RenderableDUMeshes::readLabelFile() { std::stringstream str(line); - glm::vec3 position; + glm::vec3 position = glm::vec3(0.f); for (int j = 0; j < 3; ++j) { str >> position[j]; } diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index a86eac1e72..04d2d957a1 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -1118,7 +1118,7 @@ bool RenderablePlanesCloud::readLabelFile() { std::stringstream str(line); - glm::vec3 position; + glm::vec3 position = glm::vec3(0.f); for (int j = 0; j < 3; ++j) { str >> position[j]; } diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp index c260e99dec..b8ece9fed3 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.cpp +++ b/modules/fieldlines/rendering/renderablefieldlines.cpp @@ -372,7 +372,7 @@ void RenderableFieldlines::loadSeedPointsFromTable() { ghoul::Dictionary seedpointsDictionary; _seedPointsInfo.getValue(KeySeedPointsTable, seedpointsDictionary); for (const std::string& index : seedpointsDictionary.keys()) { - glm::vec3 seedPos; + glm::vec3 seedPos = glm::vec3(0.f); _fieldlineInfo.getValue(std::string(KeySeedPointsTable) + "." + index, seedPos); _seedPoints.push_back(seedPos); } diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h index 8009b51940..68b5648baa 100644 --- a/modules/galaxy/rendering/galaxyraycaster.h +++ b/modules/galaxy/rendering/galaxyraycaster.h @@ -78,7 +78,7 @@ private: glm::dmat4 modelViewTransform(const RenderData& data); BoxGeometry _boundingBox; - float _stepSize = 0.f + float _stepSize = 0.f; glm::mat4 _modelTransform = glm::mat4(1.f); glm::vec3 _aspect = glm::vec3(0.f); double _time = 0.0; diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index e98a358a66..fe699d9d97 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -265,14 +265,14 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary) else { LERROR("No volume filename specified."); } - glm::vec3 volumeDimensions; + glm::vec3 volumeDimensions = glm::vec3(0.f); if (volumeDictionary.getValue("Dimensions", volumeDimensions)) { _volumeDimensions = static_cast(volumeDimensions); } else { LERROR("No volume dimensions specified."); } - glm::vec3 volumeSize; + glm::vec3 volumeSize = glm::vec3(0.f); if (volumeDictionary.getValue("Size", volumeSize)) { _volumeSize = volumeSize; } @@ -539,12 +539,12 @@ void RenderableGalaxy::update(const UpdateData& data) { //glm::mat4 transform = glm::translate(, static_cast(_translation)); const glm::vec3 eulerRotation = static_cast(_rotation); glm::mat4 transform = glm::rotate( - glm::mat4(1.0), + glm::mat4(1.f), eulerRotation.x, - glm::vec3(1, 0, 0) + glm::vec3(1.f, 0.f, 0.f) ); - transform = glm::rotate(transform, eulerRotation.y, glm::vec3(0, 1, 0)); - transform = glm::rotate(transform, eulerRotation.z, glm::vec3(0, 0, 1)); + transform = glm::rotate(transform, eulerRotation.y, glm::vec3(0.f, 1.f, 0.f)); + transform = glm::rotate(transform, eulerRotation.z, glm::vec3(0.f, 0.f, 1.f)); glm::mat4 volumeTransform = glm::scale(transform, _volumeSize); _pointTransform = transform; diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h index 2427a12b8d..e627b30877 100644 --- a/modules/galaxy/rendering/renderablegalaxy.h +++ b/modules/galaxy/rendering/renderablegalaxy.h @@ -93,7 +93,7 @@ private: std::unique_ptr _texture; glm::mat4 _pointTransform = glm::mat4(1.f); glm::vec3 _aspect = glm::vec3(0.f); - float _opacityCoefficient = 0.f + float _opacityCoefficient = 0.f; std::unique_ptr _pointsProgram; std::unique_ptr _billboardsProgram; diff --git a/modules/globebrowsing/src/ellipsoid.cpp b/modules/globebrowsing/src/ellipsoid.cpp index 7cb68b4c05..ea8988333b 100644 --- a/modules/globebrowsing/src/ellipsoid.cpp +++ b/modules/globebrowsing/src/ellipsoid.cpp @@ -62,7 +62,7 @@ glm::dvec3 Ellipsoid::geodeticSurfaceProjection(const glm::dvec3& p) const { double alpha = (1.0 - beta) * (glm::length(p) / n); const glm::dvec3 p2 = p * p; - glm::dvec3 d; + glm::dvec3 d = glm::dvec3(0.0); double s = 0.0; double dSdA = 1.0; diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index 988f6f0caa..9fa87460e5 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -64,13 +64,13 @@ namespace { // Shadow structure struct ShadowRenderingStruct { - double xu; - double xp; - double rs; - double rc; - glm::dvec3 sourceCasterVec; - glm::dvec3 casterPositionVec; - bool isShadowing; + double xu = 0.0; + double xp = 0.0; + double rs = 0.0; + double rc = 0.0; + glm::dvec3 sourceCasterVec = glm::dvec3(0.0); + glm::dvec3 casterPositionVec = glm::dvec3(0.0); + bool isShadowing = false; }; constexpr const char* KeyRadii = "Radii"; diff --git a/modules/globebrowsing/src/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h index b42313e692..88193318e6 100644 --- a/modules/globebrowsing/src/ringscomponent.h +++ b/modules/globebrowsing/src/ringscomponent.h @@ -104,7 +104,7 @@ private: GLuint _vertexPositionBuffer = 0; bool _planeIsDirty = false; - glm::vec3 _sunPosition; + glm::vec3 _sunPosition = glm::vec3(0.f); }; } // namespace openspace diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h index 6be4766419..b35774102f 100644 --- a/modules/globebrowsing/src/shadowcomponent.h +++ b/modules/globebrowsing/src/shadowcomponent.h @@ -130,13 +130,13 @@ private: GLfloat _colorClearValue[4]; GLfloat _depthClearValue; - glm::vec3 _sunPosition; + glm::vec3 _sunPosition = glm::vec3(0.f); glm::dmat4 _shadowMatrix = glm::dmat4(1.0); glm::dvec3 _cameraPos = glm::dvec3(0.0); - glm::dvec3 _cameraFocus; - glm::dquat _cameraRotation; + glm::dvec3 _cameraFocus = glm::dvec3(0.0); + glm::dquat _cameraRotation = glm::dquat(1.0, 0.0, 0.0, 0.0); std::stringstream _serializedCamera; diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp index 0767a812a4..6e0747fe6b 100644 --- a/modules/imgui/src/gui.cpp +++ b/modules/imgui/src/gui.cpp @@ -338,7 +338,7 @@ void GUI::initializeGL() { { unsigned char* texData; - glm::ivec2 texSize; + glm::ivec2 texSize = glm::ivec2(0); for (int i = 0; i < nWindows; ++i) { //_contexts[i] = ImGui::CreateContext(); ImGui::SetCurrentContext(_contexts[i]); diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp index 967613f9bf..b11bef1360 100644 --- a/modules/iswa/rendering/iswacygnet.cpp +++ b/modules/iswa/rendering/iswacygnet.cpp @@ -70,15 +70,15 @@ IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary) dictionary.getValue("Id", renderableId); float updateTime; dictionary.getValue("UpdateTime", updateTime); - glm::vec4 spatialScale; + glm::vec4 spatialScale = glm::vec4(0.f); dictionary.getValue("SpatialScale", spatialScale); - glm::vec3 min; + glm::vec3 min = glm::vec3(0.f); dictionary.getValue("GridMin", min); - glm::vec3 max; + glm::vec3 max = glm::vec3(0.f); dictionary.getValue("GridMax", max); dictionary.getValue("Frame",_data.frame); dictionary.getValue("CoordinateType", _data.coordinateType); - float xOffset; + float xOffset = 0.f; dictionary.getValue("XOffset", xOffset); dictionary.getValue("Group", _data.groupName); @@ -148,7 +148,7 @@ void IswaCygnet::render(const RenderData& data, RendererTasks&) { return; } - glm::mat4 transform = glm::mat4(1.0); + glm::mat4 transform = glm::mat4(1.f); for (int i = 0; i < 3; i++){ for (int j = 0; j < 3; j++){ transform[i][j] = static_cast(_stateMatrix[i][j]); diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h index 0a0f07de67..3289c570d0 100644 --- a/modules/iswa/rendering/kameleonplane.h +++ b/modules/iswa/rendering/kameleonplane.h @@ -89,7 +89,7 @@ private: std::string _var; float _scale = 0.f; - glm::vec3 _origOffset; + glm::vec3 _origOffset = glm::vec3(0.f); /** * _fieldlineState maps the checkbox value of each fieldline seedpoint file to a tuple diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index 0970946784..88d27f4235 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -416,7 +416,7 @@ std::string IswaManager::parseKWToLuaTable(const CdfInfo& info, const std::strin std::array gridUnits = kw.gridUnits(); - glm::vec4 spatialScale; + glm::vec4 spatialScale = glm::vec4(0.f); std::string coordinateType; if (gridUnits[0] == "R" && gridUnits[1] == "R" && gridUnits[2] == "R") { spatialScale.x = 6.371f; diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp index 9c96a84db9..80920a22ce 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp @@ -719,7 +719,7 @@ void RenderableMultiresVolume::update(const UpdateData& data) { if (_raycaster) { glm::mat4 transform = glm::translate( - glm::mat4(1.0), + glm::mat4(1.f), static_cast(_translation) * std::pow(10.f, static_cast(_scalingExponent)) ); diff --git a/modules/space/rendering/renderablesatellites.h b/modules/space/rendering/renderablesatellites.h index 0b7ec2467e..1c3a4a6448 100644 --- a/modules/space/rendering/renderablesatellites.h +++ b/modules/space/rendering/renderablesatellites.h @@ -88,7 +88,7 @@ private: float z = 0.f; float time = 0.f; double epoch = 0.0; - dobule period = 0.0; + double period = 0.0; }; KeplerTranslation _keplerTranslator; diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp index 034a152c16..d2fa7ac103 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp @@ -310,12 +310,12 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) { } glm::vec2 DashboardItemInstruments::size() const { - glm::vec2 size = { 0.f, 0.f }; + glm::vec2 size = glm::vec2(0.f); //return ghoul::fontrendering::FontRenderer::defaultRenderer().boundingBox( double currentTime = global::timeManager.time().j2000Seconds(); if (!ImageSequencer::ref().isReady()) { - return { 0.f, 0.f }; + return glm::vec2(0.f); } ImageSequencer& sequencer = ImageSequencer::ref(); diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp index 94e9d0b223..0797d0730c 100644 --- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp @@ -230,6 +230,7 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime // The apparent position, CN+S, makes image align best with target glm::dvec3 projection[4]; + std::fill(std::begin(projection), std::end(projection), glm::dvec3(0.0)); for (size_t j = 0; j < bounds.size(); ++j) { bounds[j] = SpiceManager::ref().frameTransformationMatrix( frame, diff --git a/modules/touch/include/directinputsolver.h b/modules/touch/include/directinputsolver.h index bc866ba2dd..7e6805ae28 100644 --- a/modules/touch/include/directinputsolver.h +++ b/modules/touch/include/directinputsolver.h @@ -44,9 +44,9 @@ public: // Stores the selected node, the cursor ID as well as the surface coordinates the // cursor touched struct SelectedBody { - size_t id; - SceneGraphNode* node; - glm::dvec3 coordinates; + size_t id = 0; + SceneGraphNode* node = nullptr; + glm::dvec3 coordinates = glm::dvec3(0.0); }; DirectInputSolver(); diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 367fef5668..7c80116669 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -404,10 +404,10 @@ void TouchInteraction::updateStateFromInput(const std::vector& if (!isGuiMode(pos, numFingers)) { bool isTransitionBetweenModes = (_wasPrevModeDirectTouch != _directTouchMode); if (isTransitionBetweenModes) { - _vel.orbit = glm::dvec2(0.0, 0.0); + _vel.orbit = glm::dvec2(0.0); _vel.zoom = 0.0; _vel.roll = 0.0; - _vel.pan = glm::dvec2(0.0, 0.0); + _vel.pan = glm::dvec2(0.0); resetAfterInput(); } @@ -468,10 +468,10 @@ bool TouchInteraction::isGuiMode(glm::dvec2 screenPosition, size_t numFingers) { void TouchInteraction::directControl(const std::vector& list) { // Reset old velocities upon new interaction - _vel.orbit = glm::dvec2(0.0, 0.0); + _vel.orbit = glm::dvec2(0.0); _vel.zoom = 0.0; _vel.roll = 0.0; - _vel.pan = glm::dvec2(0.0, 0.0); + _vel.pan = glm::dvec2(0.0); #ifdef TOUCH_DEBUG_PROPERTIES LINFO("DirectControl"); #endif @@ -498,17 +498,17 @@ void TouchInteraction::directControl(const std::vector& list) // Reset velocities after setting new camera state _lastVel = _vel; - _vel.orbit = glm::dvec2(0.0, 0.0); + _vel.orbit = glm::dvec2(0.0); _vel.zoom = 0.0; _vel.roll = 0.0; - _vel.pan = glm::dvec2(0.0, 0.0); + _vel.pan = glm::dvec2(0.0); } else { // prevents touch to infinitely be active (due to windows bridge case where event // doesnt get consumed sometimes when LMA fails to converge) Touch touch; touch.active = true; - touch.pos = glm::dvec2(0.0, 0.0); + touch.pos = glm::dvec2(0.0); touch.action = 1; global::moduleEngine.module()->touchInput = touch; resetAfterInput(); @@ -1224,10 +1224,10 @@ void TouchInteraction::resetAfterInput() { _guiON = module.gui.isEnabled(); // Reset variables - _lastVel.orbit = glm::dvec2(0.0, 0.0); + _lastVel.orbit = glm::dvec2(0.0); _lastVel.zoom = 0.0; _lastVel.roll = 0.0; - _lastVel.pan = glm::dvec2(0.0, 0.0); + _lastVel.pan = glm::dvec2(0.0); _selected.clear(); _pickingSelected = nullptr; } diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp index 17db725798..dd2b9f36e0 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.cpp +++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp @@ -180,9 +180,9 @@ bool RenderableToyVolume::isReady() const { void RenderableToyVolume::update(const UpdateData& data) { if (_raycaster) { glm::mat4 transform = glm::translate( - glm::mat4(1.0), + glm::mat4(1.f), static_cast(_translation) * - std::pow(10.0f, static_cast(_scalingExponent)) + std::pow(10.f, static_cast(_scalingExponent)) ); glm::vec3 eulerRotation = static_cast(_rotation); transform = glm::rotate(transform, eulerRotation.x, glm::vec3(1.f, 0.f, 0.f)); diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp index e63b9b5a97..c3ac9fb6af 100644 --- a/src/interaction/navigationhandler.cpp +++ b/src/interaction/navigationhandler.cpp @@ -360,7 +360,7 @@ NavigationHandler::NavigationState NavigationHandler::navigationState( } const glm::dquat invNeutralRotation = glm::quat_cast(glm::lookAt( - glm::dvec3(0.0, 0.0, 0.0), + glm::dvec3(0.0), aim->worldPosition() - _camera->positionVec3(), glm::normalize(_camera->lookUpVectorWorldSpace()) )); diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp index bafc2dbe1e..76cb511ed1 100644 --- a/src/interaction/orbitalnavigator.cpp +++ b/src/interaction/orbitalnavigator.cpp @@ -834,7 +834,7 @@ OrbitalNavigator::CameraRotationDecomposition // To avoid problem with lookup in up direction we adjust is with the view direction const glm::dmat4 lookAtMat = glm::lookAt( - glm::dvec3(0.0, 0.0, 0.0), + glm::dvec3(0.0), -directionFromSurfaceToCamera, normalize(cameraViewDirection + cameraUp) ); @@ -858,7 +858,7 @@ OrbitalNavigator::CameraRotationDecomposition // To avoid problem with lookup in up direction we adjust is with the view direction const glm::dmat4 lookAtMat = glm::lookAt( - glm::dvec3(0.0, 0.0, 0.0), + glm::dvec3(0.0), reference - cameraPose.position, normalize(cameraViewDirection + cameraUp) ); @@ -1040,7 +1040,7 @@ glm::dquat OrbitalNavigator::interpolateLocalRotation(double deltaTime, localCameraRotation * Camera::UpDirectionCameraSpace; const glm::dmat4 lookAtMat = glm::lookAt( - glm::dvec3(0.0, 0.0, 0.0), + glm::dvec3(0.0), Camera::ViewDirectionCameraSpace, normalize(localUp) ); diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp index e06bdd9bd7..aa5bf4fb01 100644 --- a/src/properties/matrix/mat2property.cpp +++ b/src/properties/matrix/mat2property.cpp @@ -33,7 +33,7 @@ namespace { glm::mat2x2 fromLuaConversion(lua_State* state, bool& success) { - glm::mat2x2 result; + glm::mat2x2 result = glm::mat2x2(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -41,11 +41,11 @@ glm::mat2x2 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat2x2(0.f); + return glm::mat2x2(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat2x2(0.f); + return glm::mat2x2(1.f); } else { result[i][j] = static_cast( lua_tonumber(state, -1) @@ -124,7 +124,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat2Property, glm::mat2x2, - glm::mat2x2(0.f), + glm::mat2x2(1.f), glm::mat2x2( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest() diff --git a/src/properties/matrix/mat2x3property.cpp b/src/properties/matrix/mat2x3property.cpp index b1908cd658..08b271a5af 100644 --- a/src/properties/matrix/mat2x3property.cpp +++ b/src/properties/matrix/mat2x3property.cpp @@ -35,7 +35,7 @@ using std::numeric_limits; namespace { glm::mat2x3 fromLuaConversion(lua_State* state, bool& success) { - glm::mat2x3 result; + glm::mat2x3 result = glm::mat2x3(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -43,11 +43,11 @@ glm::mat2x3 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat2x3(0.f); + return glm::mat2x3(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat2x3(0.f); + return glm::mat2x3(1.f); } else { result[i][j] @@ -126,7 +126,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat2x3Property, glm::mat2x3, - glm::mat2x3(0.f), + glm::mat2x3(1.f), glm::mat2x3( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), diff --git a/src/properties/matrix/mat2x4property.cpp b/src/properties/matrix/mat2x4property.cpp index c3003ffc54..8766f049f8 100644 --- a/src/properties/matrix/mat2x4property.cpp +++ b/src/properties/matrix/mat2x4property.cpp @@ -33,7 +33,7 @@ namespace { glm::mat2x4 fromLuaConversion(lua_State* state, bool& success) { - glm::mat2x4 result; + glm::mat2x4 result = glm::mat2x4(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -41,11 +41,11 @@ glm::mat2x4 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat2x4(0.f); + return glm::mat2x4(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat2x4(0.f); + return glm::mat2x4(1.f); } else { result[i][j] @@ -124,7 +124,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat2x4Property, glm::mat2x4, - glm::mat2x4(0.f), + glm::mat2x4(1.f), glm::mat2x4( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp index 30105a0205..91a66224ba 100644 --- a/src/properties/matrix/mat3property.cpp +++ b/src/properties/matrix/mat3property.cpp @@ -33,7 +33,7 @@ namespace { glm::mat3x3 fromLuaConversion(lua_State* state, bool& success) { - glm::mat3x3 result; + glm::mat3x3 result = glm::mat3x3(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -41,11 +41,11 @@ glm::mat3x3 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat3x3(0.f); + return glm::mat3x3(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat3x3(0.f); + return glm::mat3x3(1.f); } else { result[i][j] = static_cast(lua_tonumber(state, -1)); @@ -123,7 +123,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat3Property, glm::mat3x3, - glm::mat3x3(0.f), + glm::mat3x3(1.f), glm::mat3x3( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), diff --git a/src/properties/matrix/mat3x2property.cpp b/src/properties/matrix/mat3x2property.cpp index 7ce73cf189..b1d6a7fd60 100644 --- a/src/properties/matrix/mat3x2property.cpp +++ b/src/properties/matrix/mat3x2property.cpp @@ -33,7 +33,7 @@ namespace { glm::mat3x2 fromLuaConversion(lua_State* state, bool& success) { - glm::mat3x2 result; + glm::mat3x2 result = glm::mat3x2(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -123,7 +123,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat3x2Property, glm::mat3x2, - glm::mat3x2(0.f), + glm::mat3x2(1.f), glm::mat3x2( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest() diff --git a/src/properties/matrix/mat3x4property.cpp b/src/properties/matrix/mat3x4property.cpp index c149e574fb..53181aeca7 100644 --- a/src/properties/matrix/mat3x4property.cpp +++ b/src/properties/matrix/mat3x4property.cpp @@ -33,7 +33,7 @@ namespace { glm::mat3x4 fromLuaConversion(lua_State* state, bool& success) { - glm::mat3x4 result; + glm::mat3x4 result = glm::mat3x4(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -41,11 +41,11 @@ glm::mat3x4 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat3x4(0.f); + return glm::mat3x4(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat3x4(0.f); + return glm::mat3x4(1.f); } else { result[i][j] = static_cast(lua_tonumber(state, -1)); @@ -123,7 +123,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat3x4Property, glm::mat3x4, - glm::mat3x4(0.f), + glm::mat3x4(1.f), glm::mat3x4( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp index 60c13fde3e..110c818884 100644 --- a/src/properties/matrix/mat4property.cpp +++ b/src/properties/matrix/mat4property.cpp @@ -35,7 +35,7 @@ using std::numeric_limits; namespace { glm::mat4x4 fromLuaConversion(lua_State* state, bool& success) { - glm::mat4x4 result; + glm::mat4x4 result = glm::mat4x4(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -43,11 +43,11 @@ glm::mat4x4 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat4x4(0.f); + return glm::mat4x4(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat4x4(0.f); + return glm::mat4x4(1.f); } else { result[i][j] = static_cast(lua_tonumber(state, -1)); @@ -125,7 +125,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat4Property, glm::mat4x4, - glm::mat4x4(0.f), + glm::mat4x4(1.f), glm::mat4x4( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), diff --git a/src/properties/matrix/mat4x2property.cpp b/src/properties/matrix/mat4x2property.cpp index 49ba41c108..25fd4a2180 100644 --- a/src/properties/matrix/mat4x2property.cpp +++ b/src/properties/matrix/mat4x2property.cpp @@ -33,7 +33,7 @@ namespace { glm::mat4x2 fromLuaConversion(lua_State* state, bool& success) { - glm::mat4x2 result; + glm::mat4x2 result = glm::mat4x2(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -41,11 +41,11 @@ glm::mat4x2 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat4x2(0.f); + return glm::mat4x2(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat4x2(0.f); + return glm::mat4x2(1.f); } else { result[i][j] = static_cast(lua_tonumber(state, -1)); @@ -123,7 +123,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat4x2Property, glm::mat4x2, - glm::mat4x2(0.f), + glm::mat4x2(1.f), glm::mat4x2( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest() diff --git a/src/properties/matrix/mat4x3property.cpp b/src/properties/matrix/mat4x3property.cpp index 10088ac828..9dd46929ee 100644 --- a/src/properties/matrix/mat4x3property.cpp +++ b/src/properties/matrix/mat4x3property.cpp @@ -33,7 +33,7 @@ namespace { glm::mat4x3 fromLuaConversion(lua_State* state, bool& success) { - glm::mat4x3 result; + glm::mat4x3 result = glm::mat4x3(1.f); lua_pushnil(state); int number = 1; for (glm::length_t i = 0; i < ghoul::glm_cols::value; ++i) { @@ -41,11 +41,11 @@ glm::mat4x3 fromLuaConversion(lua_State* state, bool& success) { int hasNext = lua_next(state, -2); if (hasNext != 1) { success = false; - return glm::mat4x3(0.f); + return glm::mat4x3(1.f); } if (lua_isnumber(state, -1) != 1) { success = false; - return glm::mat4x3(0.f); + return glm::mat4x3(1.f); } else { result[i][j] = static_cast(lua_tonumber(state, -1)); @@ -123,7 +123,7 @@ using nl = std::numeric_limits; REGISTER_NUMERICALPROPERTY_SOURCE( Mat4x3Property, glm::mat4x3, - glm::mat4x3(0.f), + glm::mat4x3(1.f), glm::mat4x3( nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(), diff --git a/src/properties/vector/bvec2property.cpp b/src/properties/vector/bvec2property.cpp index 050775eae2..ea2f4f9857 100644 --- a/src/properties/vector/bvec2property.cpp +++ b/src/properties/vector/bvec2property.cpp @@ -33,7 +33,7 @@ namespace { glm::bvec2 fromLuaConversion(lua_State* state, bool& success) { - glm::bvec2 result; + glm::bvec2 result = glm::bvec2(false); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/bvec3property.cpp b/src/properties/vector/bvec3property.cpp index 2a743084c0..fe8869bcee 100644 --- a/src/properties/vector/bvec3property.cpp +++ b/src/properties/vector/bvec3property.cpp @@ -33,7 +33,7 @@ namespace { glm::bvec3 fromLuaConversion(lua_State* state, bool& success) { - glm::bvec3 result; + glm::bvec3 result = glm::bvec3(false); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/bvec4property.cpp b/src/properties/vector/bvec4property.cpp index 628bf73b04..a5ab38610e 100644 --- a/src/properties/vector/bvec4property.cpp +++ b/src/properties/vector/bvec4property.cpp @@ -33,7 +33,7 @@ namespace { glm::bvec4 fromLuaConversion(lua_State* state, bool& success) { - glm::bvec4 result; + glm::bvec4 result = glm::bvec4(false); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp index b5dd01ddc1..f953c9bd87 100644 --- a/src/properties/vector/dvec2property.cpp +++ b/src/properties/vector/dvec2property.cpp @@ -33,7 +33,7 @@ namespace { glm::dvec2 fromLuaConversion(lua_State* state, bool& success) { - glm::dvec2 result; + glm::dvec2 result = glm::dvec2(0.0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp index 014f27539e..e763987a8a 100644 --- a/src/properties/vector/dvec3property.cpp +++ b/src/properties/vector/dvec3property.cpp @@ -33,7 +33,7 @@ namespace { glm::dvec3 fromLuaConversion(lua_State* state, bool& success) { - glm::dvec3 result; + glm::dvec3 result = glm::dvec3(0.0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp index 2b29ea7126..89be79d4d2 100644 --- a/src/properties/vector/dvec4property.cpp +++ b/src/properties/vector/dvec4property.cpp @@ -33,7 +33,7 @@ namespace { glm::dvec4 fromLuaConversion(lua_State* state, bool& success) { - glm::dvec4 result; + glm::dvec4 result = glm::dvec4(0.0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp index 823da7abb5..2ca86920da 100644 --- a/src/properties/vector/ivec2property.cpp +++ b/src/properties/vector/ivec2property.cpp @@ -33,7 +33,7 @@ namespace { glm::ivec2 fromLuaConversion(lua_State* state, bool& success) { - glm::ivec2 result; + glm::ivec2 result = glm::ivec2(0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/ivec3property.cpp b/src/properties/vector/ivec3property.cpp index d847ac8b2f..781ddda4d5 100644 --- a/src/properties/vector/ivec3property.cpp +++ b/src/properties/vector/ivec3property.cpp @@ -33,7 +33,7 @@ namespace { glm::ivec3 fromLuaConversion(lua_State* state, bool& success) { - glm::ivec3 result; + glm::ivec3 result = glm::ivec3(0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/ivec4property.cpp b/src/properties/vector/ivec4property.cpp index e7f6f8112f..2659fe676d 100644 --- a/src/properties/vector/ivec4property.cpp +++ b/src/properties/vector/ivec4property.cpp @@ -33,7 +33,7 @@ namespace { glm::ivec4 fromLuaConversion(lua_State* state, bool& success) { - glm::ivec4 result; + glm::ivec4 result = glm::ivec4(0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/uvec2property.cpp b/src/properties/vector/uvec2property.cpp index b1a0c72e28..d676cd9ceb 100644 --- a/src/properties/vector/uvec2property.cpp +++ b/src/properties/vector/uvec2property.cpp @@ -33,7 +33,7 @@ namespace { glm::uvec2 fromLuaConversion(lua_State* state, bool& success) { - glm::uvec2 result; + glm::uvec2 result = glm::uvec2(0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/uvec3property.cpp b/src/properties/vector/uvec3property.cpp index 74eb40bd42..5438483018 100644 --- a/src/properties/vector/uvec3property.cpp +++ b/src/properties/vector/uvec3property.cpp @@ -33,7 +33,7 @@ namespace { glm::uvec3 fromLuaConversion(lua_State* state, bool& success) { - glm::uvec3 result; + glm::uvec3 result = glm::uvec3(0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/uvec4property.cpp b/src/properties/vector/uvec4property.cpp index cc57d15cf9..9409b15e2b 100644 --- a/src/properties/vector/uvec4property.cpp +++ b/src/properties/vector/uvec4property.cpp @@ -33,7 +33,7 @@ namespace { glm::uvec4 fromLuaConversion(lua_State* state, bool& success) { - glm::uvec4 result; + glm::uvec4 result = glm::uvec4(0); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/vec2property.cpp b/src/properties/vector/vec2property.cpp index 83a5704e5b..ddc89a75cf 100644 --- a/src/properties/vector/vec2property.cpp +++ b/src/properties/vector/vec2property.cpp @@ -33,7 +33,7 @@ namespace { glm::vec2 fromLuaConversion(lua_State* state, bool& success) { - glm::vec2 result; + glm::vec2 result = glm::vec2(0.f); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/vec3property.cpp b/src/properties/vector/vec3property.cpp index 6cdaa5b6c7..a44f951f27 100644 --- a/src/properties/vector/vec3property.cpp +++ b/src/properties/vector/vec3property.cpp @@ -33,7 +33,7 @@ namespace { glm::vec3 fromLuaConversion(lua_State* state, bool& success) { - glm::vec3 result; + glm::vec3 result = glm::vec3(0.f); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/properties/vector/vec4property.cpp b/src/properties/vector/vec4property.cpp index 4e30704e53..7b89f11596 100644 --- a/src/properties/vector/vec4property.cpp +++ b/src/properties/vector/vec4property.cpp @@ -33,7 +33,7 @@ namespace { glm::vec4 fromLuaConversion(lua_State* state, bool& success) { - glm::vec4 result; + glm::vec4 result = glm::vec4(0.f); lua_pushnil(state); for (glm::length_t i = 0; i < ghoul::glm_components::value; ++i) { int hasNext = lua_next(state, -2); diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp index 8533c3241d..7bf47900d6 100644 --- a/src/util/blockplaneintersectiongeometry.cpp +++ b/src/util/blockplaneintersectiongeometry.cpp @@ -79,6 +79,7 @@ void BlockPlaneIntersectionGeometry::updateVertices() { const glm::vec3 halfSize = _size * 0.5f; glm::vec3 intersections[12]; + std::fill(std::begin(intersections), std::end(intersections), glm::vec3(0.f)); int nIntersections = 0; for (int i = 0; i < 12; i++) { diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp index 781e32fee5..017ef8c464 100644 --- a/src/util/spicemanager.cpp +++ b/src/util/spicemanager.cpp @@ -525,7 +525,7 @@ glm::dvec3 SpiceManager::targetPosition(const std::string& target, } } else if (targetHasCoverage && observerHasCoverage) { - glm::dvec3 position; + glm::dvec3 position = glm::dvec3(0.0); spkpos_c( target.c_str(), ephemerisTime,