From 1dc7d7001fcd86656d4f55506fb97bfb6c95183d Mon Sep 17 00:00:00 2001
From: John Zhang <mywtfmp3@gmail.com>
Date: Thu, 20 Jun 2019 16:07:22 +0800
Subject: [PATCH] refactor CCGeometry

* remove redundant copy constructor and copy assignment operator
* use delegate constructor to simply code
* fix a documentation error
---
 cocos/math/CCGeometry.cpp | 30 +++++-------------------------
 cocos/math/CCGeometry.h   | 21 ++-------------------
 2 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/cocos/math/CCGeometry.cpp b/cocos/math/CCGeometry.cpp
index 8434a0b1f422..ab4cd81d8b9b 100644
--- a/cocos/math/CCGeometry.cpp
+++ b/cocos/math/CCGeometry.cpp
@@ -35,7 +35,7 @@ NS_CC_BEGIN
 
 // implementation of Size
 
-Size::Size() : width(0), height(0)
+Size::Size() : Size(0.0f, 0.0f)
 {
 }
 
@@ -43,20 +43,10 @@ Size::Size(float w, float h) : width(w), height(h)
 {
 }
 
-Size::Size(const Size& other) : width(other.width), height(other.height)
-{
-}
-
 Size::Size(const Vec2& point) : width(point.x), height(point.y)
 {
 }
 
-Size& Size::operator= (const Size& other)
-{
-    setSize(other.width, other.height);
-    return *this;
-}
-
 Size& Size::operator= (const Vec2& point)
 {
     setSize(point.x, point.y);
@@ -101,28 +91,18 @@ const Size Size::ZERO = Size(0, 0);
 // implementation of Rect
 
 Rect::Rect()
+: Rect(0.0f, 0.0f, 0.0f, 0.0f)
 {
-    setRect(0.0f, 0.0f, 0.0f, 0.0f);
 }
 
 Rect::Rect(float x, float y, float width, float height)
+: origin(x, y), size(width, height)
 {
-    setRect(x, y, width, height);
-}
-Rect::Rect(const Vec2& pos, const Size& dimension)
-{
-    setRect(pos.x, pos.y, dimension.width, dimension.height);
 }
 
-Rect::Rect(const Rect& other)
-{
-    setRect(other.origin.x, other.origin.y, other.size.width, other.size.height);
-}
-
-Rect& Rect::operator= (const Rect& other)
+Rect::Rect(const Vec2& pos, const Size& dimension)
+: origin(pos), size(dimension)
 {
-    setRect(other.origin.x, other.origin.y, other.size.width, other.size.height);
-    return *this;
 }
 
 void Rect::setRect(float x, float y, float width, float height)
diff --git a/cocos/math/CCGeometry.h b/cocos/math/CCGeometry.h
index 2ef9d247c1b6..4e2b3ba44a51 100644
--- a/cocos/math/CCGeometry.h
+++ b/cocos/math/CCGeometry.h
@@ -46,7 +46,7 @@ class CC_DLL Size
     /**Height of the Size.*/
     float height;
 public:
-    /**Conversion from Vec2 to Size.*/
+    /**Conversion from Size to Vec2.*/
     operator Vec2() const
     {
         return Vec2(width, height);
@@ -63,15 +63,9 @@ class CC_DLL Size
      */
     Size();
     Size(float width, float height);
-    Size(const Size& other);
     explicit Size(const Vec2& point);
     /**@}*/
 
-    /**
-     * @js NA
-     * @lua NA
-     */
-    Size& operator= (const Size& other);
     /**
      * @js NA
      * @lua NA
@@ -119,7 +113,7 @@ class CC_DLL Rect
     /**Low left point of rect.*/
     Vec2 origin;
     /**Width and height of the rect.*/
-    Size  size;
+    Size size;
 
 public:
     /**
@@ -138,17 +132,6 @@ class CC_DLL Rect
      */
     Rect(const Vec2& pos, const Size& dimension);
     /**
-    Copy constructor.
-     * @js NA
-     * @lua NA
-     */
-    Rect(const Rect& other);
-    /**
-     * @js NA
-     * @lua NA
-     */
-    Rect& operator= (const Rect& other);
-    /**
     Set the x, y, width and height of Rect.
      * @js NA
      * @lua NA