From fd41ee02df53712e00d99fbd30c74ca7c473a430 Mon Sep 17 00:00:00 2001 From: JosiahWI Date: Thu, 18 May 2023 06:41:36 -0500 Subject: [PATCH] Add const to numeric parameters --- source/Irrlicht/CGLTFMeshFileLoader.cpp | 28 ++++++++++++------------- source/Irrlicht/CGLTFMeshFileLoader.h | 24 ++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/source/Irrlicht/CGLTFMeshFileLoader.cpp b/source/Irrlicht/CGLTFMeshFileLoader.cpp index eb94f2e9..b9a0fc84 100644 --- a/source/Irrlicht/CGLTFMeshFileLoader.cpp +++ b/source/Irrlicht/CGLTFMeshFileLoader.cpp @@ -124,14 +124,14 @@ CGLTFMeshFileLoader::ModelParser::ModelParser( } std::vector CGLTFMeshFileLoader::ModelParser::getIndices( - std::size_t meshIdx, - std::size_t primitiveIdx) const + const std::size_t meshIdx, + const std::size_t primitiveIdx) const { auto accessorIdx = getIndicesAccessorIdx(meshIdx, primitiveIdx); auto buf = getBuffer(meshIdx, primitiveIdx, accessorIdx); std::vector indices{}; - std::size_t count = getElemCount(accessorIdx); + const auto count = getElemCount(accessorIdx); for (std::size_t i = 0; i < count; ++i) { std::size_t elemIdx = count - i - 1; indices.push_back(readPrimitive( @@ -142,8 +142,8 @@ std::vector CGLTFMeshFileLoader::ModelParser::getIndices( } std::vector CGLTFMeshFileLoader::ModelParser::getVertices( - std::size_t meshIdx, - std::size_t primitiveIdx) const + const std::size_t meshIdx, + const std::size_t primitiveIdx) const { auto positionAccessorIdx = getPositionAccessorIdx(meshIdx, primitiveIdx); auto vertexCount = getElemCount(positionAccessorIdx); @@ -179,7 +179,7 @@ std::size_t CGLTFMeshFileLoader::ModelParser::getMeshCount() const } std::size_t CGLTFMeshFileLoader::ModelParser::getPrimitiveCount( - std::size_t meshIdx) const + const std::size_t meshIdx) const { return m_model.meshes[meshIdx].primitives.size(); } @@ -278,15 +278,15 @@ float CGLTFMeshFileLoader::ModelParser::getScale() const } std::size_t CGLTFMeshFileLoader::ModelParser::getElemCount( - std::size_t accessorIdx) const + const std::size_t accessorIdx) const { return m_model.accessors[accessorIdx].count; } CGLTFMeshFileLoader::BufferOffset CGLTFMeshFileLoader::ModelParser::getBuffer( - std::size_t meshIdx, - std::size_t primitiveIdx, - std::size_t accessorIdx) const + const std::size_t meshIdx, + const std::size_t primitiveIdx, + const std::size_t accessorIdx) const { const auto& accessor = m_model.accessors[accessorIdx]; const auto& view = m_model.bufferViews[accessor.bufferView]; @@ -296,15 +296,15 @@ CGLTFMeshFileLoader::BufferOffset CGLTFMeshFileLoader::ModelParser::getBuffer( } std::size_t CGLTFMeshFileLoader::ModelParser::getIndicesAccessorIdx( - std::size_t meshIdx, - std::size_t primitiveIdx) const + const std::size_t meshIdx, + const std::size_t primitiveIdx) const { return m_model.meshes[meshIdx].primitives[primitiveIdx].indices; } std::size_t CGLTFMeshFileLoader::ModelParser::getPositionAccessorIdx( - std::size_t meshIdx, - std::size_t primitiveIdx) const + const std::size_t meshIdx, + const std::size_t primitiveIdx) const { return m_model.meshes[meshIdx].primitives[primitiveIdx] .attributes.find("POSITION")->second; diff --git a/source/Irrlicht/CGLTFMeshFileLoader.h b/source/Irrlicht/CGLTFMeshFileLoader.h index d2bf56ea..d4c7061a 100644 --- a/source/Irrlicht/CGLTFMeshFileLoader.h +++ b/source/Irrlicht/CGLTFMeshFileLoader.h @@ -64,15 +64,15 @@ private: * * Values are return in Irrlicht winding order. */ - std::vector getIndices(std::size_t meshIdx, - std::size_t primitiveIdx) const; + std::vector getIndices(const std::size_t meshIdx, + const std::size_t primitiveIdx) const; std::vector getVertices(std::size_t meshIdx, - std::size_t primitiveIdx) const; + const std::size_t primitiveIdx) const; std::size_t getMeshCount() const; - std::size_t getPrimitiveCount(std::size_t meshIdx) const; + std::size_t getPrimitiveCount(const std::size_t meshIdx) const; private: tinygltf::Model m_model; @@ -98,17 +98,17 @@ private: float getScale() const; - std::size_t getElemCount(std::size_t accessorIdx) const; + std::size_t getElemCount(const std::size_t accessorIdx) const; - BufferOffset getBuffer(std::size_t meshIdx, - std::size_t primitiveIdx, - std::size_t accessorIdx) const; + BufferOffset getBuffer(const std::size_t meshIdx, + const std::size_t primitiveIdx, + const std::size_t accessorIdx) const; - std::size_t getIndicesAccessorIdx(std::size_t meshIdx, - std::size_t primitiveIdx) const; + std::size_t getIndicesAccessorIdx(const std::size_t meshIdx, + const std::size_t primitiveIdx) const; - std::size_t getPositionAccessorIdx(std::size_t meshIdx, - std::size_t primitiveIdx) const; + std::size_t getPositionAccessorIdx(const std::size_t meshIdx, + const std::size_t primitiveIdx) const; }; static bool tryParseGLTF(io::IReadFile* file,