From 6cb616689535c340b0b4f441c12ef8eb1ee42cb0 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 22 Dec 2018 10:58:06 +0800
Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9vector=E8=AE=BF=E9=97=AE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libjin/math/je_matrix.cpp    |  4 ++--
 src/libjin/math/je_transform.cpp | 14 +++++++-------
 src/libjin/math/je_vector2.hpp   |  7 ++++---
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/libjin/math')

diff --git a/src/libjin/math/je_matrix.cpp b/src/libjin/math/je_matrix.cpp
index 96eae86..ad7d1e5 100644
--- a/src/libjin/math/je_matrix.cpp
+++ b/src/libjin/math/je_matrix.cpp
@@ -184,8 +184,8 @@ namespace JinEngine
             for (int i = 0; i<size; ++i)
             {
                 // Store in temp variables in case src = dst
-                float x = (e[0] * src[i].xy.x) + (e[4] * src[i].xy.y) + (0) + (e[12]);
-                float y = (e[1] * src[i].xy.x) + (e[5] * src[i].xy.y) + (0) + (e[13]);
+                float x = (e[0] * src[i].xy.x()) + (e[4] * src[i].xy.y()) + (0) + (e[12]);
+                float y = (e[1] * src[i].xy.x()) + (e[5] * src[i].xy.y()) + (0) + (e[13]);
 
                 dst[i].xy.set(x, y);
             }
diff --git a/src/libjin/math/je_transform.cpp b/src/libjin/math/je_transform.cpp
index fba63fa..95ca14d 100644
--- a/src/libjin/math/je_transform.cpp
+++ b/src/libjin/math/je_transform.cpp
@@ -38,13 +38,13 @@ namespace JinEngine
 
         void Transform::scale(float sx, float sy)
         {
-            mScale.x *= sx; 
-            mScale.y *= sy;
+            mScale.x() *= sx; 
+            mScale.y() *= sy;
         }
 
         void Transform::setPosition(const Vector2<float>& p)
         {
-            setPosition(p.x, p.y);
+            setPosition(p.x(), p.y());
         }
 
         void Transform::setPosition(float x, float y)
@@ -59,13 +59,13 @@ namespace JinEngine
 
         void Transform::move(float x, float y)
         {
-            mPosition.x += x; 
-            mPosition.y += y;
+            mPosition.x() += x; 
+            mPosition.y() += y;
         }
 
         void Transform::move(const Vector2<float>& v)
         {
-            move(v.x, v.y);
+            move(v.x(), v.y());
         }
 
         void Transform::setOrigin(float x, float y)
@@ -96,7 +96,7 @@ namespace JinEngine
         Matrix Transform::getMatrix() const
         {
             Matrix m;
-            m.setTransformation(mPosition.x, mPosition.y, mRotation, mScale.x, mScale.y, mOrigin.x, mOrigin.y);
+            m.setTransformation(mPosition.x(), mPosition.y(), mRotation, mScale.x(), mScale.y(), mOrigin.x(), mOrigin.y());
             return m;
         }
 
diff --git a/src/libjin/math/je_vector2.hpp b/src/libjin/math/je_vector2.hpp
index 4be30fb..2e34784 100644
--- a/src/libjin/math/je_vector2.hpp
+++ b/src/libjin/math/je_vector2.hpp
@@ -64,9 +64,10 @@ namespace JinEngine
             T A() const { return data[0]; }\
             T B() const { return data[1]; }
 
-            _aliases(x, y)
-            _aliases(w, h)
-            _aliases(colum, row)
+            _aliases(x, y);
+            _aliases(w, h);
+            _aliases(u, v);
+            _aliases(colum, row);
 
         #undef _aliases
 
-- 
cgit v1.1-26-g67d0