sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Merge InputStream and OutputStream to Stream

Browse Source 
Remove serialization support from Stream


Former-commit-id: 7a761e4fcd07cab561f13e4709c4492ed18da88a
This commit is contained in:
Lynix
2015-11-20 13:52:49 +01:00
parent a47e5633d4
commit ed961f5ba8
66 changed files with 372 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Utility/Formats/OBJParser.hpp
View File

@@ -8,7 +8,7 @@
#define NAZARA_FORMATS_OBJPARSER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Core/Stream.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Math/Vector4.hpp>
@@ -39,7 +39,7 @@ namespace Nz
unsigned int material;
};
OBJParser(InputStream& stream$);
OBJParser(Stream& stream$);
~OBJParser();
const String* GetMaterials() const;
@@ -67,7 +67,7 @@ namespace Nz
std::vector<Vector3f> m_normals;
std::vector<Vector4f> m_positions;
std::vector<Vector3f> m_texCoords;
InputStream& m_stream;
Stream& m_stream;
String m_currentLine;
String m_mtlLib;
bool m_keepLastLine;