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

Merge branch 'NDK' into NDK-ShadowMapping

Browse Source 
Conflicts:
	SDK/include/NDK/Systems/RenderSystem.hpp
	SDK/src/NDK/Systems/RenderSystem.cpp

Former-commit-id: 2772ff703c9d68d536667c469aca85084be4b861
This commit is contained in:
Lynix
2015-09-19 14:47:02 +02:00
parent aa303f9028 67a9dc692a
commit 025d873228
72 changed files with 349 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Renderer/Context.hpp
View File

@@ -47,9 +47,9 @@ class NAZARA_RENDERER_API NzContext : public NzRefCounted
static const NzContext* GetReference();
static const NzContext* GetThreadContext();
// Signals
NazaraSignal(OnContextDestroy, const NzContext*); //< Args: me
NazaraSignal(OnContextRelease, const NzContext*); //< Args: me
// Signals:
NazaraSignal(OnContextDestroy, const NzContext* /*context*/);
NazaraSignal(OnContextRelease, const NzContext* /*context*/);
private:
static bool Initialize();

6
include/Nazara/Renderer/RenderBuffer.hpp
View File

@@ -46,9 +46,9 @@ class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted, NzNonCopyable
static bool IsSupported();
template<typename... Args> static NzRenderBufferRef New(Args&&... args);
// Signals
NazaraSignal(OnRenderBufferDestroy, const NzRenderBuffer*); //< Args: me
NazaraSignal(OnRenderBufferRelease, const NzRenderBuffer*); //< Args: me
// Signals:
NazaraSignal(OnRenderBufferDestroy, const NzRenderBuffer* /*renderBuffer*/);
NazaraSignal(OnRenderBufferRelease, const NzRenderBuffer* /*renderBuffer*/);
private:
static bool Initialize();

8
include/Nazara/Renderer/RenderTarget.hpp
View File

@@ -35,10 +35,10 @@ class NAZARA_RENDERER_API NzRenderTarget
// Fonctions OpenGL
virtual bool HasContext() const = 0;
// Signals
NazaraSignal(OnRenderTargetParametersChange, const NzRenderTarget*); //< Args: me
NazaraSignal(OnRenderTargetRelease, const NzRenderTarget*); //< Args: me
NazaraSignal(OnRenderTargetSizeChange, const NzRenderTarget*); //< Args: me
// Signals:
NazaraSignal(OnRenderTargetParametersChange, const NzRenderTarget* /*renderTarget*/);
NazaraSignal(OnRenderTargetRelease, const NzRenderTarget* /*renderTarget*/);
NazaraSignal(OnRenderTargetSizeChange, const NzRenderTarget* /*renderTarget*/);
protected:
virtual bool Activate() const = 0;

8
include/Nazara/Renderer/Shader.hpp
View File

@@ -103,10 +103,10 @@ class NAZARA_RENDERER_API NzShader : public NzRefCounted, NzNonCopyable
static bool IsStageSupported(nzShaderStage stage);
template<typename... Args> static NzShaderRef New(Args&&... args);
// Signals
NazaraSignal(OnShaderDestroy, const NzShader*); //< Args: me
NazaraSignal(OnShaderRelease, const NzShader*); //< Args: me
NazaraSignal(OnShaderUniformInvalidated, const NzShader*); //< Args: me
// Signals:
NazaraSignal(OnShaderDestroy, const NzShader* /*shader*/);
NazaraSignal(OnShaderRelease, const NzShader* /*shader*/);
NazaraSignal(OnShaderUniformInvalidated, const NzShader* /*shader*/);
private:
bool PostLinkage();

6
include/Nazara/Renderer/Texture.hpp
View File

@@ -108,9 +108,9 @@ class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounte
static bool IsTypeSupported(nzImageType type);
template<typename... Args> static NzTextureRef New(Args&&... args);
// Signals
NazaraSignal(OnTextureDestroy, const NzTexture*); //< Args: me
NazaraSignal(OnTextureRelease, const NzTexture*); //< Args: me
// Signals:
NazaraSignal(OnTextureDestroy, const NzTexture* /*texture*/);
NazaraSignal(OnTextureRelease, const NzTexture* /*texture*/);
private:
bool CreateTexture(bool proxy);

3
include/Nazara/Renderer/UberShader.hpp
View File

@@ -32,7 +32,8 @@ class NAZARA_RENDERER_API NzUberShader : public NzRefCounted
virtual NzUberShaderInstance* Get(const NzParameterList& parameters) const = 0;
NazaraSignal(OnUberShaderRelease, const NzUberShader*); //< Args: me
// Signals:
NazaraSignal(OnUberShaderRelease, const NzUberShader* /*uberShader*/);
private:
static bool Initialize();

2
include/Nazara/Renderer/UberShaderPreprocessor.hpp
View File

@@ -36,7 +36,7 @@ class NAZARA_RENDERER_API NzUberShaderPreprocessor : public NzUberShader
template<typename... Args> static NzUberShaderPreprocessorRef New(Args&&... args);
// Signals:
NazaraSignal(OnUberShaderPreprocessorRelease, const NzUberShaderPreprocessor*); //< Args: me
NazaraSignal(OnUberShaderPreprocessorRelease, const NzUberShaderPreprocessor* /*uberShaderPreprocessor*/);
private:
struct Shader