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

@@ -8,7 +8,7 @@
#define NAZARA_FORMATS_MD5ANIMPARSER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Core/Stream.hpp>
#include <Nazara/Math/Box.hpp>
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
@@ -42,7 +42,7 @@ namespace Nz
unsigned int index;
};
MD5AnimParser(InputStream& stream);
MD5AnimParser(Stream& stream);
~MD5AnimParser();
Ternary Check();
@@ -69,7 +69,7 @@ namespace Nz
std::vector<float> m_animatedComponents;
std::vector<Frame> m_frames;
std::vector<Joint> m_joints;
InputStream& m_stream;
Stream& m_stream;
String m_currentLine;
bool m_keepLastLine;
unsigned int m_frameIndex;

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

@@ -8,7 +8,7 @@
#define NAZARA_FORMATS_MD5MESHPARSER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Core/Stream.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
@@ -52,7 +52,7 @@ namespace Nz
String shader;
};
MD5MeshParser(InputStream& stream);
MD5MeshParser(Stream& stream);
~MD5MeshParser();
Ternary Check();
@@ -74,7 +74,7 @@ namespace Nz
std::vector<Joint> m_joints;
std::vector<Mesh> m_meshes;
InputStream& m_stream;
Stream& m_stream;
String m_currentLine;
bool m_keepLastLine;
unsigned int m_lineCount;

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;

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;