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

Renamed XImpl to AbstractX (More consistent)

Browse Source 
Where * is Buffer, Hash and Shader


Former-commit-id: a99681ab1d515c9b39e6ba5f447c9000ef1092b8
This commit is contained in:
Lynix
2013-05-21 13:54:10 +02:00
parent 4b68ff0118
commit 8f09eea340
31 changed files with 78 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@
#include <Nazara/Core/Color.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Renderer/AbstractShader.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/Context.hpp>
#include <Nazara/Renderer/DebugDrawer.hpp>
@@ -15,9 +16,8 @@
#include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Renderer/ShaderBuilder.hpp>
#include <Nazara/Renderer/ShaderImpl.hpp>
#include <Nazara/Renderer/Loaders/Texture.hpp>
#include <Nazara/Utility/BufferImpl.hpp>
#include <Nazara/Utility/AbstractBuffer.hpp>
#include <Nazara/Utility/IndexBuffer.hpp>
#include <Nazara/Utility/Utility.hpp>
#include <Nazara/Utility/VertexBuffer.hpp>
@@ -62,7 +62,7 @@ namespace
bool textureUpdated = true;
};
NzBufferImpl* HardwareBufferFunction(NzBuffer* parent, nzBufferType type)
NzAbstractBuffer* HardwareBufferFunction(NzBuffer* parent, nzBufferType type)
{
return new NzHardwareBuffer(parent, type);
}
@@ -1433,7 +1433,7 @@ bool NzRenderer::EnsureStateUpdate()
}
#endif
NzShaderImpl* shaderImpl;
NzAbstractShader* shaderImpl;
if (s_updateFlags & Update_Shader)
{
@@ -1664,7 +1664,10 @@ bool NzRenderer::EnsureStateUpdate()
}
}
else
glDisableVertexAttribArray(NzOpenGL::AttributeIndex[nzElementUsage_TexCoord]+8);
{
for (unsigned int i = 8; i < 8+4; ++i)
glDisableVertexAttribArray(NzOpenGL::AttributeIndex[nzElementUsage_TexCoord]+i);
}
if (s_indexBuffer)
{