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

Core: Remove NonCopyable

Browse Source 
Former-commit-id: f8c6d10ad0b1abb4a32e3c867b7f24fd4bde68a4
This commit is contained in:
Lynix
2015-09-24 00:37:21 +02:00
parent b16abf0d09
commit 2fd3872099
39 changed files with 205 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,14 +8,15 @@
#define NAZARA_GPUQUERY_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/Enums.hpp>
class NAZARA_RENDERER_API NzGpuQuery : NzNonCopyable
class NAZARA_RENDERER_API NzGpuQuery
{
public:
NzGpuQuery();
NzGpuQuery(const NzGpuQuery&) = delete;
NzGpuQuery(NzGpuQuery&&) = delete; ///TODO
~NzGpuQuery();
void Begin(nzGpuQueryMode mode);
@@ -28,6 +29,9 @@ class NAZARA_RENDERER_API NzGpuQuery : NzNonCopyable
// Fonctions OpenGL
unsigned int GetOpenGLID() const;
NzGpuQuery& operator=(const NzGpuQuery&) = delete;
NzGpuQuery& operator=(NzGpuQuery&&) = delete; ///TODO
static bool IsModeSupported(nzGpuQueryMode mode);
static bool IsSupported();

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

@@ -8,7 +8,6 @@
#define NAZARA_RENDERBUFFER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/ObjectLibrary.hpp>
#include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp>
@@ -22,13 +21,15 @@ using NzRenderBufferConstRef = NzObjectRef<const NzRenderBuffer>;
using NzRenderBufferLibrary = NzObjectLibrary<NzRenderBuffer>;
using NzRenderBufferRef = NzObjectRef<NzRenderBuffer>;
class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted, NzNonCopyable
class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted
{
friend NzRenderBufferLibrary;
friend class NzRenderer;
public:
NzRenderBuffer();
NzRenderBuffer(const NzRenderBuffer&) = delete;
NzRenderBuffer(NzRenderBuffer&&) = delete;
~NzRenderBuffer();
bool Create(nzPixelFormat format, unsigned int width, unsigned int height);
@@ -43,6 +44,9 @@ class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted, NzNonCopyable
bool IsValid() const;
NzRenderBuffer& operator=(const NzRenderBuffer&) = delete;
NzRenderBuffer& operator=(NzRenderBuffer&&) = delete;
static bool IsSupported();
template<typename... Args> static NzRenderBufferRef New(Args&&... args);

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

@@ -8,7 +8,6 @@
#define NAZARA_RENDERTEXTURE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Math/Rect.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/Enums.hpp>
@@ -23,10 +22,12 @@ class NzTexture;
struct NzRenderTextureImpl;
class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget, NzNonCopyable
class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget
{
public:
inline NzRenderTexture();
NzRenderTexture(const NzRenderTexture&) = delete;
NzRenderTexture(NzRenderTexture&&) = delete; ///TODO
inline ~NzRenderTexture();
bool AttachBuffer(nzAttachmentPoint attachmentPoint, nzUInt8 index, NzRenderBuffer* buffer);
@@ -59,6 +60,9 @@ class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget, NzNonCopyable
unsigned int GetOpenGLID() const;
bool HasContext() const override;
NzRenderTexture& operator=(const NzRenderTexture&) = delete;
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);
static bool IsSupported();

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

@@ -10,7 +10,6 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/ByteArray.hpp>
#include <Nazara/Core/Color.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/ObjectLibrary.hpp>
#include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp>
@@ -30,13 +29,15 @@ using NzShaderConstRef = NzObjectRef<const NzShader>;
using NzShaderLibrary = NzObjectLibrary<NzShader>;
using NzShaderRef = NzObjectRef<NzShader>;
class NAZARA_RENDERER_API NzShader : public NzRefCounted, NzNonCopyable
class NAZARA_RENDERER_API NzShader : public NzRefCounted
{
friend NzShaderLibrary;
friend class NzRenderer;
public:
NzShader();
NzShader(const NzShader&) = delete;
NzShader(NzShader&&) = delete;
~NzShader();
void AttachStage(nzShaderStage stage, const NzShaderStage& shaderStage);
@@ -98,6 +99,9 @@ class NAZARA_RENDERER_API NzShader : public NzRefCounted, NzNonCopyable
// Fonctions OpenGL
unsigned int GetOpenGLID() const;
NzShader& operator=(const NzShader&) = delete;
NzShader& operator=(NzShader&&) = delete;
static bool IsStageSupported(nzShaderStage stage);
template<typename... Args> static NzShaderRef New(Args&&... args);

9
include/Nazara/Renderer/ShaderStage.hpp
View File

@@ -8,17 +8,17 @@
#define NAZARA_SHADERSTAGE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/Enums.hpp>
class NAZARA_RENDERER_API NzShaderStage : NzNonCopyable
class NAZARA_RENDERER_API NzShaderStage
{
public:
NzShaderStage();
NzShaderStage(nzShaderStage stage);
NzShaderStage(NzShaderStage&& stage);
NzShaderStage(const NzShaderStage&) = delete;
NzShaderStage(NzShaderStage&& stage);
~NzShaderStage();
bool Compile();
@@ -36,7 +36,8 @@ class NAZARA_RENDERER_API NzShaderStage : NzNonCopyable
void SetSource(const NzString& source);
bool SetSourceFromFile(const NzString& filePath);
NzShaderStage& operator=(NzShaderStage&& shader);
NzShaderStage& operator=(const NzShaderStage&) = delete;
NzShaderStage& operator=(NzShaderStage&& shader);
// Fonctions OpenGL
unsigned int GetOpenGLID() const;

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

@@ -8,7 +8,6 @@
#define NAZARA_TEXTURE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/ObjectLibrary.hpp>
#include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp>
@@ -30,7 +29,7 @@ using NzTextureRef = NzObjectRef<NzTexture>;
struct NzTextureImpl;
class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounted, public NzResource, NzNonCopyable
class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounted, public NzResource
{
friend NzTextureLibrary;
friend NzTextureManager;
@@ -40,6 +39,8 @@ class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounte
NzTexture() = default;
NzTexture(nzImageType type, nzPixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, nzUInt8 levelCount = 1);
explicit NzTexture(const NzImage& image);
NzTexture(const NzTexture&) = delete;
NzTexture(NzTexture&&) = delete;
~NzTexture();
bool Create(nzImageType type, nzPixelFormat format, unsigned int width, unsigned int height, unsigned int depth = 1, nzUInt8 levelCount = 1);
@@ -102,6 +103,9 @@ class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounte
// Fonctions OpenGL
unsigned int GetOpenGLID() const;
NzTexture& operator=(const NzTexture&) = delete;
NzTexture& operator=(NzTexture&&) = delete;
static unsigned int GetValidSize(unsigned int size);
static bool IsFormatSupported(nzPixelFormat format);
static bool IsMipmappingSupported();