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

Merge branch 'master' into NDK-ShadowMapping

Browse Source 
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
This commit is contained in:
Lynix
2016-04-17 19:57:15 +02:00
parent 5f16da5e73 922e49accb
commit 37aa00b2e7
354 changed files with 24993 additions and 2830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,6 @@ namespace Nz
static void OnContextChanged(const Context* newContext);
static void OnContextDestruction(const Context* context);
};
}
NAZARA_RENDERER_API extern PFNGLACTIVETEXTUREPROC glActiveTexture;
NAZARA_RENDERER_API extern PFNGLATTACHSHADERPROC glAttachShader;
@@ -337,6 +336,8 @@ NAZARA_RENDERER_API extern GLX::PFNGLXSWAPINTERVALMESAPROC NzglXSwapInter
NAZARA_RENDERER_API extern GLX::PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI;
#endif
}
#endif // NAZARA_RENDERER_OPENGL
#endif // NAZARA_OPENGL_HPP

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

@@ -43,12 +43,12 @@ namespace Nz
void Detach(AttachmentPoint attachmentPoint, UInt8 index);
unsigned int GetHeight() const override;
RenderTargetParameters GetParameters() const;
RenderTargetParameters GetParameters() const override;
Vector2ui GetSize() const;
unsigned int GetWidth() const override;
bool IsComplete() const;
bool IsRenderable() const;
bool IsRenderable() const override;
inline bool IsValid() const;
bool Lock() const;

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

@@ -46,11 +46,11 @@ namespace Nz
void EnableVerticalSync(bool enabled);
unsigned int GetHeight() const;
RenderTargetParameters GetParameters() const;
unsigned int GetWidth() const;
unsigned int GetHeight() const override;
RenderTargetParameters GetParameters() const override;
unsigned int GetWidth() const override;
bool IsRenderable() const;
bool IsRenderable() const override;
bool IsValid() const;
void SetFramerateLimit(unsigned int limit);

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

@@ -22,7 +22,6 @@
namespace Nz
{
class Texture;
using TextureConstRef = ObjectRef<const Texture>;
@@ -94,6 +93,10 @@ namespace Nz
bool LoadFaceFromMemory(CubemapFace face, const void* data, std::size_t size, const ImageParams& params = ImageParams());
bool LoadFaceFromStream(CubemapFace face, Stream& stream, const ImageParams& params = ImageParams());
// Save
bool SaveToFile(const String& filePath, const ImageParams& params = ImageParams());
bool SaveToStream(Stream& stream, const String& format, const ImageParams& params = ImageParams());
bool SetMipmapRange(UInt8 minLevel, UInt8 maxLevel);
bool Update(const Image& image, UInt8 level = 0);