Rename ccBezierConfig as BezierConfig. (#2536)

Author: j-jorge

core/2d/ActionInterval.cpp

@@ -1675,7 +1675,7 @@ static inline float bezierat(float a, float b, float c, float d, float t)
 // BezierBy
 //
 
-BezierBy* BezierBy::create(float t, const ccBezierConfig& c)
+BezierBy* BezierBy::create(float t, const BezierConfig& c)
 {
     BezierBy* bezierBy = new BezierBy();
     if (bezierBy->initWithDuration(t, c))
@@ -1688,7 +1688,7 @@ BezierBy* BezierBy::create(float t, const ccBezierConfig& c)
     return nullptr;
 }
 
-bool BezierBy::initWithDuration(float t, const ccBezierConfig& c)
+bool BezierBy::initWithDuration(float t, const BezierConfig& c)
 {
     if (ActionInterval::initWithDuration(t))
     {
@@ -1745,7 +1745,7 @@ void BezierBy::update(float time)
 
 BezierBy* BezierBy::reverse() const
 {
-    ccBezierConfig r;
+    BezierConfig r;
 
     r.endPosition    = -_config.endPosition;
     r.controlPoint_1 = _config.controlPoint_2 + (-_config.endPosition);
@@ -1759,7 +1759,7 @@ BezierBy* BezierBy::reverse() const
 // BezierTo
 //
 
-BezierTo* BezierTo::create(float t, const ccBezierConfig& c)
+BezierTo* BezierTo::create(float t, const BezierConfig& c)
 {
     BezierTo* bezierTo = new BezierTo();
     if (bezierTo->initWithDuration(t, c))
@@ -1772,7 +1772,7 @@ BezierTo* BezierTo::create(float t, const ccBezierConfig& c)
     return nullptr;
 }
 
-bool BezierTo::initWithDuration(float t, const ccBezierConfig& c)
+bool BezierTo::initWithDuration(float t, const BezierConfig& c)
 {
     if (ActionInterval::initWithDuration(t))
     {
@@ -1799,7 +1799,7 @@ void BezierTo::startWithTarget(Node* target)
 
 BezierTo* BezierTo::reverse() const
 {
-    AXASSERT(false, "CCBezierTo doesn't support the 'reverse' method");
+    AXASSERT(false, "BezierTo doesn't support the 'reverse' method");
     return nullptr;
 }
 

core/2d/ActionInterval.h

@@ -27,8 +27,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#ifndef __ACTION_CCINTERVAL_ACTION_H__
-#define __ACTION_CCINTERVAL_ACTION_H__
+#ifndef __ACTION_INTERVAL_ACTION_H__
+#define __ACTION_INTERVAL_ACTION_H__
 
 #include <vector>
 
@@ -888,15 +888,17 @@ class AX_DLL JumpTo : public JumpBy
 
 /** @struct Bezier configuration structure
  */
-typedef struct _ccBezierConfig
+struct BezierConfig
 {
     //! end position of the bezier
     Vec2 endPosition;
     //! Bezier control point 1
     Vec2 controlPoint_1;
     //! Bezier control point 2
     Vec2 controlPoint_2;
-} ccBezierConfig;
+};
+
+using ccBezierConfig [[deprecated("Use BezierConfig instead.")]] = BezierConfig;
 
 /** @class BezierBy
  * @brief An action that moves the target with a cubic Bezier curve by a certain distance.
@@ -914,7 +916,7 @@ class AX_DLL BezierBy : public ActionInterval
      * in lua: local create(local t, local table)
      * @endcode
      */
-    static BezierBy* create(float t, const ccBezierConfig& c);
+    static BezierBy* create(float t, const BezierConfig& c);
 
     //
     // Overrides
@@ -934,10 +936,10 @@ class AX_DLL BezierBy : public ActionInterval
      * initializes the action with a duration and a bezier configuration
      * @param t in seconds
      */
-    bool initWithDuration(float t, const ccBezierConfig& c);
+    bool initWithDuration(float t, const BezierConfig& c);
 
 protected:
-    ccBezierConfig _config;
+    BezierConfig _config;
     Vec2 _startPosition;
     Vec2 _previousPosition;
 
@@ -962,7 +964,7 @@ class AX_DLL BezierTo : public BezierBy
      * in lua: local create(local t, local table)
      * @endcode
      */
-    static BezierTo* create(float t, const ccBezierConfig& c);
+    static BezierTo* create(float t, const BezierConfig& c);
 
     //
     // Overrides
@@ -976,10 +978,10 @@ class AX_DLL BezierTo : public BezierBy
     /**
      * @param t In seconds.
      */
-    bool initWithDuration(float t, const ccBezierConfig& c);
+    bool initWithDuration(float t, const BezierConfig& c);
 
 protected:
-    ccBezierConfig _toConfig;
+    BezierConfig _toConfig;
 
 private:
     AX_DISALLOW_COPY_AND_ASSIGN(BezierTo);
@@ -1614,4 +1616,4 @@ class AX_DLL ActionFloat : public ActionInterval
 
 }
 
-#endif  //__ACTION_CCINTERVAL_ACTION_H__
+#endif