Merge branch 'main' into small-fixes

8 files changed, 29 insertions, 29 deletions

diff --git a/source/rendering/StarAssetTextureGroup.cpp b/source/rendering/StarAssetTextureGroup.cpp
index afffab7..c377a07 100644
--- a/source/rendering/StarAssetTextureGroup.cpp
+++ b/source/rendering/StarAssetTextureGroup.cpp
@@ -8,7 +8,7 @@
 namespace Star {
 
 AssetTextureGroup::AssetTextureGroup(TextureGroupPtr textureGroup)
-  : m_textureGroup(move(textureGroup)) {
+  : m_textureGroup(std::move(textureGroup)) {
   m_reloadTracker = make_shared<TrackerListener>();
   Root::singleton().registerReloadListener(m_reloadTracker);
 }
diff --git a/source/rendering/StarDrawablePainter.cpp b/source/rendering/StarDrawablePainter.cpp
index 0ef1f31..5f9fd79 100644
--- a/source/rendering/StarDrawablePainter.cpp
+++ b/source/rendering/StarDrawablePainter.cpp
@@ -3,8 +3,8 @@
 namespace Star {
 
 DrawablePainter::DrawablePainter(RendererPtr renderer, AssetTextureGroupPtr textureGroup) {
-  m_renderer = move(renderer);
-  m_textureGroup = move(textureGroup);
+  m_renderer = std::move(renderer);
+  m_textureGroup = std::move(textureGroup);
 }
 
 void DrawablePainter::drawDrawable(Drawable const& drawable) {
@@ -48,7 +48,7 @@ void DrawablePainter::drawDrawable(Drawable const& drawable) {
 
     float param1 = drawable.fullbright ? 0.0f : 1.0f;
 
-    primitives.emplace_back(std::in_place_type_t<RenderQuad>(), move(texture),
+    primitives.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(texture),
         lowerLeft,  Vec2F{0, 0},
         lowerRight, Vec2F{textureSize[0], 0},
         upperRight, Vec2F{textureSize[0], textureSize[1]},
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]),
diff --git a/source/rendering/StarFontTextureGroup.cpp b/source/rendering/StarFontTextureGroup.cpp
index a951358..d5ad88d 100644
--- a/source/rendering/StarFontTextureGroup.cpp
+++ b/source/rendering/StarFontTextureGroup.cpp
@@ -5,7 +5,7 @@
 namespace Star {
 
 FontTextureGroup::FontTextureGroup(TextureGroupPtr textureGroup)
-  : m_textureGroup(move(textureGroup)) {}
+  : m_textureGroup(std::move(textureGroup)) {}
 
 void FontTextureGroup::cleanup(int64_t timeout) {
   int64_t currentTime = Time::monotonicMilliseconds();
diff --git a/source/rendering/StarTextPainter.cpp b/source/rendering/StarTextPainter.cpp
index 748aa52..fe352d1 100644
--- a/source/rendering/StarTextPainter.cpp
+++ b/source/rendering/StarTextPainter.cpp
@@ -279,7 +279,7 @@ StringList TextPainter::wrapText(StringView s, Maybe<unsigned> wrapWidth) {
   int lastLine = 0;
   TextPainter::WrapTextCallback textCallback = [&](StringView text, int line) {
     if (lastLine != line) {
-      result.append(move(current));
+      result.append(std::move(current));
       lastLine = line;
     }
 
@@ -290,7 +290,7 @@ StringList TextPainter::wrapText(StringView s, Maybe<unsigned> wrapWidth) {
   processWrapText(s, wrapWidth.ptr(), textCallback);
 
   if (!current.empty())
-    result.append(move(current));
+    result.append(std::move(current));
 
   return result;
 };
@@ -312,7 +312,7 @@ void TextPainter::setMode(FontMode mode) {
 }
 
 void TextPainter::setFontColor(Vec4B color) {
-  m_renderSettings.color = move(color);
+  m_renderSettings.color = std::move(color);
 }
 
 void TextPainter::setProcessingDirectives(StringView directives) {
@@ -411,7 +411,7 @@ RectF TextPainter::doRenderText(StringView s, TextPositioning const& position, b
       break;
   }
 
-  m_renderSettings = move(backupRenderSettings);
+  m_renderSettings = std::move(backupRenderSettings);
 
   return bounds;
 }
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(),
diff --git a/source/rendering/StarWorldCamera.hpp b/source/rendering/StarWorldCamera.hpp
index d85543a..8ef39cb 100644
--- a/source/rendering/StarWorldCamera.hpp
+++ b/source/rendering/StarWorldCamera.hpp
@@ -75,7 +75,7 @@ inline float WorldCamera::pixelRatio() const {
 }
 
 inline void WorldCamera::setWorldGeometry(WorldGeometry geometry) {
-  m_worldGeometry = move(geometry);
+  m_worldGeometry = std::move(geometry);
 }
 
 inline WorldGeometry WorldCamera::worldGeometry() const {
diff --git a/source/rendering/StarWorldPainter.cpp b/source/rendering/StarWorldPainter.cpp
index d89cfe1..e106307 100644
--- a/source/rendering/StarWorldPainter.cpp
+++ b/source/rendering/StarWorldPainter.cpp
@@ -28,7 +28,7 @@ WorldPainter::WorldPainter() {
 void WorldPainter::renderInit(RendererPtr renderer) {
   m_assets = Root::singleton().assets();
 
-  m_renderer = move(renderer);
+  m_renderer = std::move(renderer);
   auto textureGroup = m_renderer->createTextureGroup(TextureGroupSize::Large);
   m_textPainter = make_shared<TextPainter>(m_renderer, textureGroup);
   m_tilePainter = make_shared<TilePainter>(m_renderer);
@@ -110,7 +110,7 @@ void WorldPainter::render(WorldRenderData& renderData, function<void()> lightWai
   Map<EntityRenderLayer, List<pair<EntityHighlightEffect, List<Drawable>>>> entityDrawables;
   for (auto& ed : renderData.entityDrawables) {
     for (auto& p : ed.layers)
-      entityDrawables[p.first].append({ed.highlightEffect, move(p.second)});
+      entityDrawables[p.first].append({ed.highlightEffect, std::move(p.second)});
   }
 
   auto entityDrawableIterator = entityDrawables.begin();
@@ -121,7 +121,7 @@ void WorldPainter::render(WorldRenderData& renderData, function<void()> lightWai
       if (until && entityDrawableIterator->first >= *until)
         break;
       for (auto& edl : entityDrawableIterator->second)
-        drawEntityLayer(move(edl.second), edl.first);
+        drawEntityLayer(std::move(edl.second), edl.first);
       ++entityDrawableIterator;
     }
 
@@ -221,7 +221,7 @@ void WorldPainter::renderParticles(WorldRenderData& renderData, Particle::Layer
       drawable.rotate(particle.rotation);
       drawable.scale(particle.size);
       drawable.translate(particle.position);
-      drawDrawable(move(drawable));
+      drawDrawable(std::move(drawable));
 
     } else if (particle.type == Particle::Type::Text) {
       Vec2F position = m_camera.worldToScreen(particle.position);
@@ -275,7 +275,7 @@ void WorldPainter::drawEntityLayer(List<Drawable> drawables, EntityHighlightEffe
           underlayDrawable.fullbright = true;
           underlayDrawable.color = Color::rgbaf(1, 1, 1, highlightEffect.level);
           underlayDrawable.imagePart().addDirectives(underlayDirectives, true);
-          drawDrawable(move(underlayDrawable));
+          drawDrawable(std::move(underlayDrawable));
         }
       }
     }
@@ -289,12 +289,12 @@ void WorldPainter::drawEntityLayer(List<Drawable> drawables, EntityHighlightEffe
         overlayDrawable.fullbright = true;
         overlayDrawable.color = Color::rgbaf(1, 1, 1, highlightEffect.level);
         overlayDrawable.imagePart().addDirectives(overlayDirectives, true);
-        drawDrawable(move(overlayDrawable));
+        drawDrawable(std::move(overlayDrawable));
       }
     }
   } else {
     for (auto& d : drawables)
-      drawDrawable(move(d));
+      drawDrawable(std::move(d));
   }
 }
 
@@ -316,7 +316,7 @@ void WorldPainter::drawDrawable(Drawable drawable) {
 
 void WorldPainter::drawDrawableSet(List<Drawable>& drawables) {
   for (Drawable& drawable : drawables)
-    drawDrawable(move(drawable));
+    drawDrawable(std::move(drawable));
 
   m_renderer->flush();
 }