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

Rewritted ResourceLoader and moved it to core

Browse Source 
Added creation constructor to NzImage
Added member function functor
Added option to build Nazara as one library (instead of many)
Fixed some 2011 copyrights
Made use of "using def = T" C++11 feature instead of some illigible
typedefs
Removed unused premake file
This commit is contained in:
Lynix
2012-08-18 01:46:01 +02:00
parent 5619ddb0b1
commit 15afde86c8
51 changed files with 542 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ class NzContextImpl;
class NAZARA_API NzContext
{
friend class NzContextImpl;
friend NzContextImpl;
public:
NzContext();

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

@@ -24,7 +24,7 @@
#include <GL3/glxext.h>
#endif
typedef void (*NzOpenGLFunc)();
using NzOpenGLFunc = void (*)();
class NAZARA_API NzOpenGL
{
@@ -77,9 +77,9 @@ NAZARA_API extern PFNGLCOLORMASKPROC glColorMask;
NAZARA_API extern PFNGLCULLFACEPROC glCullFace;
NAZARA_API extern PFNGLCOMPILESHADERPROC glCompileShader;
NAZARA_API extern PFNGLCOPYTEXSUBIMAGE2DPROC glCopyTexSubImage2D;
NAZARA_API extern PFNGLDEBUGMESSAGECALLBACKPROC glDebugMessageCallback;
NAZARA_API extern PFNGLDEBUGMESSAGECONTROLPROC glDebugMessageControl;
NAZARA_API extern PFNGLDEBUGMESSAGEINSERTPROC glDebugMessageInsert;
NAZARA_API extern PFNGLDEBUGMESSAGECALLBACKPROC glDebugMessageCallback;
NAZARA_API extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
NAZARA_API extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
NAZARA_API extern PFNGLDELETEPROGRAMPROC glDeleteProgram;

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

@@ -17,7 +17,6 @@
#include <Nazara/Math/Vector4.hpp>
#include <Nazara/Renderer/Enums.hpp>
class NzRenderer;
class NzShaderImpl;
class NzTexture;
@@ -26,7 +25,7 @@ class NAZARA_API NzShader : public NzResource, NzNonCopyable
friend class NzRenderer;
public:
NzShader();
NzShader() = default;
NzShader(nzShaderLanguage language);
~NzShader();
@@ -70,8 +69,8 @@ class NAZARA_API NzShader : public NzResource, NzNonCopyable
static bool IsTypeSupported(nzShaderType type);
private:
NzShaderImpl* m_impl;
bool m_compiled;
NzShaderImpl* m_impl = nullptr;
bool m_compiled = false;
};
#endif // NAZARA_SHADER_HPP

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

@@ -13,7 +13,6 @@
#include <Nazara/Utility/Image.hpp>
#include <Nazara/Utility/PixelFormat.hpp>
class NzShader;
struct NzTextureImpl;
class NAZARA_API NzTexture : public NzResource, NzNonCopyable