Utility/OBJParser: Optimized loading

Former-commit-id: b21724d63e15bda0a9c5b8a4c9941b4b606b3525 [formerly 375bc4032044631fd2a1f51f3407b71c2c582944]
Former-commit-id: aa71b4fcfacd25991da8c3b69fbc7ac9c0039ad6

include/Nazara/Utility/Formats/OBJParser.hpp

@@ -29,51 +29,59 @@ namespace Nz
 
 			struct Face
 			{
-				std::vector<FaceVertex> vertices;
+				std::size_t firstVertex;
+				std::size_t vertexCount;
 			};
 
 			struct Mesh
 			{
 				std::vector<Face> faces;
+				std::vector<FaceVertex> vertices;
 				String name;
-				unsigned int material;
+				std::size_t material;
 			};
 
-			OBJParser(Stream& stream$);
-			~OBJParser();
+			OBJParser() = default;
+			~OBJParser() = default;
 
-			const String* GetMaterials() const;
-			unsigned int GetMaterialCount() const;
-			const Mesh* GetMeshes() const;
-			unsigned int GetMeshCount() const;
-			const String& GetMtlLib() const;
-			const Vector3f* GetNormals() const;
-			unsigned int GetNormalCount() const;
-			const Vector4f* GetPositions() const;
-			unsigned int GetPositionCount() const;
-			const Vector3f* GetTexCoords() const;
-			unsigned int GetTexCoordCount() const;
+			inline const String* GetMaterials() const;
+			inline unsigned int GetMaterialCount() const;
+			inline const Mesh* GetMeshes() const;
+			inline unsigned int GetMeshCount() const;
+			inline const String& GetMtlLib() const;
+			inline const Vector3f* GetNormals() const;
+			inline unsigned int GetNormalCount() const;
+			inline const Vector4f* GetPositions() const;
+			inline unsigned int GetPositionCount() const;
+			inline const Vector3f* GetTexCoords() const;
+			inline unsigned int GetTexCoordCount() const;
 
-			bool Parse(std::size_t reservedVertexCount = 100);
+			bool Parse(Stream& stream, std::size_t reservedVertexCount = 100);
 
 		private:
 			bool Advance(bool required = true);
-			void Error(const String& message);
-			void Warning(const String& message);
-			void UnrecognizedLine(bool error = false);
+			template<typename T> void Emit(const T& text) const;
+			inline void EmitLine() const;
+			template<typename T> void EmitLine(const T& line) const;
+			inline void Error(const String& message);
+			inline void Flush() const;
+			inline void Warning(const String& message);
+			inline void UnrecognizedLine(bool error = false);
 
 			std::vector<Mesh> m_meshes;
 			std::vector<String> m_materials;
 			std::vector<Vector3f> m_normals;
 			std::vector<Vector4f> m_positions;
 			std::vector<Vector3f> m_texCoords;
-			Stream& m_stream;
+			mutable Stream* m_currentStream;
 			String m_currentLine;
 			String m_mtlLib;
+			mutable StringStream m_outputStream;
 			bool m_keepLastLine;
 			unsigned int m_lineCount;
-			unsigned int m_streamFlags;
 	};
 }
 
+#include <Nazara/Utility/Formats/OBJParser.inl>
+
 #endif // NAZARA_FORMATS_OBJPARSER_HPP

include/Nazara/Utility/Formats/OBJParser.inl

@@ -0,0 +1,88 @@
+// Copyright (C) 2016 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Utility module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/Utility/Formats/OBJParser.hpp>
+#include <Nazara/Core/Error.hpp>
+#include <Nazara/Utility/Debug.hpp>
+
+namespace Nz
+{
+	inline const String* OBJParser::GetMaterials() const
+	{
+		return m_materials.data();
+	}
+
+	inline unsigned int OBJParser::GetMaterialCount() const
+	{
+		return m_materials.size();
+	}
+
+	inline const OBJParser::Mesh* OBJParser::GetMeshes() const
+	{
+		return m_meshes.data();
+	}
+
+	inline unsigned int OBJParser::GetMeshCount() const
+	{
+		return m_meshes.size();
+	}
+
+	inline const String& OBJParser::GetMtlLib() const
+	{
+		return m_mtlLib;
+	}
+
+	inline const Vector3f* OBJParser::GetNormals() const
+	{
+		return m_normals.data();
+	}
+
+	inline unsigned int OBJParser::GetNormalCount() const
+	{
+		return m_normals.size();
+	}
+
+	inline const Vector4f* OBJParser::GetPositions() const
+	{
+		return m_positions.data();
+	}
+
+	inline unsigned int OBJParser::GetPositionCount() const
+	{
+		return m_positions.size();
+	}
+
+	inline const Vector3f* OBJParser::GetTexCoords() const
+	{
+		return m_texCoords.data();
+	}
+
+	inline unsigned int OBJParser::GetTexCoordCount() const
+	{
+		return m_texCoords.size();
+	}
+
+
+	inline void OBJParser::Error(const String& message)
+	{
+		NazaraError(message + " at line #" + String::Number(m_lineCount));
+	}
+
+	inline void OBJParser::Warning(const String& message)
+	{
+		NazaraWarning(message + " at line #" + String::Number(m_lineCount));
+	}
+
+	inline void OBJParser::UnrecognizedLine(bool error)
+	{
+		String message = "Unrecognized \"" + m_currentLine + '"';
+
+		if (error)
+			Error(message);
+		else
+			Warning(message);
+	}
+}
+
+#include <Nazara/Utility/DebugOff.hpp>