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

Fixed compilation error 

Former-commit-id: d7354d3ab3de1627e7a6985f4377607c4f87607a
This commit is contained in:
Lynix 2013-07-09 01:07:26 +02:00
parent 5b730f1d4c
commit 87a4da40bc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,10 @@
// This file is part of the "Nazara Engine - Graphics module" // This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#ifndef NAZARA_RENDERER_OPENGL
#define NAZARA_RENDERER_OPENGL // Nécessaire pour inclure les headers OpenGL
#endif
#include <Nazara/Renderer/OpenGL.hpp> #include <Nazara/Renderer/OpenGL.hpp>
#include <Nazara/Graphics/ColorBackGround.hpp> #include <Nazara/Graphics/ColorBackGround.hpp>
#include <Nazara/Renderer/Renderer.hpp> #include <Nazara/Renderer/Renderer.hpp>

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

@ -2,6 +2,10 @@
// This file is part of the "Nazara Engine - Graphics module" // This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#ifndef NAZARA_RENDERER_OPENGL
#define NAZARA_RENDERER_OPENGL // Nécessaire pour inclure les headers OpenGL
#endif
#include <Nazara/Renderer/OpenGL.hpp> #include <Nazara/Renderer/OpenGL.hpp>
#include <Nazara/Graphics/TextureBackground.hpp> #include <Nazara/Graphics/TextureBackground.hpp>
#include <Nazara/Renderer/Renderer.hpp> #include <Nazara/Renderer/Renderer.hpp>
@ -11,6 +15,9 @@
namespace namespace
{ {
static NzShader* s_shader = nullptr;
static int s_textureLocation;
NzShader* BuildShader() NzShader* BuildShader()
{ {
const char* fragmentSource110 = const char* fragmentSource110 =
@ -76,20 +83,16 @@ namespace
return nullptr; return nullptr;
} }
s_textureLocation = shader->GetUniformLocation("Texture");
return shader.release(); return shader.release();
} }
static NzShader* s_shader = nullptr;
static unsigned int s_textureLocation;
} }
NzTextureBackground::NzTextureBackground() NzTextureBackground::NzTextureBackground()
{ {
if (!s_shader) if (!s_shader)
{
s_shader = BuildShader(); s_shader = BuildShader();
s_textureLocation = s_shader->GetUniformLocation("Texture");
}
m_shader = s_shader; m_shader = s_shader;
} }