Core: Rename MemoryStream to MemoryView, add MemoryStream

Former-commit-id: c180d5f34fa7c477f35c4b70ebf7b64e3f35fe3d

src/Nazara/Audio/Formats/sndfileLoader.cpp

@@ -14,7 +14,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/InputStream.hpp>
-#include <Nazara/Core/MemoryStream.hpp>
+#include <Nazara/Core/MemoryView.hpp>
 #include <memory>
 #include <set>
 #include <vector>
@@ -124,7 +124,7 @@ namespace Nz
 
 				bool Open(const void* data, std::size_t size, bool forceMono)
 				{
-					m_ownedStream.reset(new MemoryStream(data, size));
+					m_ownedStream.reset(new MemoryView(data, size));
 					return Open(*m_ownedStream, forceMono);
 				}
 

src/Nazara/Core/Log.cpp

@@ -161,5 +161,5 @@ namespace Nz
 	{
 		static Log log;
 		return &log;
-}
+	}
 }

src/Nazara/Core/MemoryStream.cpp

@@ -9,21 +9,22 @@
 
 namespace Nz
 {
-	MemoryStream::MemoryStream(const void* ptr, UInt64 size) :
-	Stream(OpenMode_ReadOnly),
-	m_ptr(reinterpret_cast<const UInt8*>(ptr)),
-	m_pos(0),
-	m_size(size)
-	{
-	}
-
-	MemoryStream::~MemoryStream()
+	MemoryStream::MemoryStream(const void* ptr, unsigned int size) :
+	Stream(OpenMode_ReadWrite),
+	m_pos(0)
 	{
+		m_buffer.resize(size);
+		std::memcpy(m_buffer.data(), ptr, size);
 	}
 
 	bool MemoryStream::EndOfStream() const
 	{
-		return m_pos == m_size;
+		return m_pos >= m_buffer.size();
+	}
+
+	void MemoryStream::Flush()
+	{
+		// Nothing to flush
 	}
 
 	UInt64 MemoryStream::GetCursorPos() const
@@ -33,25 +34,36 @@ namespace Nz
 
 	UInt64 MemoryStream::GetSize() const
 	{
-		return m_size;
+		return m_buffer.size();
 	}
 
 	std::size_t MemoryStream::Read(void* buffer, std::size_t size)
 	{
-		unsigned int readSize = std::min(static_cast<unsigned int>(size), static_cast<unsigned int>(m_size-m_pos));
+		std::size_t readSize = std::min<std::size_t>(size, static_cast<std::size_t>(m_buffer.size() - m_pos));
 
 		if (buffer)
-			std::memcpy(buffer, &m_ptr[m_pos], readSize);
+			std::memcpy(buffer, m_buffer.data() + m_pos, readSize);
 
 		m_pos += readSize;
-
 		return readSize;
 	}
 
 	bool MemoryStream::SetCursorPos(UInt64 offset)
 	{
-		m_pos = std::min(offset, m_size);
+		m_pos = std::min<UInt64>(offset, m_buffer.size());
 
 		return true;
 	}
+
+	std::size_t MemoryStream::Write(const void* buffer, std::size_t size)
+	{
+		std::size_t endPos = static_cast<std::size_t>(m_pos + size);
+		if (endPos > m_buffer.size())
+			m_buffer.resize(endPos);
+
+		std::memcpy(m_buffer.data(), buffer, size);
+		
+		m_pos = endPos;
+		return size;
+	}
 }

src/Nazara/Core/MemoryView.cpp

@@ -0,0 +1,52 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Core module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/Core/MemoryView.hpp>
+#include <algorithm>
+#include <cstring>
+#include <Nazara/Core/Debug.hpp>
+
+namespace Nz
+{
+	MemoryView::MemoryView(const void* ptr, UInt64 size) :
+	Stream(OpenMode_ReadOnly),
+	m_ptr(reinterpret_cast<const UInt8*>(ptr)),
+	m_pos(0),
+	m_size(size)
+	{
+	}
+
+	bool MemoryView::EndOfStream() const
+	{
+		return m_pos >= m_size;
+	}
+
+	UInt64 MemoryView::GetCursorPos() const
+	{
+		return m_pos;
+	}
+
+	UInt64 MemoryView::GetSize() const
+	{
+		return m_size;
+	}
+
+	std::size_t MemoryView::Read(void* buffer, std::size_t size)
+	{
+		std::size_t readSize = std::min<std::size_t>(size, static_cast<std::size_t>(m_size - m_pos));
+
+		if (buffer)
+			std::memcpy(buffer, &m_ptr[m_pos], readSize);
+
+		m_pos += readSize;
+		return readSize;
+	}
+
+	bool MemoryView::SetCursorPos(UInt64 offset)
+	{
+		m_pos = std::min(offset, m_size);
+
+		return true;
+	}
+}

src/Nazara/Lua/LuaInstance.cpp

@@ -10,7 +10,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/MemoryHelper.hpp>
-#include <Nazara/Core/MemoryStream.hpp>
+#include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/StringStream.hpp>
 #include <cstdlib>
 #include <stdexcept>
@@ -418,7 +418,7 @@ namespace Nz
 
 	bool LuaInstance::ExecuteFromMemory(const void* data, unsigned int size)
 	{
-		MemoryStream stream(data, size);
+		MemoryView stream(data, size);
 		return ExecuteFromStream(stream);
 	}
 

src/Nazara/Utility/Formats/FreeTypeLoader.cpp

@@ -9,7 +9,7 @@
 #include FT_OUTLINE_H
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/InputStream.hpp>
-#include <Nazara/Core/MemoryStream.hpp>
+#include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Utility/Font.hpp>
 #include <Nazara/Utility/FontData.hpp>
 #include <Nazara/Utility/FontGlyph.hpp>
@@ -294,7 +294,7 @@ namespace Nz
 
 				void SetMemory(const void* data, std::size_t size)
 				{
-					m_ownedStream.reset(new MemoryStream(data, size));
+					m_ownedStream.reset(new MemoryView(data, size));
 					SetStream(*m_ownedStream);
 				}
 

src/Nazara/Utility/Formats/STBLoader.cpp

@@ -8,7 +8,7 @@
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Core/InputStream.hpp>
-#include <Nazara/Core/MemoryStream.hpp>
+#include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Utility/Image.hpp>
 #include <set>
 #include <Nazara/Utility/Debug.hpp>