minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add const to numeric parameters

This commit is contained in:
JosiahWI 2023-05-18 06:41:36 -05:00 committed by Josiah VanderZee
parent 18ebadc0ab
commit dc9928f978
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/Irrlicht/CGLTFMeshFileLoader.cpp
View File

@ -124,14 +124,14 @@ CGLTFMeshFileLoader::ModelParser::ModelParser(
} }
std::vector<u16> CGLTFMeshFileLoader::ModelParser::getIndices( std::vector<u16> CGLTFMeshFileLoader::ModelParser::getIndices(
std::size_t meshIdx, const std::size_t meshIdx,
std::size_t primitiveIdx) const const std::size_t primitiveIdx) const
{ {
auto accessorIdx = getIndicesAccessorIdx(meshIdx, primitiveIdx); auto accessorIdx = getIndicesAccessorIdx(meshIdx, primitiveIdx);
auto buf = getBuffer(meshIdx, primitiveIdx, accessorIdx); auto buf = getBuffer(meshIdx, primitiveIdx, accessorIdx);
std::vector<u16> indices{}; std::vector<u16> indices{};
std::size_t count = getElemCount(accessorIdx); const auto count = getElemCount(accessorIdx);
for (std::size_t i = 0; i < count; ++i) { for (std::size_t i = 0; i < count; ++i) {
std::size_t elemIdx = count - i - 1; std::size_t elemIdx = count - i - 1;
indices.push_back(readPrimitive<u16>( indices.push_back(readPrimitive<u16>(
@ -142,8 +142,8 @@ std::vector<u16> CGLTFMeshFileLoader::ModelParser::getIndices(
} }
std::vector<video::S3DVertex> CGLTFMeshFileLoader::ModelParser::getVertices( std::vector<video::S3DVertex> CGLTFMeshFileLoader::ModelParser::getVertices(
std::size_t meshIdx, const std::size_t meshIdx,
std::size_t primitiveIdx) const const std::size_t primitiveIdx) const
{ {
auto positionAccessorIdx = getPositionAccessorIdx(meshIdx, primitiveIdx); auto positionAccessorIdx = getPositionAccessorIdx(meshIdx, primitiveIdx);
auto vertexCount = getElemCount(positionAccessorIdx); auto vertexCount = getElemCount(positionAccessorIdx);
@ -179,7 +179,7 @@ std::size_t CGLTFMeshFileLoader::ModelParser::getMeshCount() const
} }
std::size_t CGLTFMeshFileLoader::ModelParser::getPrimitiveCount( std::size_t CGLTFMeshFileLoader::ModelParser::getPrimitiveCount(
std::size_t meshIdx) const const std::size_t meshIdx) const
{ {
return m_model.meshes[meshIdx].primitives.size(); 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 CGLTFMeshFileLoader::ModelParser::getElemCount(
std::size_t accessorIdx) const const std::size_t accessorIdx) const
{ {
return m_model.accessors[accessorIdx].count; return m_model.accessors[accessorIdx].count;
} }
CGLTFMeshFileLoader::BufferOffset CGLTFMeshFileLoader::ModelParser::getBuffer( CGLTFMeshFileLoader::BufferOffset CGLTFMeshFileLoader::ModelParser::getBuffer(
std::size_t meshIdx, const std::size_t meshIdx,
std::size_t primitiveIdx, const std::size_t primitiveIdx,
std::size_t accessorIdx) const const std::size_t accessorIdx) const
{ {
const auto& accessor = m_model.accessors[accessorIdx]; const auto& accessor = m_model.accessors[accessorIdx];
const auto& view = m_model.bufferViews[accessor.bufferView]; 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 CGLTFMeshFileLoader::ModelParser::getIndicesAccessorIdx(
std::size_t meshIdx, const std::size_t meshIdx,
std::size_t primitiveIdx) const const std::size_t primitiveIdx) const
{ {
return m_model.meshes[meshIdx].primitives[primitiveIdx].indices; return m_model.meshes[meshIdx].primitives[primitiveIdx].indices;
} }
std::size_t CGLTFMeshFileLoader::ModelParser::getPositionAccessorIdx( std::size_t CGLTFMeshFileLoader::ModelParser::getPositionAccessorIdx(
std::size_t meshIdx, const std::size_t meshIdx,
std::size_t primitiveIdx) const const std::size_t primitiveIdx) const
{ {
return m_model.meshes[meshIdx].primitives[primitiveIdx] return m_model.meshes[meshIdx].primitives[primitiveIdx]
.attributes.find("POSITION")->second; .attributes.find("POSITION")->second;

24
source/Irrlicht/CGLTFMeshFileLoader.h
View File

@ -64,15 +64,15 @@ private:
* *
* Values are return in Irrlicht winding order. * Values are return in Irrlicht winding order.
*/ */
std::vector<u16> getIndices(std::size_t meshIdx, std::vector<u16> getIndices(const std::size_t meshIdx,
std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
std::vector<video::S3DVertex> getVertices(std::size_t meshIdx, std::vector<video::S3DVertex> getVertices(std::size_t meshIdx,
std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
std::size_t getMeshCount() 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: private:
tinygltf::Model m_model; tinygltf::Model m_model;
@ -98,17 +98,17 @@ private:
float getScale() const; 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, BufferOffset getBuffer(const std::size_t meshIdx,
std::size_t primitiveIdx, const std::size_t primitiveIdx,
std::size_t accessorIdx) const; const std::size_t accessorIdx) const;
std::size_t getIndicesAccessorIdx(std::size_t meshIdx, std::size_t getIndicesAccessorIdx(const std::size_t meshIdx,
std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
std::size_t getPositionAccessorIdx(std::size_t meshIdx, std::size_t getPositionAccessorIdx(const std::size_t meshIdx,
std::size_t primitiveIdx) const; const std::size_t primitiveIdx) const;
}; };
static bool tryParseGLTF(io::IReadFile* file, static bool tryParseGLTF(io::IReadFile* file,