Core: Rename MemoryStream to MemoryView, add MemoryStream

Former-commit-id: c180d5f34fa7c477f35c4b70ebf7b64e3f35fe3d

include/Nazara/Core.hpp

@@ -57,6 +57,7 @@
 #include <Nazara/Core/MemoryManager.hpp>
 #include <Nazara/Core/MemoryPool.hpp>
 #include <Nazara/Core/MemoryStream.hpp>
+#include <Nazara/Core/MemoryView.hpp>
 #include <Nazara/Core/Mutex.hpp>
 #include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectRef.hpp>

include/Nazara/Core/InputStream.hpp

@@ -12,7 +12,7 @@
 
 namespace Nz
 {
-	class NAZARA_CORE_API InputStream : public virtual Stream
+	class NAZARA_CORE_API InputStream : virtual public Stream
 	{
 		public:
 			virtual ~InputStream();

include/Nazara/Core/MemoryStream.hpp

@@ -9,33 +9,38 @@
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/InputStream.hpp>
+#include <Nazara/Core/OutputStream.hpp>
+#include <vector>
 
 namespace Nz
 {
-	class NAZARA_CORE_API MemoryStream : public InputStream
+	class NAZARA_CORE_API MemoryStream : public InputStream, public OutputStream
 	{
 		public:
-			MemoryStream(const void* ptr, UInt64 size);
-			MemoryStream(const MemoryStream&) = delete;
-			MemoryStream(MemoryStream&&) = delete; ///TODO
-			~MemoryStream();
+			MemoryStream(const void* ptr, unsigned int size);
+			MemoryStream(const MemoryStream&) = default;
+			MemoryStream(MemoryStream&&) = default;
+			~MemoryStream() = default;
 
-			bool EndOfStream() const;
+			bool EndOfStream() const override;
 
-			UInt64 GetCursorPos() const;
-			UInt64 GetSize() const;
+			void Flush() override;
 
-			std::size_t Read(void* buffer, std::size_t size);
+			UInt64 GetCursorPos() const override;
+			UInt64 GetSize() const override;
 
-			bool SetCursorPos(UInt64 offset);
+			std::size_t Read(void* buffer, std::size_t size) override;
 
-			MemoryStream& operator=(const MemoryStream&) = delete;
-			MemoryStream& operator=(MemoryStream&&) = delete; ///TODO
+			bool SetCursorPos(UInt64 offset) override;
+
+			std::size_t Write(const void* buffer, std::size_t size) override;
+
+			MemoryStream& operator=(const MemoryStream&) = default;
+			MemoryStream& operator=(MemoryStream&&) = default;
 
 		private:
-			const UInt8* m_ptr;
+			std::vector<UInt8> m_buffer;
 			UInt64 m_pos;
-			UInt64 m_size;
 	};
 }
 

include/Nazara/Core/MemoryView.hpp

@@ -0,0 +1,42 @@
+// 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
+
+#pragma once
+
+#ifndef NAZARA_MEMORYVIEW_HPP
+#define NAZARA_MEMORYVIEW_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/InputStream.hpp>
+
+namespace Nz
+{
+	class NAZARA_CORE_API MemoryView : public InputStream
+	{
+		public:
+			MemoryView(const void* ptr, UInt64 size);
+			MemoryView(const MemoryView&) = delete;
+			MemoryView(MemoryView&&) = delete; ///TODO
+			~MemoryView() = default;
+
+			bool EndOfStream() const override;
+
+			UInt64 GetCursorPos() const override;
+			UInt64 GetSize() const override;
+
+			std::size_t Read(void* buffer, std::size_t size) override;
+
+			bool SetCursorPos(UInt64 offset) override;
+
+			MemoryView& operator=(const MemoryView&) = delete;
+			MemoryView& operator=(MemoryView&&) = delete; ///TODO
+
+		private:
+			const UInt8* m_ptr;
+			UInt64 m_pos;
+			UInt64 m_size;
+	};
+}
+
+#endif // NAZARA_MEMORYVIEW_HPP

include/Nazara/Core/OutputStream.hpp

@@ -12,7 +12,7 @@
 
 namespace Nz
 {
-	class NAZARA_CORE_API OutputStream : public virtual Stream
+	class NAZARA_CORE_API OutputStream : virtual public Stream
 	{
 		public:
 			virtual ~OutputStream();

include/Nazara/Core/ResourceLoader.inl

@@ -6,7 +6,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/Core/Debug.hpp>
 
 namespace Nz
@@ -139,7 +139,7 @@ namespace Nz
 		}
 		#endif
 
-		MemoryStream stream(data, size);
+		MemoryView stream(data, size);
 
 		bool found = false;
 		for (Loader& loader : Type::s_loaders)

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>