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

Renamed XImpl to AbstractX (More consistent)

Browse Source 
Where * is Buffer, Hash and Shader


Former-commit-id: a99681ab1d515c9b39e6ba5f447c9000ef1092b8
This commit is contained in:
Lynix
2013-05-21 13:54:10 +02:00
parent 4b68ff0118
commit 8f09eea340
31 changed files with 78 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/Nazara/Core/HashImpl.hpp → include/Nazara/Core/AbstractHash.hpp
View File

@@ -4,23 +4,23 @@
#pragma once
#ifndef NAZARA_HASHIMPL_HPP
#define NAZARA_HASHIMPL_HPP
#ifndef NAZARA_ABSTRACTHASH_HPP
#define NAZARA_ABSTRACTHASH_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/NonCopyable.hpp>
class NzHashDigest;
class NAZARA_API NzHashImpl : NzNonCopyable
class NAZARA_API NzAbstractHash : NzNonCopyable
{
public:
NzHashImpl() = default;
virtual ~NzHashImpl() {}
NzAbstractHash() = default;
virtual ~NzAbstractHash();
virtual void Append(const nzUInt8* data, unsigned int len) = 0;
virtual void Begin() = 0;
virtual NzHashDigest End() = 0;
};
#endif // NAZARA_HASHIMPL_HPP
#endif // NAZARA_ABSTRACTHASH_HPP

2
include/Nazara/Core/ByteArray.hpp
View File

@@ -112,7 +112,7 @@ class NAZARA_API NzByteArray : public NzHashable
private:
void EnsureOwnership();
bool FillHash(NzHashImpl* hash) const;
bool FillHash(NzAbstractHash* hash) const;
void ReleaseArray();
SharedArray* m_sharedArray;

4
include/Nazara/Core/File.hpp
View File

@@ -103,7 +103,7 @@ class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable
static time_t GetLastAccessTime(const NzString& filePath);
static time_t GetLastWriteTime(const NzString& filePath);
static NzHashDigest GetHash(const NzString& filePath, nzHash hash);
static NzHashDigest GetHash(const NzString& filePath, NzHashImpl* hash);
static NzHashDigest GetHash(const NzString& filePath, NzAbstractHash* hash);
static nzUInt64 GetSize(const NzString& filePath);
static bool IsAbsolute(const NzString& filePath);
static NzString NormalizePath(const NzString& filePath);
@@ -111,7 +111,7 @@ class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable
static bool Rename(const NzString& sourcePath, const NzString& targetPath);
private:
bool FillHash(NzHashImpl* hash) const;
bool FillHash(NzAbstractHash* hash) const;
NazaraMutexAttrib(m_mutex, mutable)

6
include/Nazara/Core/Hash.hpp
View File

@@ -8,22 +8,22 @@
#define NAZARA_HASH_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/Hashable.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
#include <Nazara/Core/NonCopyable.hpp>
class NAZARA_API NzHash : NzNonCopyable
{
public:
NzHash(nzHash hash);
NzHash(NzHashImpl* hashImpl);
NzHash(NzAbstractHash* hashImpl);
~NzHash();
NzHashDigest Hash(const NzHashable& hashable);
private:
NzHashImpl* m_impl;
NzAbstractHash* m_impl;
};
#endif // NAZARA_HASH_HPP

4
include/Nazara/Core/Hash/CRC32.hpp
View File

