Added Image

Added pixel format support
Added MemoryStream
Added Rect
Added ResourceLoader
Added generic loader (bmp, gif, hdr, jpg, jpeg, pic, png, psd, tga)
Added PCX loader
Added utility module initializer
Fixed Config.hpp include
Prerequesites.hpp now overwrites _WIN32_WINNT when defined
version is less than requiered version
Renderer's initialisation will implicitly initialize utility module
Removed RENDERER_SINGLETON option
Shaders are now resources

include/Nazara/Core/ByteArray.hpp

@@ -28,11 +28,13 @@ class NAZARA_API NzByteArray : public NzHashable
 		NzByteArray(SharedArray* sharedArray);
 		~NzByteArray();
 
-		unsigned int Capacity() const;
+		NzByteArray& Append(const NzByteArray& byteArray);
 
 		void Clear();
 
-		const nzUInt8* GetBuffer() const;
+		nzUInt8* GetBuffer();
+		unsigned int GetCapacity() const;
+		const nzUInt8* GetConstBuffer() const;
 		unsigned int GetSize() const;
 
 		NzByteArray& Insert(int pos, const nzUInt8* buffer, unsigned int bufferLength);
@@ -42,10 +44,10 @@ class NAZARA_API NzByteArray : public NzHashable
 
 		void Reserve(unsigned int bufferSize);
 
-		NzByteArray& Resize(int size, nzUInt8 byte = '\0');
-		NzByteArray Resized(int size, nzUInt8 byte = '\0') const;
+		NzByteArray& Resize(int size, nzUInt8 byte = 0);
+		NzByteArray Resized(int size, nzUInt8 byte = 0) const;
 
-		NzByteArray SubArray(int startPos, int endPos = -1) const;
+		NzByteArray Subarray(int startPos, int endPos = -1) const;
 
 		void Swap(NzByteArray& byteArray);
 
@@ -88,15 +90,15 @@ class NAZARA_API NzByteArray : public NzHashable
 			{
 			}
 
-			SharedArray(unsigned int bufferSize, unsigned int arraySize, unsigned short referenceCount, nzUInt8* ptr) :
-			allocatedSize(bufferSize),
+			SharedArray(unsigned short referenceCount, unsigned int bufferSize, unsigned int arraySize, nzUInt8* ptr) :
+			capacity(bufferSize),
 			size(arraySize),
 			refCount(referenceCount),
 			buffer(ptr)
 			{
 			}
 
-			unsigned int allocatedSize;
+			unsigned int capacity;
 			unsigned int size;
 			unsigned short refCount;
 			nzUInt8* buffer;
@@ -105,6 +107,7 @@ class NAZARA_API NzByteArray : public NzHashable
 		};
 
 		static SharedArray emptyArray;
+		static unsigned int npos;
 
 	private:
 		void EnsureOwnership();

include/Nazara/Core/InputStream.hpp

@@ -14,8 +14,12 @@ class NzInputStream
 	public:
 		virtual ~NzInputStream();
 
-		virtual bool EndOfFile() const = 0;
+		virtual nzUInt64 GetCursorPos() const = 0;
+		virtual nzUInt64 GetSize() const = 0;
+
 		virtual std::size_t Read(void* buffer, std::size_t size) = 0;
+
+		virtual bool SetCursorPos(nzUInt64 offset) = 0;
 };
 
 #endif // NAZARA_INPUTSTREAM_HPP

include/Nazara/Core/MemoryStream.hpp

@@ -0,0 +1,34 @@
+// Copyright (C) 2012 Jérôme Leclercq
+// This file is part of the "Nazara Engine".
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef NAZARA_MEMORYSTREAM_HPP
+#define NAZARA_MEMORYSTREAM_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/InputStream.hpp>
+
+class NAZARA_API NzMemoryStream : public NzInputStream
+{
+	public:
+		NzMemoryStream(const void* ptr, nzUInt64 size);
+		~NzMemoryStream();
+
+		bool EndOfStream() const;
+
+		nzUInt64 GetCursorPos() const;
+		nzUInt64 GetSize() const;
+
+		std::size_t Read(void* buffer, std::size_t size);
+
+		bool SetCursorPos(nzUInt64 offset);
+
+	private:
+		const nzUInt8* m_ptr;
+		nzUInt64 m_pos;
+		nzUInt64 m_size;
+};
+
+#endif // NAZARA_MEMORYSTREAM_HPP

include/Nazara/Core/String.hpp

@@ -284,14 +284,14 @@ class NAZARA_API NzString : public NzHashable
 			}
 
 			SharedString(unsigned short referenceCount, unsigned int bufferSize, unsigned int stringSize, char* str) :
-			allocatedSize(bufferSize),
+			capacity(bufferSize),
 			size(stringSize),
 			string(str),
 			refCount(referenceCount)
 			{
 			}
 
-			unsigned int allocatedSize;
+			unsigned int capacity;
 			unsigned int size;
 			char* string;