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/application/StarRenderer_opengl20.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/application/StarRenderer_opengl20.cpp')
-rw-r--r-- | source/application/StarRenderer_opengl20.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/application/StarRenderer_opengl20.cpp b/source/application/StarRenderer_opengl20.cpp index f85f0e8..18f771b 100644 --- a/source/application/StarRenderer_opengl20.cpp +++ b/source/application/StarRenderer_opengl20.cpp @@ -416,7 +416,7 @@ List<RenderPrimitive>& OpenGl20Renderer::immediatePrimitives() { } void OpenGl20Renderer::render(RenderPrimitive primitive) { - m_immediatePrimitives.append(move(primitive)); + m_immediatePrimitives.append(std::move(primitive)); } void OpenGl20Renderer::renderBuffer(RenderBufferPtr const& renderBuffer, Mat3F const& transformation) { @@ -672,7 +672,7 @@ void OpenGl20Renderer::GlRenderBuffer::set(List<RenderPrimitive>& primitives) { glBufferData(GL_ARRAY_BUFFER, accumulationBuffer.size(), accumulationBuffer.ptr(), GL_STREAM_DRAW); } - vertexBuffers.emplace_back(move(vb)); + vertexBuffers.emplace_back(std::move(vb)); currentTextures.clear(); currentTextureSizes.clear(); @@ -701,7 +701,7 @@ void OpenGl20Renderer::GlRenderBuffer::set(List<RenderPrimitive>& primitives) { if (auto gt = as<GlGroupedTexture>(texture.get())) gt->incrementBufferUseCount(); - usedTextures.add(move(texture)); + usedTextures.add(std::move(texture)); return {float(textureIndex), Vec2F(glTexture->glTextureCoordinateOffset())}; }; @@ -723,14 +723,14 @@ void OpenGl20Renderer::GlRenderBuffer::set(List<RenderPrimitive>& primitives) { Texture* lastTexture = nullptr; for (auto& primitive : primitives) { if (auto tri = primitive.ptr<RenderTriangle>()) { - tie(textureIndex, textureOffset) = addCurrentTexture(move(tri->texture)); + tie(textureIndex, textureOffset) = addCurrentTexture(std::move(tri->texture)); appendBufferVertex(tri->a, textureIndex, textureOffset); appendBufferVertex(tri->b, textureIndex, textureOffset); appendBufferVertex(tri->c, textureIndex, textureOffset); } else if (auto quad = primitive.ptr<RenderQuad>()) { - tie(textureIndex, textureOffset) = addCurrentTexture(move(quad->texture)); + tie(textureIndex, textureOffset) = addCurrentTexture(std::move(quad->texture)); appendBufferVertex(quad->a, textureIndex, textureOffset); appendBufferVertex(quad->b, textureIndex, textureOffset); @@ -742,7 +742,7 @@ void OpenGl20Renderer::GlRenderBuffer::set(List<RenderPrimitive>& primitives) { } else if (auto poly = primitive.ptr<RenderPoly>()) { if (poly->vertexes.size() > 2) { - tie(textureIndex, textureOffset) = addCurrentTexture(move(poly->texture)); + tie(textureIndex, textureOffset) = addCurrentTexture(std::move(poly->texture)); for (size_t i = 1; i < poly->vertexes.size() - 1; ++i) { appendBufferVertex(poly->vertexes[0], textureIndex, textureOffset); |