Browse Source

Added Lua bindings for non-assignment IntVector operators

Modanung 8 years ago
parent
commit
7ac9f749ef

+ 7 - 2
Source/Urho3D/LuaScript/pkgs/Math/Vector2.pkg

@@ -16,7 +16,6 @@ class Vector2
     Vector2 operator * (const Vector2& rhs) const;
     Vector2 operator / (float rhs) const;
     Vector2 operator / (const Vector2& rhs) const;
-    Vector2 operator / (const Vector2& rhs) const;
 
     void Normalize();
     float Length() const;
@@ -29,7 +28,6 @@ class Vector2
     Vector2 Lerp(const Vector2& rhs, float t) const;
     bool Equals(const Vector2& rhs) const;
     bool IsNaN() const;
-
     Vector2 Normalized() const;
 
     String ToString() const;
@@ -57,7 +55,9 @@ class IntVector2
     IntVector2 operator - () const;
     IntVector2 operator - (const IntVector2& rhs) const;
     IntVector2 operator * (int rhs) const;
+    IntVector2 operator * (const IntVector2& rhs) const;
     IntVector2 operator / (int rhs) const;
+    IntVector2 operator / (const IntVector2& rhs) const;
 
     String ToString() const;
     unsigned ToHash() const;
@@ -67,6 +67,11 @@ class IntVector2
     int y_ @ y;
 
     static const IntVector2 ZERO;
+    static const IntVector2 LEFT;
+    static const IntVector2 RIGHT;
+    static const IntVector2 UP;
+    static const IntVector2 DOWN;
+    static const IntVector2 ONE;
 };
 
 Vector2 VectorLerp(const Vector2& lhs, const Vector2& rhs, const Vector2& t);

+ 3 - 0
Source/Urho3D/LuaScript/pkgs/Math/Vector3.pkg

@@ -19,6 +19,7 @@ class Vector3
     Vector3 operator * (const Vector3& rhs) const;
     Vector3 operator / (float rhs) const;
     Vector3 operator / (const Vector3& rhs) const;
+
     void Normalize();
     float Length() const;
     float LengthSquared() const;
@@ -62,7 +63,9 @@ class IntVector3
     IntVector3 operator - () const;
     IntVector3 operator - (const IntVector3& rhs) const;
     IntVector3 operator * (int rhs) const;
+    IntVector3 operator * (const IntVector3& rhs) const;
     IntVector3 operator / (int rhs) const;
+    IntVector3 operator / (const IntVector3& rhs) const;
 
     String ToString() const;
     unsigned ToHash() const;