Added Texture-to-Material loader
Former-commit-id: 789185ca38b4a995c67dfd054306cb920ca56b74
This commit is contained in:
parent
7f6003085f
commit
38c1cf2ad0
|
|
@ -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
|
||||||
|
|
@ -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);
|
||||||
|
}
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
#include <Nazara/Renderer/RenderTarget.hpp>
|
#include <Nazara/Renderer/RenderTarget.hpp>
|
||||||
#include <Nazara/Renderer/Shader.hpp>
|
#include <Nazara/Renderer/Shader.hpp>
|
||||||
#include <Nazara/Renderer/ShaderImpl.hpp>
|
#include <Nazara/Renderer/ShaderImpl.hpp>
|
||||||
|
#include <Nazara/Renderer/Loaders/Texture.hpp>
|
||||||
#include <Nazara/Utility/BufferImpl.hpp>
|
#include <Nazara/Utility/BufferImpl.hpp>
|
||||||
#include <Nazara/Utility/IndexBuffer.hpp>
|
#include <Nazara/Utility/IndexBuffer.hpp>
|
||||||
#include <Nazara/Utility/Utility.hpp>
|
#include <Nazara/Utility/Utility.hpp>
|
||||||
|
|
@ -449,6 +450,9 @@ bool NzRenderer::Initialize()
|
||||||
NazaraWarning("Failed to initialize debug drawer");
|
NazaraWarning("Failed to initialize debug drawer");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Loaders
|
||||||
|
NzLoaders_Texture_Register();
|
||||||
|
|
||||||
NazaraNotice("Initialized: Renderer module");
|
NazaraNotice("Initialized: Renderer module");
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -903,6 +907,9 @@ void NzRenderer::Uninitialize()
|
||||||
if (--s_moduleReferenceCouter != 0)
|
if (--s_moduleReferenceCouter != 0)
|
||||||
return; // Encore utilisé
|
return; // Encore utilisé
|
||||||
|
|
||||||
|
// Loaders
|
||||||
|
NzLoaders_Texture_Unregister();
|
||||||
|
|
||||||
#ifdef NAZARA_DEBUG
|
#ifdef NAZARA_DEBUG
|
||||||
NzDebugDrawer::Uninitialize();
|
NzDebugDrawer::Uninitialize();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue