diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2024-02-20 09:47:10 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-20 09:47:10 +1100 |
| commit | 1c89042016c739815b2d70bcbef4673eef6b63e0 (patch) | |
| tree | f7c8e96e744222857c613e5fd14720d2695613c3 /source/rendering/StarEnvironmentPainter.cpp | |
| parent | 30e1871d3f44629e00a1f66d8164e3e62c7f889f (diff) | |
| parent | 7c4fbad2ba7d79580a9ebbf9fde1de117be4d08e (diff) | |
Merge pull request #19 from kblaschke/fix-compiler-warnings
Fixed a huge amount of Clang warnings
Diffstat (limited to 'source/rendering/StarEnvironmentPainter.cpp')
| -rw-r--r-- | source/rendering/StarEnvironmentPainter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/rendering/StarEnvironmentPainter.cpp b/source/rendering/StarEnvironmentPainter.cpp index c938ae0..7501f77 100644 --- a/source/rendering/StarEnvironmentPainter.cpp +++ b/source/rendering/StarEnvironmentPainter.cpp @@ -26,7 +26,7 @@ float const EnvironmentPainter::RayMinUnscaledAlpha = 1; Vec3B const EnvironmentPainter::RayColor = Vec3B(255, 255, 200); EnvironmentPainter::EnvironmentPainter(RendererPtr renderer) { - m_renderer = move(renderer); + m_renderer = std::move(renderer); m_textureGroup = make_shared<AssetTextureGroup>(m_renderer->createTextureGroup(TextureGroupSize::Large)); m_timer = 0; m_rayPerlin = PerlinF(1, RayPerlinFrequency, RayPerlinAmplitude, 0, 2.0f, 2.0f, Random::randu64()); @@ -189,13 +189,13 @@ void EnvironmentPainter::renderPlanetHorizon(float pixelRatio, Vec2F const& scre PolyF rightImage = PolyF(rightRect); rightImage.rotate(planetHorizon.rotation, center); - primitives.emplace_back(std::in_place_type_t<RenderQuad>(), move(leftTexture), + primitives.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(leftTexture), leftImage[0], Vec2F(0, 0), leftImage[1], Vec2F(leftTextureSize[0], 0), leftImage[2], Vec2F(leftTextureSize[0], leftTextureSize[1]), leftImage[3], Vec2F(0, leftTextureSize[1]), Vec4B::filled(255), 0.0f); - primitives.emplace_back(std::in_place_type_t<RenderQuad>(), move(rightTexture), + primitives.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(rightTexture), rightImage[0], Vec2F(0, 0), rightImage[1], Vec2F(rightTextureSize[0], 0), rightImage[2], Vec2F(rightTextureSize[0], rightTextureSize[1]), @@ -322,7 +322,7 @@ void EnvironmentPainter::renderParallaxLayers( withDirectives.directives += layer.directives; if (auto texture = m_textureGroup->tryTexture(withDirectives)) { RectF drawRect = RectF::withSize(anchorPoint, subImage.size() * camera.pixelRatio()); - primitives.emplace_back(std::in_place_type_t<RenderQuad>(), move(texture), + primitives.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(texture), RenderVertex{drawRect.min(), subImage.min(), drawColor, lightMapMultiplier}, RenderVertex{{drawRect.xMax(), drawRect.yMin()}, {subImage.xMax(), subImage.yMin()}, drawColor, lightMapMultiplier}, RenderVertex{drawRect.max(), subImage.max(), drawColor, lightMapMultiplier}, @@ -426,7 +426,7 @@ void EnvironmentPainter::drawOrbiter(float pixelRatio, Vec2F const& screenSize, RectF renderRect = RectF::withCenter(position, texSize * orbiter.scale * pixelRatio); Vec4B renderColor = Vec4B(255, 255, 255, 255 * alpha); - m_renderer->immediatePrimitives().emplace_back(std::in_place_type_t<RenderQuad>(), move(texture), + m_renderer->immediatePrimitives().emplace_back(std::in_place_type_t<RenderQuad>(), std::move(texture), renderMatrix.transformVec2(renderRect.min()), Vec2F(0, 0), renderMatrix.transformVec2(Vec2F{renderRect.xMax(), renderRect.yMin()}), Vec2F(texSize[0], 0), renderMatrix.transformVec2(renderRect.max()), Vec2F(texSize[0], texSize[1]), |