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/StarTilePainter.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/StarTilePainter.cpp')
| -rw-r--r-- | source/rendering/StarTilePainter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/rendering/StarTilePainter.cpp b/source/rendering/StarTilePainter.cpp index 5655930..31fe0a6 100644 --- a/source/rendering/StarTilePainter.cpp +++ b/source/rendering/StarTilePainter.cpp @@ -11,7 +11,7 @@ namespace Star { TilePainter::TilePainter(RendererPtr renderer) : TileDrawer() { - m_renderer = move(renderer); + m_renderer = std::move(renderer); m_textureGroup = m_renderer->createTextureGroup(TextureGroupSize::Large); auto& root = Root::singleton(); @@ -190,7 +190,7 @@ shared_ptr<TilePainter::TerrainChunk const> TilePainter::getTerrainChunk(WorldRe for (auto& zLevelPair : layerPair.second) { auto rb = m_renderer->createRenderBuffer(); rb->set(zLevelPair.second); - (*chunk)[layerPair.first][zLevelPair.first] = move(rb); + (*chunk)[layerPair.first][zLevelPair.first] = std::move(rb); } } @@ -214,7 +214,7 @@ shared_ptr<TilePainter::LiquidChunk const> TilePainter::getLiquidChunk(WorldRend for (auto& p : liquidPrimitives) { auto rb = m_renderer->createRenderBuffer(); rb->set(p.second); - chunk->set(p.first, move(rb)); + chunk->set(p.first, std::move(rb)); } return chunk; @@ -296,7 +296,7 @@ bool TilePainter::produceTerrainPrimitives(HashMap<QuadZLevel, List<RenderPrimit if (!variant) continue; RectF textureCoords = variant->wrap(variance); RectF worldCoords = RectF::withSize(piecePair.second / TilePixels + Vec2F(pos), textureCoords.size() / TilePixels); - quadList.emplace_back(std::in_place_type_t<RenderQuad>(), move(texture), + quadList.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(texture), worldCoords .min(), textureCoords.min(), Vec2F( worldCoords.xMax(), worldCoords.yMin()), @@ -323,7 +323,7 @@ bool TilePainter::produceTerrainPrimitives(HashMap<QuadZLevel, List<RenderPrimit if (!variant) continue; auto& textureCoords = variant->wrap(variance); RectF worldCoords = RectF::withSize(piecePair.second / TilePixels + Vec2F(pos), textureCoords.size() / TilePixels); - quadList.emplace_back(std::in_place_type_t<RenderQuad>(), move(texture), + quadList.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(texture), worldCoords.min(), textureCoords.min(), Vec2F(worldCoords.xMax(), worldCoords.yMin()), Vec2F(textureCoords.xMax(), textureCoords.yMin()), worldCoords.max(), textureCoords.max(), @@ -343,7 +343,7 @@ bool TilePainter::produceTerrainPrimitives(HashMap<QuadZLevel, List<RenderPrimit RectF textureCoords = RectF::withSize(Vec2F(), textureSize); RectF worldCoords = RectF::withSize(crackingImage.second / TilePixels + Vec2F(pos), textureCoords.size() / TilePixels); - quadList.emplace_back(std::in_place_type_t<RenderQuad>(), move(texture), + quadList.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(texture), worldCoords.min(), textureCoords.min(), Vec2F(worldCoords.xMax(), worldCoords.yMin()), Vec2F(textureCoords.xMax(), textureCoords.yMin()), worldCoords.max(), textureCoords.max(), |