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

8
src/Nazara/Graphics/Formats/MeshLoader.cpp
View File

@@ -14,7 +14,7 @@ namespace Nz
{
namespace
{
Ternary CheckStatic(InputStream& stream, const ModelParameters& parameters)
Ternary CheckStatic(Stream& stream, const ModelParameters& parameters)
{
NazaraUnused(stream);
NazaraUnused(parameters);
@@ -22,7 +22,7 @@ namespace Nz
return Ternary_Unknown;
}
bool LoadStatic(Model* model, InputStream& stream, const ModelParameters& parameters)
bool LoadStatic(Model* model, Stream& stream, const ModelParameters& parameters)
{
NazaraUnused(parameters);
@@ -63,7 +63,7 @@ namespace Nz
return true;
}
Ternary CheckAnimated(InputStream& stream, const SkeletalModelParameters& parameters)
Ternary CheckAnimated(Stream& stream, const SkeletalModelParameters& parameters)
{
NazaraUnused(stream);
NazaraUnused(parameters);
@@ -71,7 +71,7 @@ namespace Nz
return Ternary_Unknown;
}
bool LoadAnimated(SkeletalModel* model, InputStream& stream, const SkeletalModelParameters& parameters)
bool LoadAnimated(SkeletalModel* model, Stream& stream, const SkeletalModelParameters& parameters)
{
NazaraUnused(parameters);

4
src/Nazara/Graphics/Formats/OBJLoader.cpp
View File

@@ -29,7 +29,7 @@ namespace Nz
return (extension == "obj");
}
Ternary Check(InputStream& stream, const ModelParameters& parameters)
Ternary Check(Stream& stream, const ModelParameters& parameters)
{
NazaraUnused(stream);
NazaraUnused(parameters);
@@ -127,7 +127,7 @@ namespace Nz
return true;
}
bool Load(Model* model, InputStream& stream, const ModelParameters& parameters)
bool Load(Model* model, Stream& stream, const ModelParameters& parameters)
{
OBJParser parser(stream);
if (!parser.Parse())

4
src/Nazara/Graphics/Formats/TextureLoader.cpp
View File

@@ -12,7 +12,7 @@ namespace Nz
{
namespace
{
Ternary Check(InputStream& stream, const MaterialParams& parameters)
Ternary Check(Stream& stream, const MaterialParams& parameters)
{
NazaraUnused(stream);
NazaraUnused(parameters);
@@ -20,7 +20,7 @@ namespace Nz
return Ternary_Unknown;
}
bool Load(Material* material, InputStream& stream, const MaterialParams& parameters)
bool Load(Material* material, Stream& stream, const MaterialParams& parameters)
{
NazaraUnused(parameters);

2
src/Nazara/Graphics/Material.cpp
View File

@@ -370,7 +370,7 @@ namespace Nz
return MaterialLoader::LoadFromMemory(this, data, size, params);
}
bool Material::LoadFromStream(InputStream& stream, const MaterialParams& params)
bool Material::LoadFromStream(Stream& stream, const MaterialParams& params)
{
return MaterialLoader::LoadFromStream(this, stream, params);
}

2
src/Nazara/Graphics/Model.cpp
View File

@@ -175,7 +175,7 @@ namespace Nz
return ModelLoader::LoadFromMemory(this, data, size, params);
}
bool Model::LoadFromStream(InputStream& stream, const ModelParameters& params)
bool Model::LoadFromStream(Stream& stream, const ModelParameters& params)
{
return ModelLoader::LoadFromStream(this, stream, params);
}

2
src/Nazara/Graphics/SkeletalModel.cpp
View File

@@ -149,7 +149,7 @@ namespace Nz
return SkeletalModelLoader::LoadFromMemory(this, data, size, params);
}
bool SkeletalModel::LoadFromStream(InputStream& stream, const SkeletalModelParameters& params)
bool SkeletalModel::LoadFromStream(Stream& stream, const SkeletalModelParameters& params)
{
return SkeletalModelLoader::LoadFromStream(this, stream, params);
}