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

Merge branch 'master' into NDK

Browse Source 
Former-commit-id: 7f2646da9f2e2c29157e645afbcfcf974f0e0709
This commit is contained in:
Lynix
2015-03-19 13:13:20 +01:00
parent 4862767b69 0363a1a8fa
commit 3fd217b8a3
14 changed files with 62 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Audio.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Audio module

2
include/Nazara/Core.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Core module

2
include/Nazara/Graphics.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Graphics module

2
include/Nazara/Lua.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Lua scripting module

2
include/Nazara/Math.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Mathematics module

6
include/Nazara/Math/Box.inl
View File

@@ -56,9 +56,9 @@ NzBox<T>::NzBox(const NzBox<U>& box)
template<typename T>
bool NzBox<T>::Contains(T X, T Y, T Z) const
{
return X >= x && X < x+width &&
Y >= y && Y < y+height &&
Z >= z && Z < z+depth;
return X >= x && X <= x+width &&
Y >= y && Y <= y+height &&
Z >= z && Z <= z+depth;
}
template<typename T>

4
include/Nazara/Math/Rect.inl
View File

@@ -50,8 +50,8 @@ NzRect<T>::NzRect(const NzRect<U>& rect)
template<typename T>
bool NzRect<T>::Contains(T X, T Y) const
{
return X >= x && X < x+width &&
Y >= y && Y < y+height;
return X >= x && X <= x+width &&
Y >= y && Y <= y+height;
}
template<typename T>

2
include/Nazara/Noise.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Noise module

2
include/Nazara/Physics.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Physics module

4
include/Nazara/Renderer.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Renderer module
@@ -51,5 +51,7 @@
#include <Nazara/Renderer/UberShaderInstance.hpp>
#include <Nazara/Renderer/UberShaderInstancePreprocessor.hpp>
#include <Nazara/Renderer/UberShaderPreprocessor.hpp>
#include <Nazara/Renderer/UberShaderPUniform.hpp>
#include <Nazara/Renderer/UberShaderPUSubroutine.hpp>
#endif // NAZARA_GLOBAL_RENDERER_HPP

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

@@ -11,13 +11,16 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Clock.hpp>
#include <Nazara/Math/Rect.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Renderer/Config.hpp>
#include <Nazara/Renderer/ContextParameters.hpp>
#include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/Utility/Window.hpp>
#include <vector>
class NzAbstractImage;
class NzContext;
class NzImage;
class NzTexture;
struct NzContextParameters;
@@ -29,8 +32,8 @@ class NAZARA_API NzRenderWindow : public NzRenderTarget, public NzWindow
NzRenderWindow(NzWindowHandle handle, const NzContextParameters& parameters = NzContextParameters());
virtual ~NzRenderWindow();
bool CopyToImage(NzImage* image) const;
bool CopyToTexture(NzTexture* texture) const;
bool CopyToImage(NzAbstractImage* image, const NzVector3ui& dstPos = NzVector3ui(0U)) const;
bool CopyToImage(NzAbstractImage* image, const NzRectui& rect, const NzVector3ui& dstPos = NzVector3ui(0U)) const;
bool Create(NzVideoMode mode, const NzString& title, nzUInt32 style = nzWindowStyle_Default, const NzContextParameters& parameters = NzContextParameters());
bool Create(NzWindowHandle handle, const NzContextParameters& parameters = NzContextParameters());
@@ -61,6 +64,7 @@ class NAZARA_API NzRenderWindow : public NzRenderTarget, public NzWindow
void OnWindowDestroy() override;
void OnWindowResized() override;
mutable std::vector<nzUInt8> m_buffer;
NzClock m_clock;
NzContextParameters m_parameters;
mutable NzContext* m_context = nullptr;

2
include/Nazara/Utility.hpp
View File

@@ -1,4 +1,4 @@
// This file was automatically generated on 18 Mar 2015 at 20:51:14
// This file was automatically generated on 19 Mar 2015 at 13:11:33
/*
Nazara Engine - Utility module