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

Replaced (Uber)ShaderLibrary by template class ObjectLibrary

Browse Source 
Former-commit-id: d488cfd4e5e3ff31112fffebce2b7cdb86cc2e55
This commit is contained in:
Lynix
2015-01-28 15:49:04 +01:00
parent c2d1773b41
commit e18e490c59
23 changed files with 152 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Nazara/Graphics/ColorBackground.cpp
View File

@@ -4,7 +4,6 @@
#include <Nazara/Graphics/ColorBackGround.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/UberShaderLibrary.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp>

1
src/Nazara/Graphics/DeferredBloomPass.cpp
View File

@@ -4,7 +4,6 @@
#include <Nazara/Graphics/DeferredBloomPass.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp>

1
src/Nazara/Graphics/DeferredDOFPass.cpp
View File

@@ -7,7 +7,6 @@
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderTexture.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp>

1
src/Nazara/Graphics/DeferredFXAAPass.cpp
View File

@@ -5,7 +5,6 @@
#include <Nazara/Graphics/DeferredFXAAPass.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderTexture.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp>

1
src/Nazara/Graphics/DeferredFinalPass.cpp
View File

@@ -6,7 +6,6 @@
#include <Nazara/Graphics/AbstractViewer.hpp>
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/UberShaderLibrary.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp>

1
src/Nazara/Graphics/DeferredGeometryPass.cpp
View File

@@ -10,7 +10,6 @@
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderTexture.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/StaticMesh.hpp>
#include <Nazara/Utility/VertexStruct.hpp>

1
src/Nazara/Graphics/DeferredPhongLightingPass.cpp
View File

@@ -8,7 +8,6 @@
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderTexture.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <Nazara/Utility/StaticMesh.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp>

1
src/Nazara/Graphics/DeferredRenderTechnique.cpp
View File

@@ -27,7 +27,6 @@
#include <Nazara/Renderer/OpenGL.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <Nazara/Renderer/ShaderStage.hpp>
#include <limits>
#include <memory>

1
src/Nazara/Graphics/Material.cpp
View File

@@ -9,7 +9,6 @@
#include <Nazara/Graphics/Material.hpp>
#include <Nazara/Renderer/OpenGL.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/UberShaderLibrary.hpp>
#include <Nazara/Renderer/UberShaderPreprocessor.hpp>
#include <cstring>
#include <memory>

1
src/Nazara/Graphics/TextureBackground.cpp
View File

@@ -4,7 +4,6 @@
#include <Nazara/Graphics/TextureBackground.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/UberShaderLibrary.hpp>
#include <memory>
#include <Nazara/Graphics/Debug.hpp>

1
src/Nazara/Renderer/DebugDrawer.cpp
View File

@@ -8,7 +8,6 @@
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/RenderStates.hpp>
#include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/Mesh.hpp>
#include <Nazara/Utility/Skeleton.hpp>

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

@@ -16,9 +16,8 @@
#include <Nazara/Renderer/OpenGL.hpp>
#include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Renderer/ShaderLibrary.hpp>
#include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Renderer/UberShaderLibrary.hpp>
#include <Nazara/Renderer/UberShader.hpp>
#include <Nazara/Utility/AbstractBuffer.hpp>
#include <Nazara/Utility/IndexBuffer.hpp>
#include <Nazara/Utility/Utility.hpp>
@@ -865,9 +864,9 @@ bool NzRenderer::Initialize()
}
}
if (!NzShaderLibrary::Initialize())
if (!NzShader::Initialize())
{
NazaraError("Failed to initialize shader library");
NazaraError("Failed to initialize shaders");
return false;
}
@@ -877,9 +876,9 @@ bool NzRenderer::Initialize()
return false;
}
if (!NzUberShaderLibrary::Initialize())
if (!NzUberShader::Initialize())
{
NazaraError("Failed to initialize uber shader library");
NazaraError("Failed to initialize uber shaders");
return false;
}
@@ -1544,9 +1543,9 @@ void NzRenderer::Uninitialize()
NzShaderLibrary::Unregister("DebugSimple");
NzUberShaderLibrary::Uninitialize();
NzUberShader::Uninitialize();
NzTextureSampler::Uninitialize();
NzShaderLibrary::Uninitialize();
NzShader::Uninitialize();
NzDebugDrawer::Uninitialize();
s_textureUnits.clear();

