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/Renderer/Texture.cpp
View File

@@ -599,7 +599,7 @@ namespace Nz
return LoadFromImage(image, generateMipmaps);
}
bool Texture::LoadFromStream(InputStream& stream, const ImageParams& params, bool generateMipmaps)
bool Texture::LoadFromStream(Stream& stream, const ImageParams& params, bool generateMipmaps)
{
Image image;
if (!image.LoadFromStream(stream, params))
@@ -647,7 +647,7 @@ namespace Nz
return LoadFromImage(cubemap, generateMipmaps);
}
bool Texture::LoadArrayFromStream(InputStream& stream, const ImageParams& imageParams, bool generateMipmaps, const Vector2ui& atlasSize)
bool Texture::LoadArrayFromStream(Stream& stream, const ImageParams& imageParams, bool generateMipmaps, const Vector2ui& atlasSize)
{
Image cubemap;
if (!cubemap.LoadArrayFromStream(stream, imageParams, atlasSize))
@@ -695,7 +695,7 @@ namespace Nz
return LoadFromImage(cubemap, generateMipmaps);
}
bool Texture::LoadCubemapFromStream(InputStream& stream, const ImageParams& imageParams, bool generateMipmaps, const CubemapParams& cubemapParams)
bool Texture::LoadCubemapFromStream(Stream& stream, const ImageParams& imageParams, bool generateMipmaps, const CubemapParams& cubemapParams)
{
Image cubemap;
if (!cubemap.LoadCubemapFromStream(stream, imageParams, cubemapParams))
@@ -785,7 +785,7 @@ namespace Nz
return Update(image, Rectui(0, 0, faceSize, faceSize), face);
}
bool Texture::LoadFaceFromStream(CubemapFace face, InputStream& stream, const ImageParams& params)
bool Texture::LoadFaceFromStream(CubemapFace face, Stream& stream, const ImageParams& params)
{
#if NAZARA_RENDERER_SAFE
if (!m_impl)