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

Made Initialize/Uninitialize static methods from non-submodules private

Browse Source 
Former-commit-id: 78dac32c8650dc9eb4fd2c7f0bece030012497cf
This commit is contained in:
Lynix
2014-04-21 00:08:34 +02:00
parent 082015fe5a
commit 7d99550925
9 changed files with 157 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/Nazara/Graphics/DeferredRenderTechnique.hpp
View File

@@ -24,6 +24,8 @@
class NAZARA_API NzDeferredRenderTechnique : public NzAbstractRenderTechnique, public NzRenderTarget::Listener
{
friend class NzGraphics;
public:
NzDeferredRenderTechnique();
~NzDeferredRenderTechnique();
@@ -49,13 +51,14 @@ class NAZARA_API NzDeferredRenderTechnique : public NzAbstractRenderTechnique, p
void SetPass(nzRenderPassType relativeTo, int position, NzDeferredRenderPass* pass);
static bool Initialize();
static bool IsSupported();
static void Uninitialize();
private:
bool Resize(const NzVector2ui& dimensions) const;
static bool Initialize();
static void Uninitialize();
struct RenderPassComparator
{
bool operator()(nzRenderPassType pass1, nzRenderPassType pass2);

7
include/Nazara/Graphics/Material.hpp
View File

@@ -41,7 +41,7 @@ using NzMaterialRef = NzResourceRef<NzMaterial>;
class NAZARA_API NzMaterial : public NzResource
{
friend NzMaterialLoader;
friend class NzRenderer;
friend class NzGraphics;
public:
NzMaterial();
@@ -129,9 +129,7 @@ class NAZARA_API NzMaterial : public NzResource
NzMaterial& operator=(const NzMaterial& material);
NzMaterial& operator=(NzMaterial&& material);
static bool Initialize();
static NzMaterial* GetDefault();
static void Uninitialize();
private:
struct ShaderInstance
@@ -145,6 +143,9 @@ class NAZARA_API NzMaterial : public NzResource
void GenerateShader(nzUInt32 flags) const;
void InvalidateShaders();
static bool Initialize();
static void Uninitialize();
NzColor m_ambientColor;
NzColor m_diffuseColor;
NzColor m_specularColor;