18
src/Nazara/Renderer/Shader.cpp
View File

@@ -787,3 +787,21 @@ bool NzShader::PostLinkage()
return false;
}
}
bool NzShader::Initialize()
{
if (!NzShaderLibrary::Initialize())
{
NazaraError("Failed to initialise library");
return false;
}
return true;
}
void NzShader::Uninitialize()
{
NzShaderLibrary::Uninitialize();
}
NzShaderLibrary::LibraryMap NzShader::s_library;

51
src/Nazara/Renderer/ShaderLibrary.cpp
View File

@@ -1,51 +0,0 @@
// Copyright (C) 2015 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/ShaderLibrary.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Renderer/Debug.hpp>
NzShader* NzShaderLibrary::Get(const NzString& name)
{
auto it = s_library.find(name);
if (it != s_library.end())
return it->second;
else
{
NazaraError("Shader \"" + name + "\" is not present");
return nullptr;
}
}
bool NzShaderLibrary::Has(const NzString& name)
{
return s_library.find(name) != s_library.end();
}
void NzShaderLibrary::Register(const NzString& name, NzShader* shader)
{
s_library.emplace(name, shader);
NazaraDebug("Shader \"" + name + "\" registred");
}
void NzShaderLibrary::Unregister(const NzString& name)
{
s_library.erase(name);
NazaraDebug("Shader \"" + name + "\" unregistred");
}
bool NzShaderLibrary::Initialize()
{
return true; // Que faire
}
void NzShaderLibrary::Uninitialize()
{
for (auto it : s_library)
NazaraWarning("Shader \"" + it.first + "\" has not been unregistred");
s_library.clear();
}
std::unordered_map<NzString, NzShaderRef> NzShaderLibrary::s_library;

18
src/Nazara/Renderer/UberShader.cpp
View File

@@ -6,3 +6,21 @@
#include <Nazara/Renderer/Debug.hpp>
NzUberShader::~NzUberShader() = default;
bool NzUberShader::Initialize()
{
if (!NzUberShaderLibrary::Initialize())
{
NazaraError("Failed to initialise library");
return false;
}
return true;
}
void NzUberShader::Uninitialize()
{
NzUberShaderLibrary::Uninitialize();
}
NzUberShaderLibrary::LibraryMap NzUberShader::s_library;

51
src/Nazara/Renderer/UberShaderLibrary.cpp
View File

@@ -1,51 +0,0 @@
// Copyright (C) 2015 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/UberShaderLibrary.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Renderer/Debug.hpp>
NzUberShader* NzUberShaderLibrary::Get(const NzString& name)
{
auto it = s_library.find(name);
if (it != s_library.end())
return it->second;
else
{
NazaraError("UberShader \"" + name + "\" is not present");
return nullptr;
}
}
bool NzUberShaderLibrary::Has(const NzString& name)
{
return s_library.find(name) != s_library.end();
}
void NzUberShaderLibrary::Register(const NzString& name, NzUberShader* uberShader)
{
s_library.emplace(name, uberShader);
NazaraDebug("UberShader \"" + name + "\" registred");
}
void NzUberShaderLibrary::Unregister(const NzString& name)
{
s_library.erase(name);
NazaraDebug("UberShader \"" + name + "\" unregistred");
}
bool NzUberShaderLibrary::Initialize()
{
return true; // Que faire
}
void NzUberShaderLibrary::Uninitialize()
{
for (auto it : s_library)
NazaraWarning("UberShader \"" + it.first + "\" has not been unregistred");
s_library.clear();
}
std::unordered_map<NzString, NzUberShaderRef> NzUberShaderLibrary::s_library;