@@ -8,12 +8,12 @@
#define NAZARA_HASH_CRC32_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
struct NzHashCRC32_state;
class NAZARA_API NzHashCRC32 : public NzHashImpl
class NAZARA_API NzHashCRC32 : public NzAbstractHash
{
public:
NzHashCRC32(nzUInt32 polynomial = 0x04c11db7);

4
include/Nazara/Core/Hash/Fletcher16.hpp
View File

@@ -8,13 +8,13 @@
#define NAZARA_HASH_FLETCHER16_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
#include <Nazara/Core/String.hpp>
struct NzHashFletcher16_state;
class NAZARA_API NzHashFletcher16 : public NzHashImpl
class NAZARA_API NzHashFletcher16 : public NzAbstractHash
{
public:
NzHashFletcher16();

4
include/Nazara/Core/Hash/MD5.hpp
View File

@@ -8,12 +8,12 @@
#define NAZARA_HASH_MD5_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
struct NzHashMD5_state;
class NAZARA_API NzHashMD5 : public NzHashImpl
class NAZARA_API NzHashMD5 : public NzAbstractHash
{
public:
NzHashMD5();

4
include/Nazara/Core/Hash/SHA1.hpp
View File

@@ -8,12 +8,12 @@
#define NAZARA_HASH_SHA1_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
union SHA_CTX;
class NAZARA_API NzHashSHA1 : public NzHashImpl
class NAZARA_API NzHashSHA1 : public NzAbstractHash
{
public:
NzHashSHA1();

4
include/Nazara/Core/Hash/SHA224.hpp
View File

@@ -8,12 +8,12 @@
#define NAZARA_HASH_SHA224_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
union SHA_CTX;
class NAZARA_API NzHashSHA224 : public NzHashImpl
class NAZARA_API NzHashSHA224 : public NzAbstractHash
{
public:
NzHashSHA224();

4
include/Nazara/Core/Hash/SHA256.hpp
View File

@@ -8,12 +8,12 @@
#define NAZARA_HASH_SHA256_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
union SHA_CTX;
class NAZARA_API NzHashSHA256 : public NzHashImpl
class NAZARA_API NzHashSHA256 : public NzAbstractHash
{
public:
NzHashSHA256();

4
include/Nazara/Core/Hash/SHA384.hpp
View File

@@ -8,12 +8,12 @@
#define NAZARA_HASH_SHA384_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
union SHA_CTX;
class NAZARA_API NzHashSHA384 : public NzHashImpl
class NAZARA_API NzHashSHA384 : public NzAbstractHash
{
public:
NzHashSHA384();

4
include/Nazara/Core/Hash/SHA512.hpp
View File

@@ -8,12 +8,12 @@
#define NAZARA_HASH_SHA512_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
union SHA_CTX;
class NAZARA_API NzHashSHA512 : public NzHashImpl
class NAZARA_API NzHashSHA512 : public NzAbstractHash
{
public:
NzHashSHA512();

4
include/Nazara/Core/Hash/Whirlpool.hpp
View File

@@ -6,12 +6,12 @@
#define NAZARA_HASH_WHIRLPOOL_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/AbstractHash.hpp>
#include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/HashImpl.hpp>
struct NzHashWhirlpool_state;
class NAZARA_API NzHashWhirlpool : public NzHashImpl
class NAZARA_API NzHashWhirlpool : public NzAbstractHash
{
public:
NzHashWhirlpool();

6
include/Nazara/Core/Hashable.hpp
View File

@@ -22,8 +22,8 @@ enum nzHash
nzHash_Whirlpool
};
class NzAbstractHash;
class NzHashDigest;
class NzHashImpl;
class NAZARA_API NzHashable
{
@@ -34,10 +34,10 @@ class NAZARA_API NzHashable
virtual ~NzHashable();
NzHashDigest GetHash(nzHash hash) const;
NzHashDigest GetHash(NzHashImpl* impl) const;
NzHashDigest GetHash(NzAbstractHash* impl) const;
private:
virtual bool FillHash(NzHashImpl* impl) const = 0;
virtual bool FillHash(NzAbstractHash* impl) const = 0;
};
#endif // HASHABLE_HPP_INCLUDED

2
include/Nazara/Core/String.hpp
View File

@@ -302,7 +302,7 @@ class NAZARA_API NzString : public NzHashable
private:
void EnsureOwnership();
bool FillHash(NzHashImpl* hash) const;
bool FillHash(NzAbstractHash* hash) const;
void ReleaseString();
SharedString* m_sharedString;

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

@@ -20,12 +20,12 @@
#include <Nazara/Renderer/Enums.hpp>
class NzShader;
class NzTexture;
using NzShaderConstRef = NzResourceRef<const NzShader>;
using NzShaderRef = NzResourceRef<NzShader>;
class NzShaderImpl;
class NzAbstractShader;
class NzTexture;
class NAZARA_API NzShader : public NzResource, NzNonCopyable
{
@@ -82,7 +82,7 @@ class NAZARA_API NzShader : public NzResource, NzNonCopyable
private:
nzUInt32 m_flags;
NzShaderImpl* m_impl;
NzAbstractShader* m_impl;
bool m_compiled;
};

8
include/Nazara/Utility/Buffer.hpp
View File

@@ -18,14 +18,14 @@ class NzBuffer;
using NzBufferConstRef = NzResourceRef<const NzBuffer>;
using NzBufferRef = NzResourceRef<NzBuffer>;
class NzBufferImpl;
class NzAbstractBuffer;
class NAZARA_API NzBuffer : public NzResource, NzNonCopyable
{
friend class NzUtility;
public:
using BufferFunction = NzBufferImpl* (*)(NzBuffer* parent, nzBufferType type);
using BufferFunction = NzAbstractBuffer* (*)(NzBuffer* parent, nzBufferType type);
NzBuffer(nzBufferType type);
NzBuffer(nzBufferType type, unsigned int length, nzUInt8 typeSize, nzBufferStorage storage = nzBufferStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
@@ -38,7 +38,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable
bool Fill(const void* data, unsigned int offset, unsigned int length, bool forceDiscard = false);
NzBufferImpl* GetImpl() const;
NzAbstractBuffer* GetImpl() const;
unsigned int GetLength() const;
void* GetPointer();
const void* GetPointer() const;
@@ -69,7 +69,7 @@ class NAZARA_API NzBuffer : public NzResource, NzNonCopyable
nzBufferType m_type;
nzBufferUsage m_usage;
nzUInt8 m_typeSize;
NzBufferImpl* m_impl;
NzAbstractBuffer* m_impl;
unsigned int m_length;
static BufferFunction s_bufferFunctions[nzBufferStorage_Max+1];

31
include/Nazara/Utility/BufferImpl.hpp
View File

@@ -1,31 +0,0 @@
// Copyright (C) 2013 Jérôme Leclercq
// This file is part of the "Nazara Engine - Utility module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#pragma once
#ifndef NAZARA_BUFFERIMPL_HPP
#define NAZARA_BUFFERIMPL_HPP
#include <Nazara/Utility/Buffer.hpp>
class NAZARA_API NzBufferImpl
{
public:
NzBufferImpl() = default;
virtual ~NzBufferImpl();
virtual bool Create(unsigned int size, nzBufferUsage usage = nzBufferUsage_Static) = 0;
virtual void Destroy() = 0;
virtual bool Fill(const void* data, unsigned int offset, unsigned int size, bool forceDiscard = false) = 0;
virtual void* GetPointer() = 0;
virtual bool IsHardware() const = 0;
virtual void* Map(nzBufferAccess access, unsigned int offset = 0, unsigned int size = 0) = 0;
virtual bool Unmap() = 0;
};
#endif // NAZARA_BUFFERIMPL_INCLUDED