Moved buffers to Utility

Fixed NzVector4::operator/
Replaced enumName_Count by enumName_Max
Renamed (Index/Vertex)Buffer::GetBufferPtr by GetPointer

include/Nazara/Utility/Buffer.hpp

@@ -0,0 +1,98 @@
+// 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_BUFFER_HPP
+#define NAZARA_BUFFER_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/NonCopyable.hpp>
+#include <Nazara/Utility/Resource.hpp>
+
+enum nzBufferAccess
+{
+	nzBufferAccess_DiscardAndWrite,
+	nzBufferAccess_ReadOnly,
+	nzBufferAccess_ReadWrite,
+	nzBufferAccess_WriteOnly
+};
+
+enum nzBufferStorage
+{
+	nzBufferStorage_Hardware,
+	nzBufferStorage_Software,
+
+	nzBufferStorage_Max = nzBufferStorage_Software
+};
+
+enum nzBufferType
+{
+	nzBufferType_Index,
+	nzBufferType_Vertex
+};
+
+enum nzBufferUsage
+{
+	nzBufferUsage_Dynamic,
+	nzBufferUsage_Static
+};
+
+class NzBufferImpl;
+class NzRenderer;
+class NzUtility;
+
+class NAZARA_API NzBuffer : public NzResource, NzNonCopyable
+{
+	friend class NzRenderer;
+	friend class NzUtility;
+
+	public:
+		typedef NzBufferImpl* (*BufferFunction)(NzBuffer* parent, nzBufferType type);
+
+		NzBuffer(nzBufferType type);
+		NzBuffer(nzBufferType type, unsigned int length, nzUInt8 typeSize, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
+		~NzBuffer();
+
+		bool CopyContent(NzBuffer& buffer);
+
+		bool Create(unsigned int length, nzUInt8 typeSize, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
+		void Destroy();
+
+		bool Fill(const void* data, unsigned int offset, unsigned int length);
+
+		NzBufferImpl* GetImpl() const;
+		unsigned int GetLength() const;
+		void* GetPointer();
+		const void* GetPointer() const;
+		unsigned int GetSize() const;
+		nzBufferStorage GetStorage() const;
+		nzBufferType GetType() const;
+		nzUInt8 GetTypeSize() const;
+		nzBufferUsage GetUsage() const;
+
+		bool IsHardware() const;
+		bool IsValid() const;
+
+		void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0);
+		bool Unmap();
+
+		static bool IsSupported(nzBufferStorage storage);
+		static void SetBufferFunction(nzBufferStorage storage, BufferFunction func);
+
+	private:
+		static bool Initialize();
+		static void Uninitialize();
+
+		nzBufferStorage m_storage;
+		nzBufferType m_type;
+		nzBufferUsage m_usage;
+		nzUInt8 m_typeSize;
+		NzBufferImpl* m_impl;
+		unsigned int m_length;
+
+		static BufferFunction s_bufferFunctions[nzBufferStorage_Max+1];
+};
+
+#endif // NAZARA_BUFFER_HPP

include/Nazara/Utility/BufferImpl.hpp

@@ -0,0 +1,31 @@
+// 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_BUFFERIMPL_HPP
+#define NAZARA_BUFFERIMPL_HPP
+
+#include <Nazara/Utility/Buffer.hpp>
+
+class NAZARA_API NzBufferImpl
+{
+	public:
+		NzBufferImpl() = default;
+		virtual ~NzBufferImpl();
+
+		virtual bool Create(unsigned int size, nzBufferUsage usage = nzBufferUsage_Static) = 0;
+		virtual void Destroy() = 0;
+
+		virtual bool Fill(const void* data, unsigned int offset, unsigned int size) = 0;
+
+		virtual void* GetPointer() = 0;
+
+		virtual bool IsHardware() const = 0;
+
+		virtual void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int size = 0) = 0;
+		virtual bool Unmap() = 0;
+};
+
+#endif // NAZARA_BUFFERIMPL_INCLUDED

