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

Convert spaces to tabs

Browse Source 
Former-commit-id: b459cfe0c83f651cc660d42f7d3014c3b146f345
This commit is contained in:
Lynix
2015-09-24 00:55:57 +02:00
parent ce3bbf6c78
commit dea3fb4e39
87 changed files with 1206 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Audio/Algorithm.inl
View File

@@ -11,7 +11,7 @@ void NzMixToMono(T* input, T* output, unsigned int channelCount, unsigned int fr
///DOC: Le buffer d'entrée peut être le même que le buffer de sortie
// Pour éviter l'overflow, on utilise comme accumulateur un type assez grand, (u)int 64 bits pour les entiers, double pour les flottants
typedef typename std::conditional<std::is_unsigned<T>::value, nzUInt64, nzInt64>::type BiggestInt;
typedef typename std::conditional<std::is_integral<T>::value, BiggestInt, double>::type Biggest;
typedef typename std::conditional<std::is_integral<T>::value, BiggestInt, double>::type Biggest;
for (unsigned int i = 0; i < frameCount; ++i)
{

8
include/Nazara/Audio/Music.hpp
View File

@@ -33,8 +33,8 @@ class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter
public:
NzMusic() = default;
NzMusic(const NzMusic&) = delete;
NzMusic(NzMusic&&) = delete; ///TODO
NzMusic(const NzMusic&) = delete;
NzMusic(NzMusic&&) = delete; ///TODO
~NzMusic();
bool Create(NzSoundStream* soundStream);
@@ -62,8 +62,8 @@ class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter
void Stop();
NzMusic& operator=(const NzMusic&) = delete;
NzMusic& operator=(NzMusic&&) = delete; ///TODO
NzMusic& operator=(const NzMusic&) = delete;
NzMusic& operator=(NzMusic&&) = delete; ///TODO
private:
NzMusicImpl* m_impl = nullptr;

8
include/Nazara/Audio/SoundBuffer.hpp
View File

@@ -48,8 +48,8 @@ class NAZARA_AUDIO_API NzSoundBuffer : public NzRefCounted, public NzResource
public:
NzSoundBuffer() = default;
NzSoundBuffer(nzAudioFormat format, unsigned int sampleCount, unsigned int sampleRate, const nzInt16* samples);
NzSoundBuffer(const NzSoundBuffer&) = delete;
NzSoundBuffer(NzSoundBuffer&&) = delete;
NzSoundBuffer(const NzSoundBuffer&) = delete;
NzSoundBuffer(NzSoundBuffer&&) = delete;
~NzSoundBuffer();
bool Create(nzAudioFormat format, unsigned int sampleCount, unsigned int sampleRate, const nzInt16* samples);
@@ -70,8 +70,8 @@ class NAZARA_AUDIO_API NzSoundBuffer : public NzRefCounted, public NzResource
static bool IsFormatSupported(nzAudioFormat format);
template<typename... Args> static NzSoundBufferRef New(Args&&... args);
NzSoundBuffer& operator=(const NzSoundBuffer&) = delete;
NzSoundBuffer& operator=(NzSoundBuffer&&) = delete; ///TODO
NzSoundBuffer& operator=(const NzSoundBuffer&) = delete;
NzSoundBuffer& operator=(NzSoundBuffer&&) = delete; ///TODO
// Signals:
NazaraSignal(OnSoundBufferDestroy, const NzSoundBuffer* /*soundBuffer*/);

8
include/Nazara/Audio/SoundEmitter.hpp
View File

@@ -50,13 +50,13 @@ class NAZARA_AUDIO_API NzSoundEmitter
virtual void Stop() = 0;
NzSoundEmitter& operator=(const NzSoundEmitter&) = delete; ///TODO
NzSoundEmitter& operator=(NzSoundEmitter&&) = delete; ///TODO
NzSoundEmitter& operator=(const NzSoundEmitter&) = delete; ///TODO
NzSoundEmitter& operator=(NzSoundEmitter&&) = delete; ///TODO
protected:
NzSoundEmitter();
NzSoundEmitter(const NzSoundEmitter& emitter);
NzSoundEmitter(NzSoundEmitter&&) = delete; ///TODO
NzSoundEmitter(const NzSoundEmitter& emitter);
NzSoundEmitter(NzSoundEmitter&&) = delete; ///TODO
nzSoundStatus GetInternalStatus() const;

8
include/Nazara/Core/AbstractHash.hpp
View File

@@ -15,16 +15,16 @@ class NAZARA_CORE_API NzAbstractHash
{
public:
NzAbstractHash() = default;
NzAbstractHash(const NzAbstractHash&) = delete;
NzAbstractHash(NzAbstractHash&&) = default;
NzAbstractHash(const NzAbstractHash&) = delete;
NzAbstractHash(NzAbstractHash&&) = default;
virtual ~NzAbstractHash();
virtual void Append(const nzUInt8* data, unsigned int len) = 0;
virtual void Begin() = 0;
virtual NzHashDigest End() = 0;
NzAbstractHash& operator=(const NzAbstractHash&) = delete;
NzAbstractHash& operator=(NzAbstractHash&&) = default;
NzAbstractHash& operator=(const NzAbstractHash&) = delete;
NzAbstractHash& operator=(NzAbstractHash&&) = default;
};
#endif // NAZARA_ABSTRACTHASH_HPP

18
include/Nazara/Core/Algorithm.inl
View File

@@ -12,7 +12,7 @@
template<typename F, typename Tuple, size_t... S>
auto NzApplyImplFunc(F&& fn, Tuple&& t, std::index_sequence<S...>)
{
return std::forward<F>(fn)(std::get<S>(std::forward<Tuple>(t))...);
return std::forward<F>(fn)(std::get<S>(std::forward<Tuple>(t))...);
}
template<typename F, typename Tuple>
@@ -26,7 +26,7 @@ auto NzApply(F&& fn, Tuple&& t)
template<typename O, typename F, typename Tuple, size_t... S>
auto NzApplyImplMethod(O& object, F&& fn, Tuple&& t, std::index_sequence<S...>)
{
return (object .* std::forward<F>(fn))(std::get<S>(std::forward<Tuple>(t))...);
return (object .* std::forward<F>(fn))(std::get<S>(std::forward<Tuple>(t))...);
}
template<typename O, typename F, typename Tuple>
@@ -41,16 +41,16 @@ auto NzApply(O& object, F&& fn, Tuple&& t)
template<typename T>
void NzHashCombine(std::size_t& seed, const T& v)
{
const nzUInt64 kMul = 0x9ddfea08eb382d69ULL;
const nzUInt64 kMul = 0x9ddfea08eb382d69ULL;
std::hash<T> hasher;
nzUInt64 a = (hasher(v) ^ seed) * kMul;
a ^= (a >> 47);
std::hash<T> hasher;
nzUInt64 a = (hasher(v) ^ seed) * kMul;
a ^= (a >> 47);
nzUInt64 b = (seed ^ a) * kMul;
b ^= (b >> 47);
nzUInt64 b = (seed ^ a) * kMul;
b ^= (b >> 47);
seed = static_cast<std::size_t>(b * kMul);
seed = static_cast<std::size_t>(b * kMul);
}
#include <Nazara/Core/DebugOff.hpp>

8
include/Nazara/Core/CallOnExit.hpp
View File

@@ -16,15 +16,15 @@ class NzCallOnExit
public:
NzCallOnExit(Func func = nullptr);
NzCallOnExit(const NzCallOnExit&) = delete;
NzCallOnExit(NzCallOnExit&&) = delete;
NzCallOnExit(const NzCallOnExit&) = delete;
NzCallOnExit(NzCallOnExit&&) = delete;
~NzCallOnExit();
void CallAndReset(Func func = nullptr);
void Reset(Func func = nullptr);
NzCallOnExit& operator=(const NzCallOnExit&) = delete;
NzCallOnExit& operator=(NzCallOnExit&&) = default;
NzCallOnExit& operator=(const NzCallOnExit&) = delete;
NzCallOnExit& operator=(NzCallOnExit&&) = default;
private:
Func m_func;

8
include/Nazara/Core/ConditionVariable.hpp
View File

@@ -16,8 +16,8 @@ class NAZARA_CORE_API NzConditionVariable
{
public:
NzConditionVariable();
NzConditionVariable(const NzConditionVariable&) = delete;
NzConditionVariable(NzConditionVariable&&) = delete; ///TODO
NzConditionVariable(const NzConditionVariable&) = delete;
NzConditionVariable(NzConditionVariable&&) = delete; ///TODO
~NzConditionVariable();
void Signal();
@@ -26,8 +26,8 @@ class NAZARA_CORE_API NzConditionVariable
void Wait(NzMutex* mutex);
bool Wait(NzMutex* mutex, nzUInt32 timeout);
NzConditionVariable& operator=(const NzConditionVariable&) = delete;
NzConditionVariable& operator=(NzConditionVariable&&) = delete; ///TODO
NzConditionVariable& operator=(const NzConditionVariable&) = delete;
NzConditionVariable& operator=(NzConditionVariable&&) = delete; ///TODO
private:
NzConditionVariableImpl* m_impl;

10
include/Nazara/Core/Directory.hpp
View File

@@ -31,9 +31,9 @@ class NAZARA_CORE_API NzDirectory
{
public:
NzDirectory();
NzDirectory(const NzString& dirPath);
NzDirectory(const NzDirectory&) = delete;
NzDirectory(NzDirectory&&) = delete; ///TODO
NzDirectory(const NzString& dirPath);
NzDirectory(const NzDirectory&) = delete;
NzDirectory(NzDirectory&&) = delete; ///TODO
~NzDirectory();
void Close();
@@ -64,8 +64,8 @@ class NAZARA_CORE_API NzDirectory
static bool Remove(const NzString& dirPath, bool emptyDirectory = false);
static bool SetCurrent(const NzString& dirPath);
NzDirectory& operator=(const NzDirectory&) = delete;
NzDirectory& operator=(NzDirectory&&) = delete; ///TODO
NzDirectory& operator=(const NzDirectory&) = delete;
NzDirectory& operator=(NzDirectory&&) = delete; ///TODO
private:
NazaraMutexAttrib(m_mutex, mutable)

8
include/Nazara/Core/DynLib.hpp
View File

@@ -34,8 +34,8 @@ class NAZARA_CORE_API NzDynLib
{
public:
NzDynLib();
NzDynLib(const NzDynLib&) = delete;
NzDynLib(NzDynLib&& lib);
NzDynLib(const NzDynLib&) = delete;
NzDynLib(NzDynLib&& lib);
~NzDynLib();
NzString GetLastError() const;
@@ -46,8 +46,8 @@ class NAZARA_CORE_API NzDynLib
bool Load(const NzString& libraryPath);
void Unload();
NzDynLib& operator=(const NzDynLib&) = delete;
NzDynLib& operator=(NzDynLib&& lib);
NzDynLib& operator=(const NzDynLib&) = delete;
NzDynLib& operator=(NzDynLib&& lib);
private:
NazaraMutexAttrib(m_mutex, mutable)

8
include/Nazara/Core/ErrorFlags.hpp
View File

@@ -14,16 +14,16 @@ class NAZARA_CORE_API NzErrorFlags
{
public:
NzErrorFlags(nzUInt32 flags, bool replace = false);
NzErrorFlags(const NzErrorFlags&) = delete;
NzErrorFlags(NzErrorFlags&&) = delete;
NzErrorFlags(const NzErrorFlags&) = delete;
NzErrorFlags(NzErrorFlags&&) = delete;
~NzErrorFlags();
nzUInt32 GetPreviousFlags() const;
void SetFlags(nzUInt32 flags, bool replace = false);
NzErrorFlags& operator=(const NzErrorFlags&) = delete;
NzErrorFlags& operator=(NzErrorFlags&&) = delete;
NzErrorFlags& operator=(const NzErrorFlags&) = delete;
NzErrorFlags& operator=(NzErrorFlags&&) = delete;
private:
nzUInt32 m_previousFlags;

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

@@ -32,8 +32,8 @@ class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream
NzFile();
NzFile(const NzString& filePath);
NzFile(const NzString& filePath, unsigned int openMode);
NzFile(const NzFile&) = delete;
NzFile(NzFile&& file) noexcept;
NzFile(const NzFile&) = delete;
NzFile(NzFile&& file) noexcept;
~NzFile();
bool Copy(const NzString& newFilePath);
@@ -76,8 +76,8 @@ class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream
bool Write(const NzString& string);
std::size_t Write(const void* buffer, std::size_t typeSize, unsigned int count);
NzFile& operator=(const NzString& filePath);
NzFile& operator=(const NzFile&) = delete;
NzFile& operator=(const NzString& filePath);
NzFile& operator=(const NzFile&) = delete;
NzFile& operator=(NzFile&& file) noexcept;
static NzString AbsolutePath(const NzString& filePath);

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

@@ -17,14 +17,14 @@ class NAZARA_CORE_API NzHash
public:
NzHash(nzHash hash);
NzHash(NzAbstractHash* hashImpl);
NzHash(const NzHash&) = delete;
NzHash(NzHash&&) = delete; ///TODO
NzHash(const NzHash&) = delete;
NzHash(NzHash&&) = delete; ///TODO
~NzHash();
NzHashDigest Hash(const NzHashable& hashable);
NzHash& operator=(const NzHash&) = delete;
NzHash& operator=(NzHash&&) = delete; ///TODO
NzHash& operator=(const NzHash&) = delete;
NzHash& operator=(NzHash&&) = delete; ///TODO
private:
NzAbstractHash* m_impl;

8
include/Nazara/Core/Log.hpp
View File

@@ -49,12 +49,12 @@ class NAZARA_CORE_API NzLog
private:
NzLog();
NzLog(const NzLog&) = delete;
NzLog(NzLog&&) = delete;
NzLog(const NzLog&) = delete;
NzLog(NzLog&&) = delete;
~NzLog();
NzLog& operator=(const NzLog&) = delete;
NzLog& operator=(NzLog&&) = delete;
NzLog& operator=(const NzLog&) = delete;
NzLog& operator=(NzLog&&) = delete;
NazaraMutexAttrib(m_mutex, mutable)

8
include/Nazara/Core/Mutex.hpp
View File

@@ -17,16 +17,16 @@ class NAZARA_CORE_API NzMutex
public:
NzMutex();
NzMutex(const NzMutex&) = delete;
NzMutex(NzMutex&&) = delete; ///TODO
NzMutex(const NzMutex&) = delete;
NzMutex(NzMutex&&) = delete; ///TODO
~NzMutex();
void Lock();
bool TryLock();
void Unlock();
NzMutex& operator=(const NzMutex&) = delete;
NzMutex& operator=(NzMutex&&) = delete; ///TODO
NzMutex& operator=(const NzMutex&) = delete;
NzMutex& operator=(NzMutex&&) = delete; ///TODO
private:
NzMutexImpl* m_impl;

8
include/Nazara/Core/Semaphore.hpp
View File

@@ -15,8 +15,8 @@ class NAZARA_CORE_API NzSemaphore
{
public:
NzSemaphore(unsigned int count);
NzSemaphore(const NzSemaphore&) = delete;
NzSemaphore(NzSemaphore&&) = delete; ///TODO
NzSemaphore(const NzSemaphore&) = delete;
NzSemaphore(NzSemaphore&&) = delete; ///TODO
~NzSemaphore();
unsigned int GetCount() const;
@@ -26,8 +26,8 @@ class NAZARA_CORE_API NzSemaphore
void Wait();
bool Wait(nzUInt32 timeout);
NzSemaphore& operator=(const NzSemaphore&) = delete;
NzSemaphore& operator=(NzSemaphore&&) = delete; ///TODO
NzSemaphore& operator=(const NzSemaphore&) = delete;
NzSemaphore& operator=(NzSemaphore&&) = delete; ///TODO
private:
NzSemaphoreImpl* m_impl;

32
include/Nazara/Core/Signal.inl
View File

@@ -56,40 +56,40 @@ template<typename... Args>
template<typename O>
typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(O& object, void (O::*method) (Args...))
{
return Connect([&object, method] (Args&&... args)
{
return (object .* method) (std::forward<Args>(args)...);
});
return Connect([&object, method] (Args&&... args)
{
return (object .* method) (std::forward<Args>(args)...);
});
}
template<typename... Args>
template<typename O>
typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(O* object, void (O::*method)(Args...))
{
return Connect([object, method] (Args&&... args)
{
return (object ->* method) (std::forward<Args>(args)...);
});
return Connect([object, method] (Args&&... args)
{
return (object ->* method) (std::forward<Args>(args)...);
});
}
template<typename... Args>
template<typename O>
typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(const O& object, void (O::*method) (Args...) const)
{
return Connect([&object, method] (Args&&... args)
{
return (object .* method) (std::forward<Args>(args)...);
});
return Connect([&object, method] (Args&&... args)
{
return (object .* method) (std::forward<Args>(args)...);
});
}
template<typename... Args>
template<typename O>
typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(const O* object, void (O::*method)(Args...) const)
{
return Connect([object, method] (Args&&... args)
{
return (object ->* method) (std::forward<Args>(args)...);
});
return Connect([object, method] (Args&&... args)
{
return (object ->* method) (std::forward<Args>(args)...);
});
}
template<typename... Args>

8
include/Nazara/Core/Thread.hpp
View File

@@ -22,8 +22,8 @@ class NAZARA_CORE_API NzThread
template<typename F> NzThread(F function);
template<typename F, typename... Args> NzThread(F function, Args&&... args);
template<typename C> NzThread(void (C::*function)(), C* object);
NzThread(const NzThread&) = delete;
NzThread(NzThread&& other);
NzThread(const NzThread&) = delete;
NzThread(NzThread&& other);
~NzThread();
void Detach();
@@ -31,8 +31,8 @@ class NAZARA_CORE_API NzThread
bool IsJoinable() const;
void Join();
NzThread& operator=(const NzThread&) = delete;
NzThread& operator=(NzThread&& thread);
NzThread& operator=(const NzThread&) = delete;
NzThread& operator=(NzThread&& thread);
static unsigned int HardwareConcurrency();
static void Sleep(nzUInt32 milliseconds);

8
include/Nazara/Graphics/AbstractRenderQueue.hpp
View File

@@ -30,8 +30,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderQueue
struct SpotLight;
NzAbstractRenderQueue() = default;
NzAbstractRenderQueue(const NzAbstractRenderQueue&) = delete;
NzAbstractRenderQueue(NzAbstractRenderQueue&&) = default;
NzAbstractRenderQueue(const NzAbstractRenderQueue&) = delete;
NzAbstractRenderQueue(NzAbstractRenderQueue&&) = default;
virtual ~NzAbstractRenderQueue();
// Je ne suis vraiment pas fan du nombre de surcharges pour AddBillboards,
@@ -54,8 +54,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderQueue
virtual void Clear(bool fully = false);
NzAbstractRenderQueue& operator=(const NzAbstractRenderQueue&) = delete;
NzAbstractRenderQueue& operator=(NzAbstractRenderQueue&&) = default;
NzAbstractRenderQueue& operator=(const NzAbstractRenderQueue&) = delete;
NzAbstractRenderQueue& operator=(NzAbstractRenderQueue&&) = default;
struct DirectionalLight
{

8
include/Nazara/Graphics/AbstractRenderTechnique.hpp
View File

@@ -22,8 +22,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderTechnique
{
public:
NzAbstractRenderTechnique();
NzAbstractRenderTechnique(const NzAbstractRenderTechnique&) = delete;
NzAbstractRenderTechnique(NzAbstractRenderTechnique&&) = default;
NzAbstractRenderTechnique(const NzAbstractRenderTechnique&) = delete;
NzAbstractRenderTechnique(NzAbstractRenderTechnique&&) = default;
virtual ~NzAbstractRenderTechnique();
virtual bool Draw(const NzSceneData& sceneData) const = 0;
@@ -36,8 +36,8 @@ class NAZARA_GRAPHICS_API NzAbstractRenderTechnique
virtual bool IsInstancingEnabled() const;
NzAbstractRenderTechnique& operator=(const NzAbstractRenderTechnique&) = delete;
NzAbstractRenderTechnique& operator=(NzAbstractRenderTechnique&&) = default;
NzAbstractRenderTechnique& operator=(const NzAbstractRenderTechnique&) = delete;
NzAbstractRenderTechnique& operator=(NzAbstractRenderTechnique&&) = default;
protected:
bool m_instancingEnabled;

6
include/Nazara/Graphics/InstancedRenderable.hpp
View File

@@ -30,8 +30,8 @@ class NAZARA_GRAPHICS_API NzInstancedRenderable : public NzRefCounted
struct InstanceData;
NzInstancedRenderable() = default;
inline NzInstancedRenderable(const NzInstancedRenderable& renderable);
NzInstancedRenderable(NzInstancedRenderable&& renderable) = delete;
inline NzInstancedRenderable(const NzInstancedRenderable& renderable);
NzInstancedRenderable(NzInstancedRenderable&& renderable) = delete;
virtual ~NzInstancedRenderable();
inline void EnsureBoundingVolumeUpdated() const;
@@ -44,7 +44,7 @@ class NAZARA_GRAPHICS_API NzInstancedRenderable : public NzRefCounted
virtual void UpdateData(InstanceData* instanceData) const;
inline NzInstancedRenderable& operator=(const NzInstancedRenderable& renderable);
NzInstancedRenderable& operator=(NzInstancedRenderable&& renderable) = delete;
NzInstancedRenderable& operator=(NzInstancedRenderable&& renderable) = delete;
// Signals:
NazaraSignal(OnInstancedRenderableInvalidateData, const NzInstancedRenderable* /*instancedRenderable*/, nzUInt32 /*flags*/);

8
include/Nazara/Graphics/Renderable.hpp
View File

@@ -19,17 +19,17 @@ class NAZARA_GRAPHICS_API NzRenderable
public:
NzRenderable() = default;
NzRenderable(const NzRenderable& renderable) = default;
NzRenderable(NzRenderable&&) = default;
NzRenderable(NzRenderable&&) = default;
virtual ~NzRenderable();
virtual void AddToRenderQueue(NzAbstractRenderQueue* renderQueue, const NzMatrix4f& transformMatrix) const = 0;
virtual bool Cull(const NzFrustumf& frustum, const NzMatrix4f& transformMatrix) const;
inline void EnsureBoundingVolumeUpdated() const;
inline void EnsureBoundingVolumeUpdated() const;
virtual const NzBoundingVolumef& GetBoundingVolume() const;
virtual void UpdateBoundingVolume(const NzMatrix4f& transformMatrix);
NzRenderable& operator=(const NzRenderable& renderable) = default;
NzRenderable& operator=(NzRenderable&& renderable) = default;
NzRenderable& operator=(const NzRenderable& renderable) = default;
NzRenderable& operator=(NzRenderable&& renderable) = default;
protected:
virtual void MakeBoundingVolume() const = 0;

8
include/Nazara/Lua/LuaInstance.hpp
View File

@@ -28,8 +28,8 @@ class NAZARA_LUA_API NzLuaInstance
{
public:
NzLuaInstance();
NzLuaInstance(const NzLuaInstance&) = delete;
NzLuaInstance(NzLuaInstance&&) = delete; ///TODO
NzLuaInstance(const NzLuaInstance&) = delete;
NzLuaInstance(NzLuaInstance&&) = delete; ///TODO
~NzLuaInstance();
void ArgCheck(bool condition, unsigned int argNum, const char* error);
@@ -149,8 +149,8 @@ class NAZARA_LUA_API NzLuaInstance
void* ToUserdata(int index, const char* tname) const;
void* ToUserdata(int index, const NzString& tname) const;
NzLuaInstance& operator=(const NzLuaInstance&) = delete;
NzLuaInstance& operator=(NzLuaInstance&&) = delete; ///TODO
NzLuaInstance& operator=(const NzLuaInstance&) = delete;
NzLuaInstance& operator=(NzLuaInstance&&) = delete; ///TODO
static int GetIndexOfUpValue(int upValue);
static NzLuaInstance* GetInstance(lua_State* state);

2
include/Nazara/Lua/LuaInstance.inl
View File

@@ -160,7 +160,7 @@ void NzLuaInstance::PushFunction(R(*func)(Args...))
PushFunction([func](NzLuaInstance& instance) -> int
{
NzLuaImplFunctionProxy<Args...> handler(instance);
handler.ProcessArgs();
handler.ProcessArgs();
return handler.Invoke(func);
});

10
include/Nazara/Noise/Abstract2DNoise.hpp
View File

@@ -12,12 +12,12 @@
class NAZARA_NOISE_API NzAbstract2DNoise : public NzMappedNoiseBase
{
public:
virtual ~NzAbstract2DNoise();
public:
virtual ~NzAbstract2DNoise();
float GetBasicValue(float x, float y);
float GetMappedValue(float x, float y);
virtual float GetValue(float x, float y, float resolution) = 0;
float GetBasicValue(float x, float y);
float GetMappedValue(float x, float y);
virtual float GetValue(float x, float y, float resolution) = 0;
};
#endif // NAZARA_ABSTRACT2DNOISE_HPP

10
include/Nazara/Noise/Abstract3DNoise.hpp
View File

@@ -12,12 +12,12 @@
class NAZARA_NOISE_API NzAbstract3DNoise : public NzMappedNoiseBase
{
public:
virtual ~NzAbstract3DNoise();
public:
virtual ~NzAbstract3DNoise();
float GetBasicValue(float x, float y, float z);
float GetMappedValue(float x, float y, float z);
virtual float GetValue(float x, float y, float z, float resolution) = 0;
float GetBasicValue(float x, float y, float z);
float GetMappedValue(float x, float y, float z);
virtual float GetValue(float x, float y, float z, float resolution) = 0;
};
#endif // NAZARA_ABSTRACT3DNOISE_HPP

10
include/Nazara/Noise/Abstract4DNoise.hpp
View File

@@ -12,12 +12,12 @@
class NAZARA_NOISE_API NzAbstract4DNoise : public NzMappedNoiseBase
{
public:
virtual ~NzAbstract4DNoise();
public:
virtual ~NzAbstract4DNoise();
float GetBasicValue(float x, float y, float z, float w);
float GetMappedValue(float x, float y, float z, float w);
virtual float GetValue(float x, float y, float z, float w, float resolution) = 0;
float GetBasicValue(float x, float y, float z, float w);
float GetMappedValue(float x, float y, float z, float w);
virtual float GetValue(float x, float y, float z, float w, float resolution) = 0;
};
#endif // NAZARA_ABSTRACT4DNOISE_HPP

37
include/Nazara/Noise/ComplexNoiseBase.hpp
View File

@@ -12,26 +12,27 @@
class NAZARA_NOISE_API NzComplexNoiseBase
{
public:
NzComplexNoiseBase();
~NzComplexNoiseBase() = default;
public:
NzComplexNoiseBase();
~NzComplexNoiseBase() = default;
float GetHurstParameter() const;
float GetLacunarity() const;
float GetOctaveNumber() const;
void SetHurstParameter(float h);
void SetLacunarity(float lacunarity);
void SetOctavesNumber(float octaves);
void RecomputeExponentArray();
float GetHurstParameter() const;
float GetLacunarity() const;
float GetOctaveNumber() const;
void SetHurstParameter(float h);
void SetLacunarity(float lacunarity);
void SetOctavesNumber(float octaves);
void RecomputeExponentArray();
protected:
float m_lacunarity;
float m_hurst;
float m_octaves;
std::array<float, 30> m_exponent_array;
float m_sum;
private:
bool m_parametersModified;
protected:
float m_lacunarity;
float m_hurst;
float m_octaves;
std::array<float, 30> m_exponent_array;
float m_sum;
private:
bool m_parametersModified;
};
#endif // COMPLEXNOISEBASE_HPP

20
include/Nazara/Noise/FBM2D.hpp
View File

@@ -13,16 +13,16 @@
class NAZARA_NOISE_API NzFBM2D : public NzAbstract2DNoise, public NzComplexNoiseBase
{
public:
NzFBM2D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float resolution);
~NzFBM2D();
protected:
private:
NzAbstract2DNoise* m_source;
float m_value;
float m_remainder;
nzNoises m_noiseType;
public:
NzFBM2D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float resolution);
~NzFBM2D();
private:
NzAbstract2DNoise* m_source;
float m_value;
float m_remainder;
nzNoises m_noiseType;
};
#endif // FBM2D_HPP

20
include/Nazara/Noise/FBM3D.hpp
View File

@@ -13,16 +13,16 @@
class NAZARA_NOISE_API NzFBM3D : public NzAbstract3DNoise, public NzComplexNoiseBase
{
public:
NzFBM3D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzFBM3D();
protected:
private:
NzAbstract3DNoise* m_source;
float m_value;
float m_remainder;
nzNoises m_noiseType;
public:
NzFBM3D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzFBM3D();
private:
NzAbstract3DNoise* m_source;
float m_value;
float m_remainder;
nzNoises m_noiseType;
};
#endif // FBM3D_HPP

20
include/Nazara/Noise/FBM4D.hpp
View File

@@ -13,16 +13,16 @@
class NAZARA_NOISE_API NzFBM4D : public NzAbstract4DNoise, public NzComplexNoiseBase
{
public:
NzFBM4D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzFBM4D();
protected:
private:
NzAbstract4DNoise* m_source;
float m_value;
float m_remainder;
nzNoises m_noiseType;
public:
NzFBM4D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzFBM4D();
private:
NzAbstract4DNoise* m_source;
float m_value;
float m_remainder;
nzNoises m_noiseType;
};
#endif // FBM4D_HPP

26
include/Nazara/Noise/HybridMultiFractal3D.hpp
View File

@@ -13,19 +13,19 @@
class NAZARA_NOISE_API NzHybridMultiFractal3D : public NzAbstract3DNoise, public NzComplexNoiseBase
{
public:
NzHybridMultiFractal3D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzHybridMultiFractal3D();
protected:
private:
NzAbstract3DNoise* m_source;
float m_value;
float m_remainder;
float m_offset;
float m_weight;
float m_signal;
nzNoises m_noiseType;
public:
NzHybridMultiFractal3D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzHybridMultiFractal3D();
protected:
private:
NzAbstract3DNoise* m_source;
float m_value;
float m_remainder;
float m_offset;
float m_weight;
float m_signal;
nzNoises m_noiseType;
};
#endif // HYBRIDMULTIFRACTAL3D_HPP

26
include/Nazara/Noise/HybridMultiFractal4D.hpp
View File

@@ -13,19 +13,19 @@
class NAZARA_NOISE_API NzHybridMultiFractal4D : public NzAbstract4DNoise, public NzComplexNoiseBase
{
public:
NzHybridMultiFractal4D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzHybridMultiFractal4D();
protected:
private:
NzAbstract4DNoise* m_source;
float m_value;
float m_remainder;
float m_offset;
float m_weight;
float m_signal;
nzNoises m_noiseType;
public:
NzHybridMultiFractal4D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzHybridMultiFractal4D();
protected:
private:
NzAbstract4DNoise* m_source;
float m_value;
float m_remainder;
float m_offset;
float m_weight;
float m_signal;
nzNoises m_noiseType;
};
#endif // HYBRIDMULTIFRACTAL4D_HPP

26
include/Nazara/Noise/HybridMultifractal2D.hpp
View File

@@ -13,19 +13,19 @@
class NAZARA_NOISE_API NzHybridMultiFractal2D : public NzAbstract2DNoise, public NzComplexNoiseBase
{
public:
NzHybridMultiFractal2D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float resolution);
~NzHybridMultiFractal2D();
protected:
private:
NzAbstract2DNoise* m_source;
float m_value;
float m_remainder;
float m_offset;
float m_weight;
float m_signal;
nzNoises m_noiseType;
public:
NzHybridMultiFractal2D(nzNoises source, unsigned int seed);
float GetValue(float x, float y, float resolution);
~NzHybridMultiFractal2D();
private:
NzAbstract2DNoise* m_source;
float m_value;
float m_remainder;
float m_offset;
float m_weight;
float m_signal;
nzNoises m_noiseType;
};
#endif // HYBRIDMULTIFRACTAL2D_HPP

26
include/Nazara/Noise/MappedNoiseBase.hpp
View File

@@ -12,20 +12,20 @@
class NAZARA_NOISE_API NzMappedNoiseBase : public NzNoiseBase
{
public:
NzMappedNoiseBase();
~NzMappedNoiseBase() = default;
public:
NzMappedNoiseBase();
~NzMappedNoiseBase() = default;
float GetGain() const;
float GetOffset() const;
float GetResolution() const;
void SetGain(float gain);
void SetOffset(float offset);
void SetResolution(float resolution);
protected:
float m_gain;
float m_offset;
float m_resolution;
float GetGain() const;
float GetOffset() const;
float GetResolution() const;
void SetGain(float gain);
void SetOffset(float offset);
void SetResolution(float resolution);
protected:
float m_gain;
float m_offset;
float m_resolution;
};
#endif // NAZARA_MAPPEDNOISEBASE_HPP

34
include/Nazara/Noise/NoiseBase.hpp
View File

@@ -12,31 +12,31 @@
enum nzNoises
{
PERLIN,
SIMPLEX,
CELL
PERLIN,
SIMPLEX,
CELL
};
class NAZARA_NOISE_API NzNoiseBase
{
public:
NzNoiseBase(unsigned int seed = 0);
~NzNoiseBase() = default;
public:
NzNoiseBase(unsigned int seed = 0);
~NzNoiseBase() = default;
void SetNewSeed(unsigned int seed);
void SetNewSeed(unsigned int seed);
void ShufflePermutationTable();
void ShufflePermutationTable();
unsigned int GetUniformRandomValue();
unsigned int GetUniformRandomValue();
int fastfloor(float n);
int JenkinsHash(int a, int b, int c);
protected:
unsigned int perm[512];
private:
unsigned int Ua, Uc, Um;
unsigned int UcurrentSeed;
unsigned int Uprevious, Ulast;
int fastfloor(float n);
int JenkinsHash(int a, int b, int c);
protected:
unsigned int perm[512];
private:
unsigned int Ua, Uc, Um;
unsigned int UcurrentSeed;
unsigned int Uprevious, Ulast;
};

30
include/Nazara/Noise/Perlin2D.hpp
View File

@@ -14,21 +14,21 @@
class NAZARA_NOISE_API NzPerlin2D : public NzAbstract2DNoise
{
public:
NzPerlin2D();
NzPerlin2D(unsigned int seed);
float GetValue(float x, float y, float resolution);
~NzPerlin2D() = default;
protected:
private:
int x0, y0;
int gi0,gi1,gi2,gi3;
int ii, jj;
float gradient2[8][2];
float s,t,u,v;
float Cx,Cy;
float Li1, Li2;
NzVector2<float> temp;
public:
NzPerlin2D();
NzPerlin2D(unsigned int seed);
float GetValue(float x, float y, float resolution);
~NzPerlin2D() = default;
protected:
private:
int x0, y0;
int gi0,gi1,gi2,gi3;
int ii, jj;
float gradient2[8][2];
float s,t,u,v;
float Cx,Cy;
float Li1, Li2;
NzVector2<float> temp;
};
#endif // PERLIN2D_HPP

34
include/Nazara/Noise/Perlin3D.hpp
View File

@@ -14,23 +14,23 @@
class NAZARA_NOISE_API NzPerlin3D : public NzAbstract3DNoise
{
public:
NzPerlin3D();
NzPerlin3D(unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzPerlin3D() = default;
protected:
private:
int x0,y0,z0;
int gi0,gi1,gi2,gi3,gi4,gi5,gi6,gi7;
int ii,jj,kk;
float gradient3[16][3];
float Li1,Li2,Li3,Li4,Li5,Li6;
float s[2],t[2],u[2],v[2];
float Cx,Cy,Cz;
float nx,ny,nz;
float tmp;
NzVector3<float> temp;
public:
NzPerlin3D();
NzPerlin3D(unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzPerlin3D() = default;
protected:
private:
int x0,y0,z0;
int gi0,gi1,gi2,gi3,gi4,gi5,gi6,gi7;
int ii,jj,kk;
float gradient3[16][3];
float Li1,Li2,Li3,Li4,Li5,Li6;
float s[2],t[2],u[2],v[2];
float Cx,Cy,Cz;
float nx,ny,nz;
float tmp;
NzVector3<float> temp;
};
#endif // PERLIN3D_HPP

32
include/Nazara/Noise/Perlin4D.hpp
View File

@@ -14,22 +14,22 @@
class NAZARA_NOISE_API NzPerlin4D : public NzAbstract4DNoise
{
public:
NzPerlin4D();
NzPerlin4D(unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzPerlin4D() = default;
protected:
private:
int x0,y0,z0,w0;
int gi0,gi1,gi2,gi3,gi4,gi5,gi6,gi7,gi8,gi9,gi10,gi11,gi12,gi13,gi14,gi15;
int ii,jj,kk,ll;
float gradient4[32][4];
float Li1,Li2,Li3,Li4,Li5,Li6,Li7,Li8,Li9,Li10,Li11,Li12,Li13,Li14;
float s[4],t[4],u[4],v[4];
float Cx,Cy,Cz,Cw;
float tmp;
NzVector4<float> temp;
public:
NzPerlin4D();
NzPerlin4D(unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzPerlin4D() = default;
protected:
private:
int x0,y0,z0,w0;
int gi0,gi1,gi2,gi3,gi4,gi5,gi6,gi7,gi8,gi9,gi10,gi11,gi12,gi13,gi14,gi15;
int ii,jj,kk,ll;
float gradient4[32][4];
float Li1,Li2,Li3,Li4,Li5,Li6,Li7,Li8,Li9,Li10,Li11,Li12,Li13,Li14;
float s[4],t[4],u[4],v[4];
float Cx,Cy,Cz,Cw;
float tmp;
NzVector4<float> temp;
};
#endif // PERLIN4D_HPP

36
include/Nazara/Noise/Simplex2D.hpp
View File

@@ -14,24 +14,24 @@
class NAZARA_NOISE_API NzSimplex2D : public NzAbstract2DNoise
{
public:
NzSimplex2D();
NzSimplex2D(unsigned int seed);
float GetValue(float x, float y, float resolution);
virtual ~NzSimplex2D() = default;
protected:
private:
int ii,jj;
int gi0,gi1,gi2;
NzVector2i skewedCubeOrigin,off1;
float n1,n2,n3;
float c1,c2,c3;
float gradient2[8][2];
float UnskewCoeff2D;
float SkewCoeff2D;
float sum;
NzVector2<float> unskewedCubeOrigin, unskewedDistToOrigin;
NzVector2<float> d1,d2,d3;
public:
NzSimplex2D();
NzSimplex2D(unsigned int seed);
float GetValue(float x, float y, float resolution);
virtual ~NzSimplex2D() = default;
protected:
private:
int ii,jj;
int gi0,gi1,gi2;
NzVector2i skewedCubeOrigin,off1;
float n1,n2,n3;
float c1,c2,c3;
float gradient2[8][2];
float UnskewCoeff2D;
float SkewCoeff2D;
float sum;
NzVector2<float> unskewedCubeOrigin, unskewedDistToOrigin;
NzVector2<float> d1,d2,d3;
};
#endif // SIMPLEX2D_HPP

36
include/Nazara/Noise/Simplex3D.hpp
View File

@@ -14,24 +14,24 @@
class NAZARA_NOISE_API NzSimplex3D : public NzAbstract3DNoise
{
public:
NzSimplex3D();
NzSimplex3D(unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzSimplex3D() = default;
protected:
private:
int ii,jj,kk;
int gi0,gi1,gi2,gi3;
NzVector3i skewedCubeOrigin,off1,off2;
float n1,n2,n3,n4;
float c1,c2,c3,c4;
float gradient3[12][3];
float UnskewCoeff3D;
float SkewCoeff3D;
float sum;
NzVector3<float> unskewedCubeOrigin, unskewedDistToOrigin;
NzVector3<float> d1,d2,d3,d4;
public:
NzSimplex3D();
NzSimplex3D(unsigned int seed);
float GetValue(float x, float y, float z, float resolution);
~NzSimplex3D() = default;
protected:
private:
int ii,jj,kk;
int gi0,gi1,gi2,gi3;
NzVector3i skewedCubeOrigin,off1,off2;
float n1,n2,n3,n4;
float c1,c2,c3,c4;
float gradient3[12][3];
float UnskewCoeff3D;
float SkewCoeff3D;
float sum;
NzVector3<float> unskewedCubeOrigin, unskewedDistToOrigin;
NzVector3<float> d1,d2,d3,d4;
};
#endif // SIMPLEX3D_HPP

40
include/Nazara/Noise/Simplex4D.hpp
View File

@@ -14,26 +14,26 @@
class NAZARA_NOISE_API NzSimplex4D : public NzAbstract4DNoise
{
public:
NzSimplex4D();
NzSimplex4D(unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzSimplex4D() = default;
protected:
private:
int ii,jj,kk,ll;
int gi0,gi1,gi2,gi3,gi4;
NzVector4i skewedCubeOrigin,off1,off2,off3;
int lookupTable4D[64][4];
int c;
float n1,n2,n3,n4,n5;
float c1,c2,c3,c4,c5,c6;
float gradient4[32][4];
float UnskewCoeff4D;
float SkewCoeff4D;
float sum;
NzVector4<float> unskewedCubeOrigin, unskewedDistToOrigin;
NzVector4<float> d1,d2,d3,d4,d5;
public:
NzSimplex4D();
NzSimplex4D(unsigned int seed);
float GetValue(float x, float y, float z, float w, float resolution);
~NzSimplex4D() = default;
protected:
private:
int ii,jj,kk,ll;
int gi0,gi1,gi2,gi3,gi4;
NzVector4i skewedCubeOrigin,off1,off2,off3;
int lookupTable4D[64][4];
int c;
float n1,n2,n3,n4,n5;
float c1,c2,c3,c4,c5,c6;
float gradient4[32][4];
float UnskewCoeff4D;
float SkewCoeff4D;
float sum;
NzVector4<float> unskewedCubeOrigin, unskewedDistToOrigin;
NzVector4<float> d1,d2,d3,d4,d5;
};
#endif // SIMPLEX4D_H

8
include/Nazara/Physics/Geom.hpp
View File

@@ -38,8 +38,8 @@ class NAZARA_PHYSICS_API NzPhysGeom : public NzRefCounted
{
public:
NzPhysGeom() = default;
NzPhysGeom(const NzPhysGeom&) = delete;
NzPhysGeom(NzPhysGeom&&) = delete;
NzPhysGeom(const NzPhysGeom&) = delete;
NzPhysGeom(NzPhysGeom&&) = delete;
virtual ~NzPhysGeom();
NzBoxf ComputeAABB(const NzVector3f& translation, const NzQuaternionf& rotation, const NzVector3f& scale) const;
@@ -50,8 +50,8 @@ class NAZARA_PHYSICS_API NzPhysGeom : public NzRefCounted
NewtonCollision* GetHandle(NzPhysWorld* world) const;
virtual nzGeomType GetType() const = 0;
NzPhysGeom& operator=(const NzPhysGeom&) = delete;
NzPhysGeom& operator=(NzPhysGeom&&) = delete;
NzPhysGeom& operator=(const NzPhysGeom&) = delete;
NzPhysGeom& operator=(NzPhysGeom&&) = delete;
static NzPhysGeomRef Build(const NzPrimitiveList& list);

8
include/Nazara/Physics/PhysWorld.hpp
View File

@@ -18,8 +18,8 @@ class NAZARA_PHYSICS_API NzPhysWorld
{
public:
NzPhysWorld();
NzPhysWorld(const NzPhysWorld&) = delete;
NzPhysWorld(NzPhysWorld&&) = delete; ///TODO
NzPhysWorld(const NzPhysWorld&) = delete;
NzPhysWorld(NzPhysWorld&&) = delete; ///TODO
~NzPhysWorld();
NzVector3f GetGravity() const;
@@ -32,8 +32,8 @@ class NAZARA_PHYSICS_API NzPhysWorld
void Step(float timestep);
NzPhysWorld& operator=(const NzPhysWorld&) = delete;
NzPhysWorld& operator=(NzPhysWorld&&) = delete; ///TODO
NzPhysWorld& operator=(const NzPhysWorld&) = delete;
NzPhysWorld& operator=(NzPhysWorld&&) = delete; ///TODO
private:
NzVector3f m_gravity;

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

@@ -15,8 +15,8 @@ class NAZARA_RENDERER_API NzGpuQuery
{
public:
NzGpuQuery();
NzGpuQuery(const NzGpuQuery&) = delete;
NzGpuQuery(NzGpuQuery&&) = delete; ///TODO
NzGpuQuery(const NzGpuQuery&) = delete;
NzGpuQuery(NzGpuQuery&&) = delete; ///TODO
~NzGpuQuery();
void Begin(nzGpuQueryMode mode);
@@ -29,8 +29,8 @@ class NAZARA_RENDERER_API NzGpuQuery
// Fonctions OpenGL
unsigned int GetOpenGLID() const;
NzGpuQuery& operator=(const NzGpuQuery&) = delete;
NzGpuQuery& operator=(NzGpuQuery&&) = delete; ///TODO
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

@@ -28,8 +28,8 @@ class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted
public:
NzRenderBuffer();
NzRenderBuffer(const NzRenderBuffer&) = delete;
NzRenderBuffer(NzRenderBuffer&&) = delete;
NzRenderBuffer(const NzRenderBuffer&) = delete;
NzRenderBuffer(NzRenderBuffer&&) = delete;
~NzRenderBuffer();
bool Create(nzPixelFormat format, unsigned int width, unsigned int height);
@@ -44,8 +44,8 @@ class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted
bool IsValid() const;
NzRenderBuffer& operator=(const NzRenderBuffer&) = delete;
NzRenderBuffer& operator=(NzRenderBuffer&&) = delete;
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

@@ -26,8 +26,8 @@ class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget
{
public:
inline NzRenderTexture();
NzRenderTexture(const NzRenderTexture&) = delete;
NzRenderTexture(NzRenderTexture&&) = delete; ///TODO
NzRenderTexture(const NzRenderTexture&) = delete;
NzRenderTexture(NzRenderTexture&&) = delete; ///TODO
inline ~NzRenderTexture();
bool AttachBuffer(nzAttachmentPoint attachmentPoint, nzUInt8 index, NzRenderBuffer* buffer);
@@ -60,8 +60,8 @@ class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget
unsigned int GetOpenGLID() const;
bool HasContext() const override;
NzRenderTexture& operator=(const NzRenderTexture&) = delete;
NzRenderTexture& operator=(NzRenderTexture&&) = delete; ///TODO
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);

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

@@ -36,8 +36,8 @@ class NAZARA_RENDERER_API NzShader : public NzRefCounted
public:
NzShader();
NzShader(const NzShader&) = delete;
NzShader(NzShader&&) = delete;
NzShader(const NzShader&) = delete;
NzShader(NzShader&&) = delete;
~NzShader();
void AttachStage(nzShaderStage stage, const NzShaderStage& shaderStage);
@@ -99,8 +99,8 @@ class NAZARA_RENDERER_API NzShader : public NzRefCounted
// Fonctions OpenGL
unsigned int GetOpenGLID() const;
NzShader& operator=(const NzShader&) = delete;
NzShader& operator=(NzShader&&) = delete;
NzShader& operator=(const NzShader&) = delete;
NzShader& operator=(NzShader&&) = delete;
static bool IsStageSupported(nzShaderStage stage);
template<typename... Args> static NzShaderRef New(Args&&... args);

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

@@ -17,8 +17,8 @@ class NAZARA_RENDERER_API NzShaderStage
public:
NzShaderStage();
NzShaderStage(nzShaderStage stage);
NzShaderStage(const NzShaderStage&) = delete;
NzShaderStage(NzShaderStage&& stage);
NzShaderStage(const NzShaderStage&) = delete;
NzShaderStage(NzShaderStage&& stage);
~NzShaderStage();
bool Compile();
@@ -36,8 +36,8 @@ class NAZARA_RENDERER_API NzShaderStage
void SetSource(const NzString& source);
bool SetSourceFromFile(const NzString& filePath);
NzShaderStage& operator=(const NzShaderStage&) = delete;
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

@@ -39,8 +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(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);
@@ -103,8 +103,8 @@ class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounte
// Fonctions OpenGL
unsigned int GetOpenGLID() const;
NzTexture& operator=(const NzTexture&) = delete;
NzTexture& operator=(NzTexture&&) = delete;
NzTexture& operator=(const NzTexture&) = delete;
NzTexture& operator=(NzTexture&&) = delete;
static unsigned int GetValidSize(unsigned int size);
static bool IsFormatSupported(nzPixelFormat format);

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

@@ -30,8 +30,8 @@ class NAZARA_UTILITY_API NzBuffer : public NzRefCounted
NzBuffer(nzBufferType type);
NzBuffer(nzBufferType type, unsigned int size, nzUInt32 storage = nzDataStorage_Software, nzBufferUsage usage = nzBufferUsage_Static);
NzBuffer(const NzBuffer&) = delete;
NzBuffer(NzBuffer&&) = delete;
NzBuffer(const NzBuffer&) = delete;
NzBuffer(NzBuffer&&) = delete;
~NzBuffer();
bool CopyContent(const NzBuffer& buffer);
@@ -57,8 +57,8 @@ class NAZARA_UTILITY_API NzBuffer : public NzRefCounted
void Unmap() const;
NzBuffer& operator=(const NzBuffer&) = delete;
NzBuffer& operator=(NzBuffer&&) = delete;
NzBuffer& operator=(const NzBuffer&) = delete;
NzBuffer& operator=(NzBuffer&&) = delete;
static bool IsStorageSupported(nzUInt32 storage);
template<typename... Args> static NzBufferRef New(Args&&... args);

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

@@ -44,8 +44,8 @@ class NAZARA_UTILITY_API NzFont : public NzRefCounted, public NzResource
struct SizeInfo;
NzFont();
NzFont(const NzFont&) = delete;
NzFont(NzFont&&) = delete;
NzFont(const NzFont&) = delete;
NzFont(NzFont&&) = delete;
~NzFont();
void ClearGlyphCache();
@@ -82,8 +82,8 @@ class NAZARA_UTILITY_API NzFont : public NzRefCounted, public NzResource
void SetGlyphBorder(unsigned int borderSize);
void SetMinimumStepSize(unsigned int minimumStepSize);
NzFont& operator=(const NzFont&) = delete;
NzFont& operator=(NzFont&&) = delete;
NzFont& operator=(const NzFont&) = delete;
NzFont& operator=(NzFont&&) = delete;
static std::shared_ptr<NzAbstractAtlas> GetDefaultAtlas();
static NzFont* GetDefault();

2
include/Nazara/Utility/GuillotineImageAtlas.hpp
View File

@@ -43,7 +43,7 @@ class NAZARA_UTILITY_API NzGuillotineImageAtlas : public NzAbstractAtlas
struct QueuedGlyph
{
NzImage image;
NzImage image;
NzRectui rect;
bool flipped;
};

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

@@ -39,8 +39,8 @@ class NAZARA_UTILITY_API NzWindow
NzWindow();
NzWindow(NzVideoMode mode, const NzString& title, nzUInt32 style = nzWindowStyle_Default);
NzWindow(NzWindowHandle handle);
NzWindow(const NzWindow&) = delete;
NzWindow(NzWindow&&) = delete; ///TODO
NzWindow(const NzWindow&) = delete;
NzWindow(NzWindow&&) = delete; ///TODO
virtual ~NzWindow();
void Close();
@@ -90,8 +90,8 @@ class NAZARA_UTILITY_API NzWindow
bool WaitEvent(NzEvent* event);
NzWindow& operator=(const NzWindow&) = delete;
NzWindow& operator=(NzWindow&&) = delete; ///TODO
NzWindow& operator=(const NzWindow&) = delete;
NzWindow& operator=(NzWindow&&) = delete; ///TODO
protected:
virtual bool OnWindowCreated();