Added Texture-to-Material loader

Former-commit-id: 789185ca38b4a995c67dfd054306cb920ca56b74

src/Nazara/Renderer/Loaders/Texture.hpp

@@ -0,0 +1,15 @@
+// Copyright (C) 2012 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Renderer module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef NAZARA_LOADERS_TEXTURE_HPP
+#define NAZARA_LOADERS_TEXTURE_HPP
+
+#include <Nazara/Prerequesites.hpp>
+
+void NzLoaders_Texture_Register();
+void NzLoaders_Texture_Unregister();
+
+#endif // NAZARA_LOADERS_TEXTURE_HPP

src/Nazara/Renderer/Loaders/Texture/Loader.cpp

@@ -0,0 +1,48 @@
+// Copyright (C) 2012 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Renderer module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/Renderer/Loaders/Texture.hpp>
+#include <Nazara/Renderer/Material.hpp>
+#include <Nazara/Renderer/Texture.hpp>
+#include <Nazara/Utility/Debug.hpp>
+
+namespace
+{
+	bool Check(NzInputStream& stream, const NzMaterialParams& parameters)
+	{
+		NazaraUnused(stream);
+		NazaraUnused(parameters);
+
+		return true; ///FIXME: Pas bon
+	}
+
+	bool Load(NzMaterial* material, NzInputStream& stream, const NzMaterialParams& parameters)
+	{
+		NazaraUnused(parameters);
+
+		NzTexture* texture = new NzTexture;
+		if (!texture->LoadFromStream(stream))
+		{
+			NazaraError("Failed to load diffuse map");
+			return false;
+		}
+
+		material->Reset();
+		material->SetDiffuseMap(texture);
+		texture->SetPersistent(false);
+
+		return true;
+	}
+}
+
+void NzLoaders_Texture_Register()
+{
+	///FIXME: Pas bon
+	NzMaterialLoader::RegisterLoader("bmp,gif,hdr,jpg,jpeg,pic,png,psd,tga", Check, Load);
+}
+
+void NzLoaders_Texture_Unregister()
+{
+	NzMaterialLoader::UnregisterLoader("bmp,gif,hdr,jpg,jpeg,pic,png,psd,tga", Check, Load);
+}

src/Nazara/Renderer/Renderer.cpp

@@ -14,6 +14,7 @@
 #include <Nazara/Renderer/RenderTarget.hpp>
 #include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Renderer/ShaderImpl.hpp>
+#include <Nazara/Renderer/Loaders/Texture.hpp>
 #include <Nazara/Utility/BufferImpl.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/Utility.hpp>
@@ -449,6 +450,9 @@ bool NzRenderer::Initialize()
 		NazaraWarning("Failed to initialize debug drawer");
 	#endif
 
+	// Loaders
+	NzLoaders_Texture_Register();
+
 	NazaraNotice("Initialized: Renderer module");
 
 	return true;
@@ -903,6 +907,9 @@ void NzRenderer::Uninitialize()
 	if (--s_moduleReferenceCouter != 0)
 		return; // Encore utilisé
 
+	// Loaders
+	NzLoaders_Texture_Unregister();
+
 	#ifdef NAZARA_DEBUG
 	NzDebugDrawer::Uninitialize();
 	#endif
@@ -1065,11 +1072,11 @@ bool NzRenderer::EnsureStateUpdate()
 
 					glEnableVertexAttribArray(NzOpenGL::AttributeIndex[i]);
 					glVertexAttribPointer(NzOpenGL::AttributeIndex[i],
-										  NzVertexDeclaration::GetElementCount(element->type),
+					                      NzVertexDeclaration::GetElementCount(element->type),
-										  NzOpenGL::ElementType[element->type],
+					                      NzOpenGL::ElementType[element->type],
-										  (element->type == nzElementType_Color) ? GL_TRUE : GL_FALSE,
+					                      (element->type == nzElementType_Color) ? GL_TRUE : GL_FALSE,
-										  stride,
+					                      stride,
-										  &buffer[element->offset]);
+					                      &buffer[element->offset]);
 				}
 				else
 					glDisableVertexAttribArray(NzOpenGL::AttributeIndex[i]);