Changed default material

Former-commit-id: 60fe21986d8cdd22e89ea4ccfbb9c5b33ba8eed6
This commit is contained in:
Lynix
2013-06-26 19:59:34 +02:00
parent 57e12a2625
commit abe56631dd
3 changed files with 30 additions and 13 deletions

View File

@@ -755,6 +755,14 @@ bool NzRenderer::Initialize()
s_quadBuffer = new NzVertexBuffer(declaration.get(), 4, nzBufferStorage_Hardware, nzBufferUsage_Dynamic);
declaration.release();
if (!NzMaterial::Initialize())
{
NazaraError("Failed to initialize materials");
Uninitialize();
return false;
}
if (!NzShaderBuilder::Initialize())
{
NazaraError("Failed to initialize shader builder");
@@ -1293,6 +1301,7 @@ void NzRenderer::Uninitialize()
NzLoaders_Texture_Unregister();
NzDebugDrawer::Uninitialize();
NzMaterial::Uninitialize();
NzShaderBuilder::Uninitialize();
NzTextureSampler::Uninitialize();
@@ -1387,6 +1396,7 @@ bool NzRenderer::EnsureStateUpdate()
{
TextureUnit& unit = s_textureUnits[i];
///FIXME: Cet appel ne fait-il pas redondance avec le rebinding des textures avant le return ?
if (!unit.textureUpdated)
{
NzOpenGL::SetTextureUnit(i);