From 57f6ea5953a65286688bb883555800a8f18943eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Sat, 6 Jul 2024 12:03:44 +0200 Subject: [PATCH] Fix a few warnings --- src/graphics/Renderer.cpp | 2 +- src/gui/interface/ScrollPanel.cpp | 2 +- src/simulation/gravity/Fft.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index c9f824469..5bc54c845 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -847,7 +847,7 @@ void Renderer::draw_grav() { continue; } - auto np = Vec2(p.X * CELL, p.Y * CELL); + auto np = Vec2{ float(p.X * CELL), float(p.Y * CELL) }; auto dist = agx + agy; for (auto i = 0; i < 4; ++i) { diff --git a/src/gui/interface/ScrollPanel.cpp b/src/gui/interface/ScrollPanel.cpp index 542e230c1..457eabedb 100644 --- a/src/gui/interface/ScrollPanel.cpp +++ b/src/gui/interface/ScrollPanel.cpp @@ -81,7 +81,7 @@ void ScrollPanel::XOnMouseDown(int x, int y, unsigned int button) scrollbarSelected = true; scrollbarInitialYOffset = int(offsetY); } - initialOffsetY = offsetY; + initialOffsetY = int(offsetY); scrollbarInitialYClick = y - Position.Y; scrollbarClickLocation = 100; } diff --git a/src/simulation/gravity/Fft.cpp b/src/simulation/gravity/Fft.cpp index 91304f9c1..43757263f 100644 --- a/src/simulation/gravity/Fft.cpp +++ b/src/simulation/gravity/Fft.cpp @@ -179,7 +179,7 @@ void GravityImpl::Init() fftwf_execute(kernelYForward.get()); //clear padded gravmap - std::memset(massBig.get(), 0.f, blocks.X * blocks.Y * sizeof(float)); + std::fill(massBig.get(), massBig.get() + blocks.X * blocks.Y, 0.f); thr = std::thread([this]() { while (true)