minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-02-22 13:50:25 +01:00
Code Issues Projects Releases Wiki Activity

Add r-value reference constructor to ModelParser

Browse Source
This commit is contained in:
JosiahWI 2023-05-17 13:07:39 -05:00 committed by Josiah VanderZee
parent 85fdf95afa
commit 50da04297f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Irrlicht/CGLTFMeshFileLoader.cpp
View File

@ -19,6 +19,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <tuple> #include <tuple>
#include <utility>
#include <vector> #include <vector>
// A helper function to disable tinygltf embedded image loading // A helper function to disable tinygltf embedded image loading
@ -106,7 +107,7 @@ IAnimatedMesh* CGLTFMeshFileLoader::createMesh(io::IReadFile* file)
std::vector<u16> indicesBuffer(model.accessors[ std::vector<u16> indicesBuffer(model.accessors[
indicesAccessorId].count); indicesAccessorId].count);
ModelParser parser(model); ModelParser parser(std::move(model));
parser.getIndices(indicesAccessorId, indicesBuffer); parser.getIndices(indicesAccessorId, indicesBuffer);
parser.getVertices(positionAccessorId, parser.getVertices(positionAccessorId,
@ -141,6 +142,12 @@ CGLTFMeshFileLoader::ModelParser::ModelParser(
{ {
} }
CGLTFMeshFileLoader::ModelParser::ModelParser(
const tinygltf::Model&& model)
: m_model(model)
{
}
void CGLTFMeshFileLoader::ModelParser::getIndices( void CGLTFMeshFileLoader::ModelParser::getIndices(
const std::size_t accessorId, const std::size_t accessorId,
std::vector<u16>& outIndices) const std::vector<u16>& outIndices) const

2
source/Irrlicht/CGLTFMeshFileLoader.h
View File

@ -58,6 +58,8 @@ private:
public: public:
ModelParser(const tinygltf::Model& model); ModelParser(const tinygltf::Model& model);
ModelParser(const tinygltf::Model&& model);
void getIndices(const std::size_t accessorId, void getIndices(const std::size_t accessorId,
std::vector<u16>& outIndices) const; std::vector<u16>& outIndices) const;