sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Texture-to-Material loader

Browse Source 
Former-commit-id: 789185ca38b4a995c67dfd054306cb920ca56b74
This commit is contained in:
Lynix
2012-11-25 19:33:58 +01:00
parent 7f6003085f
commit 38c1cf2ad0
3 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Nazara/Renderer/Renderer.cpp
View File

@@ -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),
NzOpenGL::ElementType[element->type],
(element->type == nzElementType_Color) ? GL_TRUE : GL_FALSE,
stride,
&buffer[element->offset]);
NzVertexDeclaration::GetElementCount(element->type),
NzOpenGL::ElementType[element->type],
(element->type == nzElementType_Color) ? GL_TRUE : GL_FALSE,
stride,
&buffer[element->offset]);
}
else
glDisableVertexAttribArray(NzOpenGL::AttributeIndex[i]);