Merge branch 'master' into NDK-ShadowMapping
Former-commit-id: e2be28b65207dfbb81efe58f31ca31548afecee7
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
struct SerializationContext;
|
||||
|
||||
template<typename T> class Vector2;
|
||||
template<typename T> class Vector4;
|
||||
|
||||
@@ -73,8 +75,8 @@ namespace Nz
|
||||
|
||||
String ToString() const;
|
||||
|
||||
operator T*();
|
||||
operator const T*() const;
|
||||
operator T* ();
|
||||
operator const T* () const;
|
||||
|
||||
const Vector3& operator+() const;
|
||||
Vector3 operator-() const;
|
||||
@@ -133,6 +135,9 @@ namespace Nz
|
||||
typedef Vector3<unsigned int> Vector3ui;
|
||||
typedef Vector3<Int32> Vector3i32;
|
||||
typedef Vector3<UInt32> Vector3ui32;
|
||||
|
||||
template<typename T> bool Serialize(SerializationContext& context, const Vector3<T>& vector);
|
||||
template<typename T> bool Unserialize(SerializationContext& context, Vector3<T>* vector);
|
||||
}
|
||||
|
||||
#include <Nazara/Math/Vector3.inl>
|
||||
|
||||
Reference in New Issue
Block a user