From 5a94c486f05a95048c352e558c7efcb4aefdebe3 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 14 Apr 2020 22:32:26 +0200 Subject: [PATCH] Removing warnings --- ext/ghoul | 2 +- modules/base/rendering/renderablelabels.cpp | 17 ++++---- modules/base/rendering/renderablenodeline.cpp | 12 +++--- .../base/rendering/renderabletrailorbit.cpp | 2 +- .../rendering/renderabletrailtrajectory.cpp | 2 +- modules/galaxy/rendering/renderablegalaxy.cpp | 10 ++--- modules/globebrowsing/globebrowsingmodule.cpp | 3 +- .../globebrowsing/src/rawtiledatareader.cpp | 3 +- modules/globebrowsing/src/shadowcomponent.cpp | 4 +- modules/globebrowsing/src/timequantizer.cpp | 2 +- .../src/topics/flightcontrollertopic.cpp | 6 +-- .../rendering/renderableorbitalkepler.cpp | 16 ++++---- .../space/rendering/renderablesatellites.cpp | 6 +-- .../space/rendering/renderablesmallbody.cpp | 15 ++++--- modules/touch/src/touchinteraction.cpp | 6 +-- modules/touch/src/win32_touch.cpp | 2 +- modules/webbrowser/src/eventhandler.cpp | 2 +- src/interaction/scriptcamerastates.cpp | 5 +-- src/rendering/framebufferrenderer.cpp | 41 ++++++++++++++----- src/util/syncbuffer.cpp | 5 ++- 20 files changed, 93 insertions(+), 68 deletions(-) diff --git a/ext/ghoul b/ext/ghoul index 9e6f9abe90..df1522a1fe 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 9e6f9abe90b90157c52c6182b390a619062835b9 +Subproject commit df1522a1fe6f02b4d03cd36478d9d36f4384e93e diff --git a/modules/base/rendering/renderablelabels.cpp b/modules/base/rendering/renderablelabels.cpp index f83752a8c1..e44e49fb17 100644 --- a/modules/base/rendering/renderablelabels.cpp +++ b/modules/base/rendering/renderablelabels.cpp @@ -636,9 +636,8 @@ void RenderableLabels::render(const RenderData& data, RendererTasks&) { float fadeInVariable = 1.f; if (_enableFadingEffect) { - float distanceNodeToCamera = glm::distance( - data.camera.positionVec3(), - data.modelTransform.translation + float distanceNodeToCamera = static_cast( + glm::distance(data.camera.positionVec3(), data.modelTransform.translation) ); float sUnit = unit(_fadeStartUnitOption); float eUnit = unit(_fadeEndUnitOption); @@ -743,6 +742,7 @@ float RenderableLabels::changedPerlinSmoothStepFunc(float x, float startX, else if (x >= endX) { return std::clamp(f2, 0.f, 1.f); } + return x; } float RenderableLabels::linearSmoothStepFunc(float x, float startX, float endX, @@ -763,17 +763,18 @@ float RenderableLabels::linearSmoothStepFunc(float x, float startX, float endX, else if (x >= endX) { return std::clamp(f2, 0.f, 1.f); } + return x; } float RenderableLabels::unit(int unit) const { switch (static_cast(unit)) { case Meter: return 1.f; - case Kilometer: return 1e3; - case Megameter: return 1e6; - case Gigameter: return 1e9; + case Kilometer: return 1e3f; + case Megameter: return 1e6f; + case Gigameter: return 1e9f; case AU: return 149597870700.f; - case Terameter: return 1e12; - case Petameter: return 1e15; + case Terameter: return 1e12f; + case Petameter: return 1e15f; case Parsec: return static_cast(PARSEC); case Kiloparsec: return static_cast(1e3 * PARSEC); case Megaparsec: return static_cast(1e6 * PARSEC); diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp index fdf2acf398..7fc1f26068 100644 --- a/modules/base/rendering/renderablenodeline.cpp +++ b/modules/base/rendering/renderablenodeline.cpp @@ -240,13 +240,13 @@ void RenderableNodeLine::updateVertexData() { global::renderEngine.scene()->sceneGraphNode(_end)->worldPosition() ); - _vertexArray.push_back(_startPos.x); - _vertexArray.push_back(_startPos.y); - _vertexArray.push_back(_startPos.z); + _vertexArray.push_back(static_cast(_startPos.x)); + _vertexArray.push_back(static_cast(_startPos.y)); + _vertexArray.push_back(static_cast(_startPos.z)); - _vertexArray.push_back(_endPos.x); - _vertexArray.push_back(_endPos.y); - _vertexArray.push_back(_endPos.z); + _vertexArray.push_back(static_cast(_endPos.x)); + _vertexArray.push_back(static_cast(_endPos.y)); + _vertexArray.push_back(static_cast(_endPos.z)); _vertexArray; diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp index db57d56381..9d58c6dc72 100644 --- a/modules/base/rendering/renderabletrailorbit.cpp +++ b/modules/base/rendering/renderabletrailorbit.cpp @@ -373,7 +373,7 @@ void RenderableTrailOrbit::update(const UpdateData& data) { std::for_each(_vertexArray.begin(), _vertexArray.end(), setMax); - setBoundingSphere(glm::distance(maxVertex, minVertex) / 2.0); + setBoundingSphere(glm::distance(maxVertex, minVertex) / 2.f); } RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails( diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp index e8dae4adc8..966ffd51af 100644 --- a/modules/base/rendering/renderabletrailtrajectory.cpp +++ b/modules/base/rendering/renderabletrailtrajectory.cpp @@ -350,7 +350,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) { std::for_each(_vertexArray.begin(), _vertexArray.end(), setMax); - setBoundingSphere(glm::distance(maxVertex, minVertex) / 2.0); + setBoundingSphere(glm::distance(maxVertex, minVertex) / 2.f); } diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index c71403dc76..ba5a801649 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -463,9 +463,9 @@ void RenderableGalaxy::initializeGL() { } else { FileSys.cacheManager()->removeCacheFile(_pointsFilename); - Result res = loadPointFile(_pointsFilename); - pointPositions = std::move(res.positions); - pointColors = std::move(res.color); + Result resPoint = loadPointFile(_pointsFilename); + pointPositions = std::move(resPoint.positions); + pointColors = std::move(resPoint.color); saveCachedFile( cachedPointsFile, pointPositions, @@ -561,7 +561,7 @@ void RenderableGalaxy::update(const UpdateData& data) { _pointTransform[3] += translation; _raycaster->setDownscaleRender(_downScaleVolumeRendering); - _raycaster->setMaxSteps(_numberOfRayCastingSteps); + _raycaster->setMaxSteps(static_cast(_numberOfRayCastingSteps)); _raycaster->setStepSize(_stepSize); _raycaster->setAspect(_aspect); _raycaster->setModelTransform(volumeTransform); @@ -798,7 +798,7 @@ float RenderableGalaxy::safeLength(const glm::vec3& vector) const { return glm::length(vector / maxComponent) * maxComponent; } -RenderableGalaxy::Result RenderableGalaxy::loadPointFile(const std::string& file) { +RenderableGalaxy::Result RenderableGalaxy::loadPointFile(const std::string&) { std::vector pointPositions; std::vector pointColors; int64_t nPoints; diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index 4eb99dd7da..b7cea3cb2d 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -626,8 +626,7 @@ void GlobeBrowsingModule::goToGeodetic2(const globebrowsing::RenderableGlobe& gl } void GlobeBrowsingModule::goToGeodetic3(const globebrowsing::RenderableGlobe& globe, - globebrowsing::Geodetic3 geo3, - bool doResetCameraDirection) + globebrowsing::Geodetic3 geo3, bool) { using namespace globebrowsing; const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianPosition(geo3); diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp index 6cc980e36d..a602008e1a 100644 --- a/modules/globebrowsing/src/rawtiledatareader.cpp +++ b/modules/globebrowsing/src/rawtiledatareader.cpp @@ -394,7 +394,8 @@ PixelRegion highestResPixelRegion(const GeodeticPatch& geodeticPatch, return region; } -RawTile::ReadError postProcessErrorCheck(const RawTile& rawTile, size_t nRasters, +RawTile::ReadError postProcessErrorCheck(const RawTile& rawTile, + [[ maybe_unused ]] size_t nRasters, float noDataValue) { // This check was implicit before and just made explicit here diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp index 2ab97a86fc..0662c50566 100644 --- a/modules/globebrowsing/src/shadowcomponent.cpp +++ b/modules/globebrowsing/src/shadowcomponent.cpp @@ -199,8 +199,8 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary) if (_shadowMapDictionary.hasKey(DepthMapSizeInfo.identifier)) { glm::vec2 depthMapSize = _shadowMapDictionary.value(DepthMapSizeInfo.identifier); - _shadowDepthTextureWidth = depthMapSize.x; - _shadowDepthTextureHeight = depthMapSize.y; + _shadowDepthTextureWidth = static_cast(depthMapSize.x); + _shadowDepthTextureHeight = static_cast(depthMapSize.y); _dynamicDepthTextureRes = false; } else { diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp index 68de65ac1f..67f7288d62 100644 --- a/modules/globebrowsing/src/timequantizer.cpp +++ b/modules/globebrowsing/src/timequantizer.cpp @@ -540,7 +540,7 @@ void TimeQuantizer::doFirstApproximation(DateTime& quantized, DateTime& unQ, static_cast(_start.year()); minIncrementsAdjust = minYearsToAdjust / value; quantized.setYear( - _start.year() + static_cast(minIncrementsAdjust) * value + _start.year() + static_cast(minIncrementsAdjust * value) ); break; case 'M': diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp index 963a2b95bc..6d8dc96573 100644 --- a/modules/server/src/topics/flightcontrollertopic.cpp +++ b/modules/server/src/topics/flightcontrollertopic.cpp @@ -216,7 +216,7 @@ void FlightControllerTopic::handleJson(const nlohmann::json& json) { void FlightControllerTopic::connect() { _isDone = false; - std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0); + std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0.f); _payload[TypeKey] = Connect; setFocusNodes(); setInterestingTimes(); @@ -376,7 +376,7 @@ void FlightControllerTopic::engageAutopilot(const nlohmann::json &json) { setFriction(false); auto input = json[AutopilotInputKey][ValuesKey]; - std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0); + std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0.f); _inputState.isConnected = true; for (auto it = input.begin(); it != input.end(); ++it) { @@ -413,7 +413,7 @@ void FlightControllerTopic::handleAutopilot(const nlohmann::json &json) { } void FlightControllerTopic::processInputState(const nlohmann::json& json) { - std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0); + std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0.f); _inputState.isConnected = true; // Get "inputState" object from "payload" diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp index 9d45571345..06e3cebcb7 100644 --- a/modules/space/rendering/renderableorbitalkepler.cpp +++ b/modules/space/rendering/renderableorbitalkepler.cpp @@ -69,7 +69,7 @@ namespace { } }; - constexpr const LeapSecond Epoch = { 2000, 1 }; + constexpr const LeapSecond LeapEpoch = { 2000, 1 }; // List taken from: https://www.ietf.org/timezones/data/leap-seconds.list constexpr const std::array LeapSeconds = { @@ -194,7 +194,7 @@ namespace { const auto y2000 = std::lower_bound( LeapSeconds.begin(), LeapSeconds.end(), - Epoch + LeapEpoch ); // The distance between the two iterators gives us the number of leap years @@ -387,15 +387,15 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict) _upperLimit = dict.hasKeyAndValue(UpperLimitInfo.identifier) ? static_cast(dict.value(UpperLimitInfo.identifier)) : - 0.f; + 0u; _startRenderIdx = dict.hasKeyAndValue(StartRenderIdxInfo.identifier) ? static_cast(dict.value(StartRenderIdxInfo.identifier)) : - 0; + 0u; _sizeRender = dict.hasKeyAndValue(RenderSizeInfo.identifier) ? static_cast(dict.value(RenderSizeInfo.identifier)) : - 0; + 0u; _appearance.lineWidth = dict.hasKeyAndValue(LineWidthInfo.identifier) ? static_cast(dict.value(LineWidthInfo.identifier)) : @@ -500,8 +500,8 @@ void RenderableOrbitalKepler::render(const RenderData& data, RendererTasks&) { glBindVertexArray(_vertexArray); for (size_t i = 0; i < nrOrbits; ++i) { - glDrawArrays(GL_LINE_STRIP, vertices, _segmentSize[i] + 1); - vertices = vertices + _segmentSize[i] + 1; + glDrawArrays(GL_LINE_STRIP, vertices, static_cast(_segmentSize[i] + 1)); + vertices = vertices + static_cast(_segmentSize[i]) + 1; } glBindVertexArray(0); @@ -513,7 +513,7 @@ void RenderableOrbitalKepler::updateBuffers() { size_t nVerticesTotal = 0; - int numOrbits = _data.size(); + int numOrbits = static_cast(_data.size()); for (size_t i = 0; i < numOrbits; ++i) { nVerticesTotal += _segmentSize[i] + 1; } diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp index 420b93b5b6..f3c667a197 100644 --- a/modules/space/rendering/renderablesatellites.cpp +++ b/modules/space/rendering/renderablesatellites.cpp @@ -152,7 +152,7 @@ void RenderableSatellites::readDataFile(const std::string& filename) { std::string line = "-"; std::string name; - unsigned int endElement = _startRenderIdx + _sizeRender - 1; + long long endElement = _startRenderIdx + _sizeRender - 1; endElement = (endElement >= _numObjects) ? _numObjects - 1 : endElement; //Burn lines if not starting at first element for (unsigned int k = 0; k < _startRenderIdx; ++k) { @@ -265,8 +265,8 @@ void RenderableSatellites::readDataFile(const std::string& filename) { void RenderableSatellites::initializeFileReading() { _startRenderIdx.removeOnChange(_startRenderIdxCallbackHandle); _sizeRender.removeOnChange(_sizeRenderCallbackHandle); - _startRenderIdx.setMaxValue(_numObjects - 1); - _sizeRender.setMaxValue(_numObjects); + _startRenderIdx.setMaxValue(static_cast(_numObjects - 1)); + _sizeRender.setMaxValue(static_cast(_numObjects)); _startRenderIdx = static_cast(0); _sizeRender = static_cast(_numObjects); _startRenderIdxCallbackHandle = _startRenderIdx.onChange( diff --git a/modules/space/rendering/renderablesmallbody.cpp b/modules/space/rendering/renderablesmallbody.cpp index 8ba63ed855..39dd624e98 100644 --- a/modules/space/rendering/renderablesmallbody.cpp +++ b/modules/space/rendering/renderablesmallbody.cpp @@ -202,7 +202,10 @@ void RenderableSmallBody::readDataFile(const std::string& filename) { unsigned int sequentialLineErrors = 0; unsigned int endElement = _startRenderIdx + _sizeRender - 1; - endElement = (endElement >= _numObjects) ? _numObjects - 1 : endElement; + endElement = + (endElement >= _numObjects) ? + static_cast(_numObjects - 1) : + endElement; // Burn lines if not starting at first element for (unsigned int k = 0; k < _startRenderIdx; ++k) { skipSingleLineInFile(file); @@ -269,8 +272,8 @@ void RenderableSmallBody::readDataFile(const std::string& filename) { void RenderableSmallBody::initializeFileReading() { _startRenderIdx.removeOnChange(_startRenderIdxCallbackHandle); _sizeRender.removeOnChange(_sizeRenderCallbackHandle); - _startRenderIdx.setMaxValue(_numObjects - 1); - _sizeRender.setMaxValue(_numObjects); + _startRenderIdx.setMaxValue(static_cast(_numObjects - 1)); + _sizeRender.setMaxValue(static_cast(_numObjects)); _startRenderIdx = static_cast(0); _sizeRender = static_cast(_numObjects); _startRenderIdxCallbackHandle = _startRenderIdx.onChange(_updateStartRenderIdxSelect); @@ -278,7 +281,7 @@ void RenderableSmallBody::initializeFileReading() { // If a limit wasn't specified in dictionary, set it to # lines in file // minus the header line (but temporarily disable callback to avoid 2nd call) _upperLimit.removeOnChange(_upperLimitCallbackHandle); - _upperLimit.setMaxValue(_numObjects); + _upperLimit.setMaxValue(static_cast(_numObjects)); _upperLimit = static_cast(_numObjects); _upperLimitCallbackHandle = _upperLimit.onChange(_reinitializeTrailBuffers); } @@ -390,7 +393,9 @@ void RenderableSmallBody::readOrbitalParamsFromThisLine(bool firstDataLine, _data.push_back(keplerElements); _sbNames.push_back(name); const double scale = static_cast(_segmentQuality) * 10.0; - _segmentSize.push_back(scale + (scale / pow(1 - keplerElements.eccentricity, 1.2))); + _segmentSize.push_back( + static_cast(scale + (scale / pow(1 - keplerElements.eccentricity, 1.2))) + ); } static double importAngleValue(const std::string& angle) { diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 2c7ba9a106..c31ac046ea 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -1082,13 +1082,13 @@ void TouchInteraction::step(double dt, bool directTouch) { bool willNewPositionViolateZoomInLimit = (newPosDistance < zoomInBounds); bool willNewPositionViolateDirection = - (currentPosDistance <= length(zoomDistanceIncrement)); + (currentPosDistance <= length(zoomDistanceInc)); if (!willNewPositionViolateZoomInLimit && !willNewPositionViolateDirection && !willNewPositionViolateZoomOutLimit) { - camPos += zoomDistanceIncrement; + camPos += zoomDistanceInc; } else if (currentPosViolatingZoomOutLimit) { #ifdef TOUCH_DEBUG_PROPERTIES @@ -1098,7 +1098,7 @@ void TouchInteraction::step(double dt, bool directTouch) { #endif // Only allow zooming in if you are outside the zoom out limit if (newPosDistance < currentPosDistance) { - camPos += zoomDistanceIncrement; + camPos += zoomDistanceInc; } } else { diff --git a/modules/touch/src/win32_touch.cpp b/modules/touch/src/win32_touch.cpp index b10b50ca32..10f517ae69 100644 --- a/modules/touch/src/win32_touch.cpp +++ b/modules/touch/src/win32_touch.cpp @@ -297,7 +297,7 @@ LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam) { } LPMSLLHOOKSTRUCT msg = reinterpret_cast(lParam); // block injected events (in most cases generated by touches) - bool isFromTouch = (msg->dwExtraInfo || SIGNATURE_MASK) == MOUSEEVENTF_FROMTOUCH; + bool isFromTouch = (msg->dwExtraInfo | SIGNATURE_MASK) == MOUSEEVENTF_FROMTOUCH; if (msg->flags & LLMHF_INJECTED || isFromTouch) { return 1; } diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp index 6d9645b9a0..9607457a30 100644 --- a/modules/webbrowser/src/eventhandler.cpp +++ b/modules/webbrowser/src/eventhandler.cpp @@ -478,7 +478,7 @@ CefTouchEvent EventHandler::touchEvent(const TouchInput& input, const std::vector>& keyModVec = global::navigationHandler.inputState().pressedKeys(); for (const std::pair& keyModPair : keyModVec) { - const KeyModifier mods = keyModVec[0].second; + const KeyModifier mods = keyModPair.second; event.modifiers |= static_cast(mapToCefModifiers(mods)); } event.pointer_type = cef_pointer_type_t::CEF_POINTER_TYPE_TOUCH; diff --git a/src/interaction/scriptcamerastates.cpp b/src/interaction/scriptcamerastates.cpp index c68212177e..e9e01b81dc 100644 --- a/src/interaction/scriptcamerastates.cpp +++ b/src/interaction/scriptcamerastates.cpp @@ -35,9 +35,7 @@ namespace openspace::interaction { ScriptCameraStates::ScriptCameraStates() : CameraInteractionStates(1.0, 1.0) {} -void ScriptCameraStates::updateStateFromInput(const InputState& inputState, - double deltaTime) -{ +void ScriptCameraStates::updateStateFromInput(const InputState&, double deltaTime) { if (_localRotation != glm::dvec2(0.0)) { _localRotationState.velocity.set( _localRotation * _sensitivity, @@ -114,5 +112,4 @@ void ScriptCameraStates::addGlobalRoll(const glm::dvec2& delta) { _globalRoll += delta; } - } // namespace openspace::interaction diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index c5280097ad..cec4b87e92 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -61,7 +61,7 @@ namespace { glPushDebugGroup( GL_DEBUG_SOURCE_APPLICATION, 0, - name.length(), + static_cast(name.length()), name.data() ); } @@ -608,8 +608,12 @@ void FramebufferRenderer::updateDownscaleTextures() { GL_TEXTURE_2D, 0, GL_RGBA32F, - _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, - _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, + static_cast( + _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor + ), + static_cast( + _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor + ), 0, GL_RGBA, GL_FLOAT, @@ -625,8 +629,12 @@ void FramebufferRenderer::updateDownscaleTextures() { GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, - _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, - _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, + static_cast( + _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor + ), + static_cast( + _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor + ), 0, GL_DEPTH_COMPONENT, GL_FLOAT, @@ -928,8 +936,12 @@ void FramebufferRenderer::updateResolution() { GL_TEXTURE_2D, 0, GL_RGBA32F, - _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, - _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, + static_cast( + _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor + ), + static_cast( + _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor + ), 0, GL_RGBA, GL_FLOAT, @@ -945,8 +957,12 @@ void FramebufferRenderer::updateResolution() { GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32F, - _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor, - _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor, + static_cast( + _resolution.x * _downscaleVolumeRendering.currentDownscaleFactor + ), + static_cast( + _resolution.y * _downscaleVolumeRendering.currentDownscaleFactor + ), 0, GL_DEPTH_COMPONENT, GL_FLOAT, @@ -1313,7 +1329,12 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector if (raycaster->downscaleRender() < 1.f) { glBindFramebuffer(GL_FRAMEBUFFER, _downscaleVolumeRendering.framebuffer); const float s = raycaster->downscaleRender(); - glViewport(viewport[0], viewport[1], viewport[2] * s, viewport[3] * s); + glViewport( + viewport[0], + viewport[1], + static_cast(viewport[2] * s), + static_cast(viewport[3] * s) + ); if (_downscaleVolumeRendering.currentDownscaleFactor != s) { _downscaleVolumeRendering.currentDownscaleFactor = s; updateDownscaleTextures(); diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp index f52cfa42dc..faa165e0ed 100644 --- a/src/util/syncbuffer.cpp +++ b/src/util/syncbuffer.cpp @@ -39,8 +39,9 @@ SyncBuffer::~SyncBuffer() {} // NOLINT void SyncBuffer::encode(const std::string& s) { ZoneScoped - int32_t anticpatedBufferSize = _encodeOffset + (sizeof(char) * s.size()) - + sizeof(int32_t); + int32_t anticpatedBufferSize = static_cast( + _encodeOffset + (sizeof(char) * s.size()) + sizeof(int32_t) + ); if (anticpatedBufferSize >= _n) { _dataStream.resize(anticpatedBufferSize); }