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

Update copy/move constructors/operators

Browse Source 
Former-commit-id: b1faeeae9211a6c0ca29261d46929dc8c66ea0c4
This commit is contained in:
Lynix
2015-09-24 12:51:52 +02:00
parent dea3fb4e39
commit c214251ecf
24 changed files with 89 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,8 @@ class NAZARA_RENDERER_API NzContext : public NzRefCounted
public:
NzContext() = default;
NzContext(const NzContext&) = delete;
NzContext(NzContext&&) = delete;
~NzContext();
bool Create(const NzContextParameters& parameters = NzContextParameters());
@@ -47,6 +49,9 @@ class NAZARA_RENDERER_API NzContext : public NzRefCounted
bool SetActive(bool active) const;
void SwapBuffers();
NzContext& operator=(const NzContext&) = delete;
NzContext& operator=(NzContext&&) = delete;
static bool EnsureContext();
static const NzContext* GetCurrent();

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

@@ -21,6 +21,8 @@ class NAZARA_RENDERER_API NzRenderTarget
public:
NzRenderTarget() = default;
NzRenderTarget(const NzRenderTarget&) = delete;
NzRenderTarget(NzRenderTarget&&) = delete; ///TOOD?
virtual ~NzRenderTarget();
virtual unsigned int GetHeight() const = 0;
@@ -35,6 +37,9 @@ class NAZARA_RENDERER_API NzRenderTarget
// Fonctions OpenGL
virtual bool HasContext() const = 0;
NzRenderTarget& operator=(const NzRenderTarget&) = delete;
NzRenderTarget& operator=(NzRenderTarget&&) = delete; ///TOOD?
// Signals:
NazaraSignal(OnRenderTargetParametersChange, const NzRenderTarget* /*renderTarget*/);
NazaraSignal(OnRenderTargetRelease, const NzRenderTarget* /*renderTarget*/);

4
include/Nazara/Renderer/RenderTexture.hpp
View File

@@ -27,7 +27,7 @@ class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget
public:
inline NzRenderTexture();
NzRenderTexture(const NzRenderTexture&) = delete;
NzRenderTexture(NzRenderTexture&&) = delete; ///TODO
NzRenderTexture(NzRenderTexture&&) = delete; ///TODO?
inline ~NzRenderTexture();
bool AttachBuffer(nzAttachmentPoint attachmentPoint, nzUInt8 index, NzRenderBuffer* buffer);
@@ -61,7 +61,7 @@ class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget
bool HasContext() const override;
NzRenderTexture& operator=(const NzRenderTexture&) = delete;
NzRenderTexture& operator=(NzRenderTexture&&) = delete; ///TODO
NzRenderTexture& operator=(NzRenderTexture&&) = delete; ///TODO?
static inline void Blit(NzRenderTexture* src, NzRenderTexture* dst, nzUInt32 buffers = nzRendererBuffer_Color | nzRendererBuffer_Depth | nzRendererBuffer_Stencil, bool bilinearFilter = false);
static void Blit(NzRenderTexture* src, NzRectui srcRect, NzRenderTexture* dst, NzRectui dstRect, nzUInt32 buffers = nzRendererBuffer_Color | nzRendererBuffer_Depth | nzRendererBuffer_Stencil, bool bilinearFilter = false);

5
include/Nazara/Renderer/RenderWindow.hpp
View File

@@ -30,6 +30,8 @@ class NAZARA_RENDERER_API NzRenderWindow : public NzRenderTarget, public NzWindo
NzRenderWindow() = default;
NzRenderWindow(NzVideoMode mode, const NzString& title, nzUInt32 style = nzWindowStyle_Default, const NzContextParameters& parameters = NzContextParameters());
NzRenderWindow(NzWindowHandle handle, const NzContextParameters& parameters = NzContextParameters());
NzRenderWindow(const NzRenderWindow&) = delete;
NzRenderWindow(NzRenderWindow&&) = delete; ///TODO
virtual ~NzRenderWindow();
bool CopyToImage(NzAbstractImage* image, const NzVector3ui& dstPos = NzVector3ui(0U)) const;
@@ -55,6 +57,9 @@ class NAZARA_RENDERER_API NzRenderWindow : public NzRenderTarget, public NzWindo
NzContextParameters GetContextParameters() const;
bool HasContext() const override;
NzRenderWindow& operator=(const NzRenderWindow&) = delete;
NzRenderWindow& operator=(NzRenderWindow&&) = delete; ///TODO
protected:
bool Activate() const override;
void EnsureTargetUpdated() const override;

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

@@ -28,10 +28,15 @@ class NAZARA_RENDERER_API NzUberShader : public NzRefCounted
public:
NzUberShader() = default;
NzUberShader(const NzUberShader&) = delete;
NzUberShader(NzUberShader&&) = delete;
virtual ~NzUberShader();
virtual NzUberShaderInstance* Get(const NzParameterList& parameters) const = 0;
NzUberShader& operator=(const NzUberShader&) = delete;
NzUberShader& operator=(NzUberShader&&) = delete;
// Signals:
NazaraSignal(OnUberShaderRelease, const NzUberShader* /*uberShader*/);

5
include/Nazara/Renderer/UberShaderInstance.hpp
View File

@@ -14,12 +14,17 @@ class NAZARA_RENDERER_API NzUberShaderInstance
{
public:
NzUberShaderInstance(const NzShader* shader);
NzUberShaderInstance(const NzUberShaderInstance&) = delete;
NzUberShaderInstance(NzUberShaderInstance&&) = delete;
virtual ~NzUberShaderInstance();
virtual bool Activate() const = 0;
const NzShader* GetShader() const;
NzUberShaderInstance& operator=(const NzUberShaderInstance&) = delete;
NzUberShaderInstance& operator=(NzUberShaderInstance&&) = delete;
protected:
NzShaderConstRef m_shader;
};