Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into UITest

Author: Liam

.gitignore

@@ -34,6 +34,7 @@ _ReSharper*/
 [Tt]est[Rr]esult*
 ipch/
 *.opensdf
+*.opendb
 SubmissionInfo
 Generated Files
 AppPackages

README.md

@@ -259,6 +259,38 @@ $ adb install ../tests/cpp-empty-test/proj.android/bin/CppEmptyTest-debug.apk
 
 Then click item on Android device to run tests. Available value of `-p` is the API level, cocos2d-x supports from level 10.
 
+Learning Resources
+--------------------------------
+
+* [Programmers Guide](http://cocos2d-x.org/programmersguide/)
+* [Sonar Systems Videos](https://www.youtube.com/user/sonarsystemslimited/search?query=cocos2d-x)
+* [Android Fundamentals](https://developer.android.com/guide/components/fundamentals.html)
+* [Make School Tutorials](https://www.makeschool.com/tutorials/)
+* [Games From Scratch](http://www.gamefromscratch.com/page/Cocos2d-x-CPP-Game-Programming-Tutorial-Series.aspx)
+* [Cocos2d sample games](https://github.com/cocos2d/cocos2d-x-samples)
+
+Spreading the word!
+--------------------------------
+You can help us spread the word about cocos2d-x! We would surely appreciate it!
+
+* Talk about us on Facebook! Our [Facebook Page](https://www.facebook.com/cocos2dx/)
+* Tweet, Tweet! Our [Twitter](https://twitter.com/cocos2dx)
+* Read our [Blog](http://blog.cocos2d-x.org/) and promote it on your social media.
+* Become a [Regional Coordinator](http://discuss.cocos2d-x.org/t/we-need-regional-coordinators/24104)
+
+Where to get help
+--------------------------------
+
+* [Forums](http://discuss.cocos2d-x.org)
+* [Bug Tracker](https://github.com/cocos2d/cocos2d-x/issues)
+* IRC. We are in [Freenode](https://webchat.freenode.net/) in the _#cocos2d_ channel
+* `cpp-tests` project. This project is our basis for testing. Use this project to
+learn how we implement the functionality of the engine. This project is located in
+__cocos2d-x_root/build.__
+* [API Reference](http://cocos2d-x.org/wiki/Reference).
+* [Temporary Cocos2d-JS documents](http://cocos2d-x.org/docs/manual/framework/html5/en)
+* [Latest Release Note](https://github.com/cocos2d/cocos2d-x/blob/v3/docs/RELEASE_NOTES.md)
+* [Changelog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG)
 
 Contributing to the Project
 --------------------------------

cocos/2d/CCActionCatmullRom.h

@@ -173,7 +173,7 @@ class CC_DLL CardinalSplineTo : public ActionInterval
      * @code
      * When this function bound to js or lua,the input params are changed.
      * In js: var create(var t,var table)
-     * In lua: lcaol create(local t, local table)
+     * In lua: local create(local t, local table)
      * @endcode
      */
     static CardinalSplineTo* create(float duration, PointArray* points, float tension);
@@ -249,7 +249,7 @@ class CC_DLL CardinalSplineBy : public CardinalSplineTo
      * @code
      * When this function bound to js or lua,the input params are changed.
      * In js: var create(var t,var table).
-     * In lua: lcaol create(local t, local table).
+     * In lua: local create(local t, local table).
      * @param duration In seconds.
      * @param point An PointArray.
      * @param tension Goodness of fit.
@@ -285,7 +285,7 @@ class CC_DLL CatmullRomTo : public CardinalSplineTo
      * @code
      * When this function bound to js or lua,the input params are changed.
      * In js: var create(var dt,var table).
-     * In lua: lcaol create(local dt, local table).
+     * In lua: local create(local dt, local table).
      * @endcode
      */
     static CatmullRomTo* create(float dt, PointArray* points);
@@ -318,7 +318,7 @@ class CC_DLL CatmullRomBy : public CardinalSplineBy
      * @code
      * When this function bound to js or lua,the input params are changed.
      * In js: var create(var dt,var table).
-     * In lua: lcaol create(local dt, local table).
+     * In lua: local create(local dt, local table).
      * @endcode
      */
     static CatmullRomBy* create(float dt, PointArray* points);

cocos/2d/CCActionInterval.cpp

@@ -238,29 +238,30 @@ Sequence* Sequence::createWithVariableList(FiniteTimeAction *action1, va_list ar
 
 Sequence* Sequence::create(const Vector<FiniteTimeAction*>& arrayOfActions)
 {
-    Sequence* ret = nullptr;
-    do 
-    {
-        auto count = arrayOfActions.size();
-        CC_BREAK_IF(count == 0);
+    Sequence* seq = new (std::nothrow) Sequence;
 
-        auto prev = arrayOfActions.at(0);
+    if (seq && seq->init(arrayOfActions))
+        seq->autorelease();
+    return seq;
+}
 
-        if (count > 1)
-        {
-            for (int i = 1; i < count; ++i)
-            {
-                prev = createWithTwoActions(prev, arrayOfActions.at(i));
-            }
-        }
-        else
-        {
-            // If only one action is added to Sequence, make up a Sequence by adding a simplest finite time action.
-            prev = createWithTwoActions(prev, ExtraAction::create());
-        }
-        ret = static_cast<Sequence*>(prev);
-    }while (0);
-    return ret;
+bool Sequence::init(const Vector<FiniteTimeAction*>& arrayOfActions)
+{
+    auto count = arrayOfActions.size();
+    if (count == 0)
+        return true;
+
+    if (count == 1)
+        return initWithTwoActions(arrayOfActions.at(0), ExtraAction::create());
+
+    // else size > 1
+    auto prev = arrayOfActions.at(0);
+    for (int i = 1; i < count-1; ++i)
+    {
+        prev = createWithTwoActions(prev, arrayOfActions.at(i));
+    }
+
+    return initWithTwoActions(prev, arrayOfActions.at(count-1));
 }
 
 bool Sequence::initWithTwoActions(FiniteTimeAction *actionOne, FiniteTimeAction *actionTwo)
@@ -633,27 +634,10 @@ Spawn* Spawn::createWithVariableList(FiniteTimeAction *action1, va_list args)
 
 Spawn* Spawn::create(const Vector<FiniteTimeAction*>& arrayOfActions)
 {
-    Spawn* ret = nullptr;
-    do 
-    {
-        auto count = arrayOfActions.size();
-        CC_BREAK_IF(count == 0);
-        auto prev = arrayOfActions.at(0);
-        if (count > 1)
-        {
-            for (int i = 1; i < arrayOfActions.size(); ++i)
-            {
-                prev = createWithTwoActions(prev, arrayOfActions.at(i));
-            }
-        }
-        else
-        {
-            // If only one action is added to Spawn, make up a Spawn by adding a simplest finite time action.
-            prev = createWithTwoActions(prev, ExtraAction::create());
-        }
-        ret = static_cast<Spawn*>(prev);
-    }while (0);
+    Spawn* ret = new (std::nothrow) Spawn;
 
+    if (ret && ret->init(arrayOfActions))
+        ret->autorelease();
     return ret;
 }
 
@@ -666,6 +650,26 @@ Spawn* Spawn::createWithTwoActions(FiniteTimeAction *action1, FiniteTimeAction *
     return spawn;
 }
 
+bool Spawn::init(const Vector<FiniteTimeAction*>& arrayOfActions)
+{
+    auto count = arrayOfActions.size();
+
+    if (count == 0)
+        return true;
+
+    if (count == 1)
+        return initWithTwoActions(arrayOfActions.at(0), ExtraAction::create());
+
+    // else count > 1
+    auto prev = arrayOfActions.at(0);
+    for (int i = 1; i < count-1; ++i)
+    {
+        prev = createWithTwoActions(prev, arrayOfActions.at(i));
+    }
+
+    return initWithTwoActions(prev, arrayOfActions.at(count-1));
+}
+
 bool Spawn::initWithTwoActions(FiniteTimeAction *action1, FiniteTimeAction *action2)
 {
     CCASSERT(action1 != nullptr, "action1 can't be nullptr!");

cocos/2d/CCActionInterval.h

@@ -192,6 +192,7 @@ class CC_DLL Sequence : public ActionInterval
 
     /** initializes the action */
     bool initWithTwoActions(FiniteTimeAction *pActionOne, FiniteTimeAction *pActionTwo);
+    bool init(const Vector<FiniteTimeAction*>& arrayOfActions);
 
 protected:
     FiniteTimeAction *_actions[2];
@@ -393,7 +394,7 @@ class CC_DLL Spawn : public ActionInterval
     /** Creates the Spawn action.
      *
      * @param action1   The first spawned action.
-     * @param action2   THe second spawned action.
+     * @param action2   The second spawned action.
      * @return An autoreleased Spawn object.
      * @js NA
      */
@@ -417,6 +418,7 @@ class CC_DLL Spawn : public ActionInterval
 
     /** initializes the Spawn action with the 2 actions to spawn */
     bool initWithTwoActions(FiniteTimeAction *action1, FiniteTimeAction *action2);
+    bool init(const Vector<FiniteTimeAction*>& arrayOfActions);
 
 protected:
     FiniteTimeAction *_one;
@@ -875,7 +877,7 @@ class CC_DLL BezierBy : public ActionInterval
      * @code
      * When this function bound to js or lua,the input params are changed.
      * in js: var create(var t,var table)
-     * in lua: lcaol create(local t, local table)
+     * in lua: local create(local t, local table)
      * @endcode
      */
     static BezierBy* create(float t, const ccBezierConfig& c);
@@ -924,7 +926,7 @@ class CC_DLL BezierTo : public BezierBy
      * @code
      * when this function bound to js or lua,the input params are changed
      * in js: var create(var t,var table)
-     * in lua: lcaol create(local t, local table)
+     * in lua: local create(local t, local table)
      * @endcode
      */
     static BezierTo* create(float t, const ccBezierConfig& c);

cocos/2d/CCAnimation.cpp

@@ -82,7 +82,7 @@ AnimationFrame* AnimationFrame::clone() const
 
 // implementation of Animation
 
-Animation* Animation::create(void)
+Animation* Animation::create()
 {
     Animation *animation = new (std::nothrow) Animation();
     animation->init();

cocos/2d/CCAtlasNode.h

@@ -139,7 +139,7 @@ class CC_DLL AtlasNode : public Node, public TextureProtocol
     ssize_t _quadsToDraw;
     /** Color uniform. */
     GLint    _uniformColor;
-    /** This varible is only used for LabelAtlas FPS display. So plz don't modify its value. */
+    /** This variable is only used for LabelAtlas FPS display. So plz don't modify its value. */
     bool _ignoreContentScaleFactor;
     /** Quad command. */
     QuadCommand _quadCommand;

cocos/2d/CCCamera.cpp

@@ -481,4 +481,9 @@ void Camera::setBackgroundBrush(CameraBackgroundBrush* clearBrush)
     _clearBrush = clearBrush;
 }
 
+bool Camera::isBrushValid()
+{
+    return _clearBrush != nullptr && _clearBrush->isValid();
+}
+
 NS_CC_END

cocos/2d/CCCamera.h

@@ -271,7 +271,9 @@ class CC_DLL Camera :public Node
     CameraBackgroundBrush* getBackgroundBrush() const { return _clearBrush; }
 
     virtual void visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t parentFlags) override;
-    
+
+    bool isBrushValid();
+
 CC_CONSTRUCTOR_ACCESS:
     Camera();
     ~Camera();

cocos/2d/CCCameraBackgroundBrush.cpp

@@ -232,6 +232,8 @@ CameraBackgroundSkyBoxBrush::CameraBackgroundSkyBoxBrush()
 , _vertexBuffer(0)
 , _indexBuffer(0)
 , _texture(nullptr)
+, _actived(true)
+, _textureValid(true)
 {
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
     _backToForegroundListener = EventListenerCustom::create(EVENT_RENDERER_RECREATED,
@@ -296,6 +298,9 @@ CameraBackgroundSkyBoxBrush* CameraBackgroundSkyBoxBrush::create()
 
 void CameraBackgroundSkyBoxBrush::drawBackground(Camera* camera)
 {
+    if (!_actived)
+        return;
+
     Mat4 cameraModelMat = camera->getNodeToWorldTransform();
 
     Vec4 color(1.f, 1.f, 1.f, 1.f);
@@ -427,4 +432,23 @@ void CameraBackgroundSkyBoxBrush::setTexture(TextureCube*  texture)
     _glProgramState->setUniformTexture("u_Env", _texture);
 }
 
+bool CameraBackgroundSkyBoxBrush::isActived() const
+{
+    return _actived;
+}
+void CameraBackgroundSkyBoxBrush::setActived(bool actived)
+{
+    _actived = actived;
+}
+
+void CameraBackgroundSkyBoxBrush::setTextureValid(bool valid)
+{
+    _textureValid = valid;
+}
+
+bool CameraBackgroundSkyBoxBrush::isValid()
+{
+    return _actived;
+}
+
 NS_CC_END

cocos/2d/CCCameraBackgroundBrush.h

@@ -103,8 +103,10 @@ class CC_DLL CameraBackgroundBrush : public Ref
      * draw the background
      */
     virtual void drawBackground(Camera* camera) {}
-    
-CC_CONSTRUCTOR_ACCESS:
+
+    virtual bool isValid() { return true; }
+
+CC_CONSTRUCTOR_ACCESS :
     CameraBackgroundBrush();
     virtual ~CameraBackgroundBrush();
 
@@ -227,7 +229,7 @@ class CC_DLL CameraBackgroundSkyBoxBrush : public CameraBackgroundBrush
      */
     static CameraBackgroundSkyBoxBrush* create();
     /**
-     * Set skybox texutre 
+     * Set skybox texture 
      * @param texture Skybox texture
      */
     void setTexture(TextureCube*  texture);
@@ -236,8 +238,13 @@ class CC_DLL CameraBackgroundSkyBoxBrush : public CameraBackgroundBrush
      * Draw background
      */
     virtual void drawBackground(Camera* camera) override;
-    
-CC_CONSTRUCTOR_ACCESS:
+
+    bool isActived() const;
+    void setActived(bool actived);
+    virtual void setTextureValid(bool valid);
+    virtual bool isValid()override;
+
+CC_CONSTRUCTOR_ACCESS :
     CameraBackgroundSkyBoxBrush();
     virtual ~CameraBackgroundSkyBoxBrush();
 
@@ -258,6 +265,10 @@ class CC_DLL CameraBackgroundSkyBoxBrush : public CameraBackgroundBrush
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
     EventListenerCustom* _backToForegroundListener;
 #endif
+
+private:
+    bool _actived;
+    bool _textureValid;
 };
 
 NS_CC_END