Fix typos

Ybalrid · Jul 6, 2019 · f8c192d · f8c192d
1 parent 3e54a7f
commit f8c192d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/src/Ogre_glTF_modelConverter.cpp b/src/Ogre_glTF_modelConverter.cpp
@@ -62,49 +62,45 @@ Ogre::MeshPtr modelConverter::getOgreMesh(const Ogre::String& name)
 	if(name.empty())
 	{
 		if(!model.meshes.empty()) {
-			return getOgreMesh(model.meshes.front());
+			return getOgreMesh(0);
 		}
 		else
 		{
 			return Ogre::MeshPtr();
 		}
 	}
 
-	for(const auto& mesh : model.meshes) {
+	for(size_t meshIdx = 0; meshIdx < model.meshes.size(); ++meshIdx) {
+		const auto& mesh = model.meshes[meshIdx];
 		if(!mesh.name.empty() && mesh.name == name) {
-			return getOgreMesh(mesh);
+			return getOgreMesh(meshIdx);
 		}
 	}
 
 	return Ogre::MeshPtr();
 }
 
-Ogre::MeshPtr modelConverter::getOgreMesh(size_t index)
-{
-	assert(index < model.meshes.size());
-	return getOgreMesh(model.meshes[index]);
-}
-
-Ogre::MeshPtr modelConverter::getOgreMesh(const tinygltf::Mesh& mesh)
+Ogre::MeshPtr modelConverter::getOgreMesh(size_t meshIdx)
 {
 	Ogre::Aabb boundingBox;
+	auto& mesh = model.meshes[meshIdx];
 	OgreLog("Found mesh " + mesh.name + " in glTF file");
 
-	auto OgreMesh = Ogre::MeshManager::getSingleton().getByName(mesh.name);
-	if(OgreMesh)
+	auto ogreMesh = Ogre::MeshManager::getSingleton().getByName(mesh.name);
+	if(ogreMesh)
 	{
 		OgreLog("Found mesh " + mesh.name + " in Ogre::MeshManager(v2)");
-		return OgreMesh;
+		return ogreMesh;
 	}
 
 	OgreLog("Loading mesh from glTF file");
 	OgreLog("mesh has " + std::to_string(mesh.primitives.size()) + " primitives");
-	OgreMesh = Ogre::MeshManager::getSingleton().createManual(mesh.name, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+	ogreMesh = Ogre::MeshManager::getSingleton().createManual(mesh.name, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 	OgreLog("Created mesh on v2 MeshManager");
 
 	for(const auto& primitive : mesh.primitives)
 	{
-		auto subMesh = OgreMesh->createSubMesh();
+		auto subMesh = ogreMesh->createSubMesh();
 		OgreLog("Created one submesh");
 		const auto indexBuffer = extractIndexBuffer(primitive.indices);
 
@@ -193,10 +189,10 @@ Ogre::MeshPtr modelConverter::getOgreMesh(const tinygltf::Mesh& mesh)
 		}
 	}
 
-	OgreMesh->_setBounds(boundingBox, true);
+	ogreMesh->_setBounds(boundingBox, true);
 	//OgreLog("Setting 'bounding sphere radius' from bounds : " + std::to_string(boundingBox.getRadius()));
 
-	return OgreMesh;
+	return ogreMesh;
 }
 
 void modelConverter::debugDump() const

diff --git a/src/private_headers/Ogre_glTF_modelConverter.hpp b/src/private_headers/Ogre_glTF_modelConverter.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include <Ogre.h>
+#include "OgreMesh2.h"
 #include <tiny_gltf.h>
 #include "Ogre_glTF.hpp"
 
@@ -158,11 +159,10 @@ namespace Ogre_glTF
 		/// \param input model we are converting into an Ogre model
 		modelConverter(tinygltf::Model& input);
 
-		///Returns the mesh with the given name in the glTF file. If name is empty it will return the first mesh if any.
-		Ogre::MeshPtr getOgreMesh(const Ogre::String& name = "");
-		Ogre::MeshPtr getOgreMesh(size_t index);
-		Ogre::MeshPtr getOgreMesh(const tinygltf::Mesh& mesh);
-
+		///Returns the mesh with the given name in the glTF file.
+		Ogre::MeshPtr getOgreMesh(const Ogre::String& name);
+		Ogre::MeshPtr getOgreMesh(size_t meshIdx);
+
 		///Print out debug information on the model structure
 		// nodes contain transformation and scale information
 		void debugDump() const;