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/MTLParser.hpp
View File

@@ -9,7 +9,7 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Color.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Core/Stream.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Utility/Config.hpp>
#include <unordered_map>
@@ -39,7 +39,7 @@ namespace Nz
unsigned int illumModel = 0;
};
MTLParser(InputStream& stream$);
MTLParser(Stream& stream$);
~MTLParser();
const Material* GetMaterial(const String& materialName) const;
@@ -54,7 +54,7 @@ namespace Nz
void UnrecognizedLine(bool error = false);
std::unordered_map<String, Material> m_materials;
InputStream& m_stream;
Stream& m_stream;
String m_currentLine;
bool m_keepLastLine;
unsigned int m_lineCount;