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

10
src/Nazara/Utility/Formats/OBJParser.cpp
View File

@@ -13,18 +13,18 @@
namespace Nz
{
OBJParser::OBJParser(InputStream& stream) :
OBJParser::OBJParser(Stream& stream) :
m_stream(stream),
m_streamFlags(stream.GetStreamOptions())
m_streamFlags(stream.GetStreamOptions()) //< Saves stream flags
{
if ((m_streamFlags & StreamOption_Text) == 0)
m_stream.SetStreamOptions(m_streamFlags | StreamOption_Text);
m_stream.EnableTextMode(true);
}
OBJParser::~OBJParser()
{
// Reset stream flags
if ((m_streamFlags & StreamOption_Text) == 0)
m_stream.SetStreamOptions(m_streamFlags);
m_stream.EnableTextMode(false);
}
const String* OBJParser::GetMaterials() const