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

11
include/Nazara/Math/Vector2.hpp
View File

@@ -11,6 +11,8 @@
namespace Nz
{
struct SerializationContext;
template<typename T> class Vector3;
template<typename T> class Vector4;
@@ -62,8 +64,8 @@ namespace Nz
String ToString() const;
operator T*();
operator const T*() const;
operator T* ();
operator const T* () const;
const Vector2& operator+() const;
Vector2 operator-() const;
@@ -89,7 +91,9 @@ namespace Nz
bool operator>(const Vector2& vec) const;
bool operator>=(const Vector2& vec) const;
static T DotProduct(const Vector2& vec1, const Vector2& vec2);
static Vector2 Lerp(const Vector2& from, const Vector2& to, T interpolation);
static Vector2 Normalize(const Vector2& vec);
static Vector2 Unit();
static Vector2 UnitX();
static Vector2 UnitY();
@@ -109,6 +113,9 @@ namespace Nz
typedef Vector2<unsigned int> Vector2ui;
typedef Vector2<Int32> Vector2i32;
typedef Vector2<UInt32> Vector2ui32;
template<typename T> bool Serialize(SerializationContext& context, const Vector2<T>& vector);
template<typename T> bool Unserialize(SerializationContext& context, Vector2<T>* vector);
}
#include <Nazara/Math/Vector2.inl>