include/Nazara/Utility/Image.hpp

@@ -35,7 +35,7 @@ enum nzImageType
 	nzImageType_3D,
 	nzImageType_Cubemap,
 
-	nzImageType_Count
+	nzImageType_Max = nzImageType_Cubemap
 };
 
 struct NzImageParams

include/Nazara/Utility/IndexBuffer.hpp

@@ -0,0 +1,43 @@
+// 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_INDEXBUFFER_HPP
+#define NAZARA_INDEXBUFFER_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Utility/Buffer.hpp>
+
+class NAZARA_API NzIndexBuffer
+{
+	public:
+		NzIndexBuffer(NzBuffer* buffer, unsigned int startIndex, unsigned int indexCount);
+		NzIndexBuffer(unsigned int length, nzUInt8 indexSize, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
+		NzIndexBuffer(const NzIndexBuffer& indexBuffer);
+		~NzIndexBuffer();
+
+		bool Fill(const void* data, unsigned int offset, unsigned int length);
+
+		NzBuffer* GetBuffer() const;
+		nzUInt8 GetIndexSize() const;
+		unsigned int GetIndexCount() const;
+		void* GetPointer();
+		const void* GetPointer() const;
+		unsigned int GetStartIndex() const;
+
+		bool IsHardware() const;
+		bool IsSequential() const;
+
+		void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0);
+		bool Unmap();
+
+	private:
+		NzBuffer* m_buffer;
+		bool m_ownsBuffer;
+		unsigned int m_indexCount;
+		unsigned int m_startIndex;
+};
+
+#endif // NAZARA_INDEXBUFFER_HPP

include/Nazara/Utility/PixelFormat.hpp

@@ -46,7 +46,7 @@ enum nzPixelFormat
 	nzPixelFormat_Stencil16,
 	*/
 
-	nzPixelFormat_Count
+	nzPixelFormat_Max = nzPixelFormat_RGBA8
 };
 
 class NzUtility;
@@ -69,7 +69,7 @@ class NzPixelFormat
 		static bool IsConversionSupported(nzPixelFormat srcFormat, nzPixelFormat dstFormat);
 		static bool IsValid(nzPixelFormat format);
 
-		static void SetConvertFunction(nzPixelFormat srcFormat, nzPixelFormat dstFormat, ConvertFunction);
+		static void SetConvertFunction(nzPixelFormat srcFormat, nzPixelFormat dstFormat, ConvertFunction func);
 
 		static NzString ToString(nzPixelFormat format);
 
@@ -77,7 +77,7 @@ class NzPixelFormat
 		static bool Initialize();
 		static void Uninitialize();
 
-		static NAZARA_API ConvertFunction s_convertFunctions[nzPixelFormat_Count][nzPixelFormat_Count];
+		static NAZARA_API ConvertFunction s_convertFunctions[nzPixelFormat_Max+1][nzPixelFormat_Max+1];
 };
 
 #include <Nazara/Utility/PixelFormat.inl>

include/Nazara/Utility/PixelFormat.inl

@@ -129,7 +129,6 @@ inline nzUInt8 NzPixelFormat::GetBPP(nzPixelFormat format)
 		case nzPixelFormat_RGBA8:
 			return 4;
 
-		case nzPixelFormat_Count:
 		case nzPixelFormat_Undefined:
 			NazaraError("Invalid pixel format");
 			return 0;
@@ -159,7 +158,6 @@ inline bool NzPixelFormat::HasAlpha(nzPixelFormat format)
 		case nzPixelFormat_RGB8:
 			return false;
 
-		case nzPixelFormat_Count:
 		case nzPixelFormat_Undefined:
 			break;
 	}
@@ -192,15 +190,7 @@ inline bool NzPixelFormat::IsConversionSupported(nzPixelFormat srcFormat, nzPixe
 
 inline bool NzPixelFormat::IsValid(nzPixelFormat format)
 {
-	switch (format)
-	{
-		case nzPixelFormat_Count:
-		case nzPixelFormat_Undefined:
-			return false;
-
-		default:
-			return true;
-	}
+	return format != nzPixelFormat_Undefined;
 }
 
 inline void NzPixelFormat::SetConvertFunction(nzPixelFormat srcFormat, nzPixelFormat dstFormat, ConvertFunction func)
@@ -269,7 +259,6 @@ inline NzString NzPixelFormat::ToString(nzPixelFormat format)
 		case nzPixelFormat_RGBA8:
 			return "RGBA8";
 
-		case nzPixelFormat_Count:
 		case nzPixelFormat_Undefined:
 			break;
 	}

include/Nazara/Utility/VertexBuffer.hpp

@@ -0,0 +1,42 @@
+// 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_VERTEXBUFFER_HPP
+#define NAZARA_VERTEXBUFFER_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Utility/Buffer.hpp>
+
+class NAZARA_API NzVertexBuffer
+{
+	public:
+		NzVertexBuffer(NzBuffer* buffer, unsigned int startVertex, unsigned int vertexCount);
+		NzVertexBuffer(unsigned int length, nzUInt8 typeSize, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
+		NzVertexBuffer(const NzVertexBuffer& vertexBuffer);
+		~NzVertexBuffer();
+
+		bool Fill(const void* data, unsigned int offset, unsigned int length);
+
+		NzBuffer* GetBuffer() const;
+		void* GetPointer();
+		const void* GetPointer() const;
+		unsigned int GetStartVertex() const;
+		nzUInt8 GetTypeSize() const;
+		unsigned int GetVertexCount() const;
+
+		bool IsHardware() const;
+
+		void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int length = 0);
+		bool Unmap();
+
+	private:
+		NzBuffer* m_buffer;
+		bool m_ownsBuffer;
+		unsigned int m_startVertex;
+		unsigned int m_vertexCount;
+};
+
+#endif // NAZARA_VERTEXBUFFER_HPP

include/Nazara/Utility/VertexDeclaration.hpp

@@ -0,0 +1,75 @@
+// 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
+
+#ifndef NAZARA_VERTEXDECLARATION_HPP
+#define NAZARA_VERTEXDECLARATION_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <vector>
+
+enum nzElementType
+{
+	nzElementType_Color,
+	nzElementType_Double1,
+	nzElementType_Double2,
+	nzElementType_Double3,
+	nzElementType_Double4,
+	nzElementType_Float1,
+	nzElementType_Float2,
+	nzElementType_Float3,
+	nzElementType_Float4
+};
+
+enum nzElementUsage
+{
+	nzElementUsage_Diffuse,
+	nzElementUsage_Normal,
+	nzElementUsage_Position,
+	nzElementUsage_Tangent,
+	nzElementUsage_TexCoord
+};
+
+struct NzVertexElement
+{
+	NzVertexElement() : stream(0), usageIndex(0) {}
+
+	unsigned int offset;
+	unsigned int stream;
+	unsigned int usageIndex;
+	nzElementType type;
+	nzElementUsage usage;
+};
+
+class NAZARA_API NzVertexDeclaration
+{
+	public:
+		struct Element
+		{
+			unsigned int offset;
+			unsigned int usageIndex;
+			nzElementType type;
+			nzElementUsage usage;
+		};
+
+		NzVertexDeclaration() = default;
+		~NzVertexDeclaration() = default;
+
+		bool Create(const NzVertexElement* elements, unsigned int elementCount);
+
+		const Element* GetElement(unsigned int i, unsigned int stream = 0) const;
+		unsigned int GetElementCount(unsigned int stream = 0) const;
+		unsigned int GetStreamCount() const;
+		unsigned int GetStride(unsigned int stream = 0) const;
+
+	private:
+		struct Stream
+		{
+			std::vector<Element> elements;
+			unsigned int stride;
+		};
+
+		std::vector<Stream> m_streams;
+};
+
+#endif // NAZARA_VERTEXDECLARATION_HPP