Merge branch 'v3' into v3_fixRenderer

cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp

@@ -182,6 +182,10 @@ ActionTimeline* ActionTimeline::clone() const
         }
     }
     
+    for( auto info : _animationInfos)
+    {
+        newAction->addAnimationInfo(info.second);
+    }
     return newAction;
 }
 

cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp

@@ -481,6 +481,9 @@ InnerActionFrame::InnerActionFrame()
 void InnerActionFrame::onEnter(Frame *nextFrame, int currentFrameIndex)
 {
     auto innerActiontimeline = static_cast<ActionTimeline*>(_node->getActionByTag(_node->getTag()));
+    if( nullptr == innerActiontimeline)
+        return;
+    
     if (InnerActionType::SingleFrame == _innerActionType)
     {
         innerActiontimeline->gotoFrameAndPause(_singleFrameIndex);

cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp

@@ -833,20 +833,24 @@ Node* CSLoader::nodeWithFlatBuffers(const flatbuffers::NodeTree *nodetree)
         auto projectNodeOptions = (ProjectNodeOptions*)options->data();
         std::string filePath = projectNodeOptions->fileName()->c_str();
         CCLOG("filePath = %s", filePath.c_str());
+        
+        cocostudio::timeline::ActionTimeline* action = nullptr;
         if (filePath != "" && FileUtils::getInstance()->isFileExist(filePath))
         {
-            
             node = createNodeWithFlatBuffersFile(filePath);
-            reader->setPropsWithFlatBuffers(node, options->data());
+            action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersFile(filePath);
             
-            cocostudio::timeline::ActionTimeline* action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersFile(filePath);
+        }
+        else
+        {
+            node = Node::create();
+        }
+        reader->setPropsWithFlatBuffers(node, options->data());
         if (action)
         {
             node->runAction(action);
             action->gotoFrameAndPause(0);
         }
-            
-        }
     }
     else if (classname == "SimpleAudio")
     {
@@ -1164,19 +1168,24 @@ Node* CSLoader::nodeWithFlatBuffersForSimulator(const flatbuffers::NodeTree *nod
         std::string filePath = projectNodeOptions->fileName()->c_str();
         CCLOG("filePath = %s", filePath.c_str());
         
+        cocostudio::timeline::ActionTimeline* action = nullptr;
         if (filePath != "" && FileUtils::getInstance()->isFileExist(filePath))
         {
-            node = createNodeWithFlatBuffersForSimulator(filePath);
-            reader->setPropsWithFlatBuffers(node, options->data());
+            node = createNodeWithFlatBuffersFile(filePath);
+            action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersFile(filePath);
             
-            cocostudio::timeline::ActionTimeline* action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersForSimulator(filePath);
+        }
+        else
+        {
+            node = Node::create();
+        }
+        reader->setPropsWithFlatBuffers(node, options->data());
         if (action)
         {
             node->runAction(action);
             action->gotoFrameAndPause(0);
         }
     }
-    }
     else if (classname == "SimpleAudio")
     {
         node = Node::create();

cocos/scripting/lua-bindings/auto/api/EditBox.lua

@@ -254,6 +254,12 @@
 -- @param #vec2_table anchorPoint
 -- @return EditBox#EditBox self (return value: ccui.EditBox)
         
+--------------------------------
+-- Returns the "class name" of widget.
+-- @function [parent=#EditBox] getDescription 
+-- @param self
+-- @return string#string ret (return value: string)
+        
 --------------------------------
 -- 
 -- @function [parent=#EditBox] setPosition 

cocos/ui/UIButton.cpp

@@ -449,16 +449,10 @@ void Button::onPressStateChangedToPressed()
             _buttonNormalRenderer->setScale(_pressedTextureScaleXInSize + _zoomScale, _pressedTextureScaleYInSize + _zoomScale);
             
             _titleRenderer->stopAllActions();
+            
             Action *zoomTitleAction = ScaleTo::create(ZOOM_ACTION_TIME_STEP, 1.0f + _zoomScale, 1.0f + _zoomScale);
-            if (_unifySize)
-            {
             _titleRenderer->runAction(zoomTitleAction);
         }
-            else
-            {
-                _titleRenderer->runAction(zoomTitleAction->clone());
-            }
-        }
     }
     else
     {

cocos/ui/UIEditBox/UIEditBox.cpp

@@ -385,6 +385,11 @@ void EditBox::setAnchorPoint(const Vec2& anchorPoint)
     }
 }
 
+std::string EditBox::getDescription() const
+{
+    return "EditBox";
+}
+
 void EditBox::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags)
 {
     Widget::visit(renderer, parentTransform, parentFlags);

cocos/ui/UIEditBox/UIEditBox.h

@@ -394,6 +394,12 @@ namespace ui {
             virtual void setVisible(bool visible) override;
             virtual void setContentSize(const Size& size) override;
             virtual void setAnchorPoint(const Vec2& anchorPoint) override;
+
+            /**
+             * Returns the "class name" of widget.
+             */
+            virtual std::string getDescription() const override;
+
             /**
              * @js NA
              * @lua NA

cocos/ui/UILoadingBar.cpp

@@ -193,6 +193,8 @@ void LoadingBar::loadTexture(const std::string& texture,TextureResType texType)
 
     barRendererScaleChangedWithSize();
     updateContentSizeWithTextureSize(_barRendererTextureSize);
+    
+    this->updateProgressBar();
     _barRendererAdaptDirty = true;
 }
 
@@ -216,7 +218,7 @@ void LoadingBar::setScale9Enabled(bool enabled)
         ignoreContentAdaptWithSize(_prevIgnoreSize);
     }
     setCapInsets(_capInsets);
-    setPercent(_percent);
+    this->updateProgressBar();
     _barRendererAdaptDirty = true;
 }
 
@@ -255,18 +257,24 @@ void LoadingBar::setPercent(float percent)
         return;
     }
      _percent = percent;
+    
     if (_totalLength <= 0)
     {
         return;
     }
-    float res = _percent / 100.0f;
     
+    this->updateProgressBar();
+}
+    
+void LoadingBar::updateProgressBar()
+{
     if (_scale9Enabled)
     {
         setScale9Scale();
     }
     else
     {
+        float res = _percent / 100.0f;
         Sprite* spriteRenderer = _barRenderer->getSprite();
         Rect rect = spriteRenderer->getTextureRect();
         rect.size.width = _barRendererTextureSize.width * res;
@@ -334,7 +342,7 @@ void LoadingBar::barRendererScaleChangedWithSize()
         _totalLength = _contentSize.width;
         if (_scale9Enabled)
         {
-            setScale9Scale();
+            this->setScale9Scale();
             _barRenderer->setScale(1.0f);
         }
         else

cocos/ui/UILoadingBar.h

@@ -148,6 +148,7 @@ protected:
     virtual void onSizeChanged() override;
    
     void setScale9Scale();
+    void updateProgressBar();
     void barRendererScaleChangedWithSize();
     
     virtual void adaptRenderers() override;

tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp

@@ -139,7 +139,7 @@ g_guisTests[] =
             UISceneManager* sceneManager = UISceneManager::sharedUISceneManager();
             sceneManager->setCurrentUISceneId(kUILoadingBarTest_Left);
             sceneManager->setMinUISceneId(kUILoadingBarTest_Left);
-            sceneManager->setMaxUISceneId(kUILoadingBarTest_Right_Scale9);
+            sceneManager->setMaxUISceneId(kUILoadingBarReloadTexture);
             Scene* scene = sceneManager->currentUIScene();
             Director::getInstance()->replaceScene(scene);
         }

tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp

@@ -397,3 +397,89 @@ bool UILoadingBarTest_Scale9_State_Change::init()
     }
     return false;
 }
+
+
+// UILoadingBarReloadTexture
+
+UILoadingBarReloadTexture::UILoadingBarReloadTexture()
+: _count(0)
+{
+    
+}
+
+UILoadingBarReloadTexture::~UILoadingBarReloadTexture()
+{
+    
+}
+
+bool UILoadingBarReloadTexture::init()
+{
+    if (UIScene::init())
+    {
+        Size widgetSize = _widget->getContentSize();
+        
+        // Add the alert
+        Text *alert = Text::create("Click button to Toggle Scale9 and switch Texture.", "fonts/Marker Felt.ttf", 20);
+        alert->setColor(Color3B(159, 168, 176));
+        alert->setPosition(Vec2(widgetSize.width / 2.0f,
+                                widgetSize.height / 2.0f - alert->getContentSize().height * 2.7f));
+        _uiLayer->addChild(alert);
+        
+        LoadingBar* loadingBar = LoadingBar::create("cocosui/slider_bar_active_9patch.png");
+        loadingBar->setTag(0);
+        loadingBar->ignoreContentAdaptWithSize(false);
+//        loadingBar->setScale9Enabled(true);
+        loadingBar->setCapInsets(Rect(0, 0, 0, 0));
+        loadingBar->setContentSize(Size(300, 13));
+        loadingBar->setName("texture0");
+        loadingBar->setDirection(LoadingBar::Direction::RIGHT);
+        loadingBar->setPercent(70);
+        loadingBar->setPosition(Vec2(widgetSize.width / 2.0f,
+                                     widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f));
+        
+        _uiLayer->addChild(loadingBar);
+        
+        auto buttonScale9 = Button::create("cocosui/animationbuttonnormal.png",
+                                           "cocosui/animationbuttonpressed.png");
+        buttonScale9->setTitleText("ToggleScale9");
+        buttonScale9->addClickEventListener([=](Ref*){
+            loadingBar->setScale9Enabled(!loadingBar->isScale9Enabled());
+        });
+        buttonScale9->setPosition(loadingBar->getPosition() + Vec2(-50,50));
+        _uiLayer->addChild(buttonScale9);
+        
+        auto buttonChangeTexture = Button::create("cocosui/animationbuttonnormal.png",
+                                                  "cocosui/animationbuttonpressed.png");
+        buttonChangeTexture->setTitleText("ChangeTexture");
+        buttonChangeTexture->addClickEventListener([=](Ref*){
+            auto name = loadingBar->getName();
+            if (name == "texture0")
+            {
+                loadingBar->loadTexture("cocosui/slider_bar_active_9patch2.png");
+                loadingBar->setName("texture1");
+            }
+            else
+            {
+                loadingBar->loadTexture("cocosui/slider_bar_active_9patch.png");
+                loadingBar->setName("texture0");
+            }
+        });
+        buttonChangeTexture->setPosition(loadingBar->getPosition() + Vec2(50,50));
+        _uiLayer->addChild(buttonChangeTexture);
+        
+        this->scheduleUpdate();
+        return true;
+    }
+    return false;
+}
+
+void UILoadingBarReloadTexture::update(float delta)
+{
+    _count++;
+    if (_count > 100)
+    {
+        _count = 0;
+    }
+    LoadingBar* loadingBar = static_cast<LoadingBar*>(_uiLayer->getChildByTag(0));
+    loadingBar->setPercent(_count);
+}

tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h

@@ -107,4 +107,18 @@ protected:
     int _count;
 };
 
+class UILoadingBarReloadTexture : public UIScene
+{
+public:
+    UILoadingBarReloadTexture();
+    ~UILoadingBarReloadTexture();
+    void update(float dt);
+    bool init();
+    
+protected:
+    UI_SCENE_CREATE_FUNC(UILoadingBarReloadTexture);
+    int _count;
+    
+};
+
 #endif /* defined(__TestCpp__UILoadingBarTest__) */

tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp

@@ -71,6 +71,7 @@ static const char* s_testArray[] =
     "UILoadingBarTest_Scale9_State_Change",
     "UILoadingBarTest_Left_Scale9",
     "UILoadingBarTest_Right_Scale9",
+    "UILoadingBarReloadTexture",
   
     "UITextAtlasTest",
     "UITextTest",
@@ -284,6 +285,8 @@ Scene *UISceneManager::currentUIScene()
             
         case kUILoadingBarTest_Right_Scale9:
             return UILoadingBarTest_Right_Scale9::sceneWithTitle(s_testArray[_currentUISceneId]);
+        case kUILoadingBarReloadTexture:
+            return UILoadingBarReloadTexture::sceneWithTitle(s_testArray[_currentUISceneId]);
             
         case kUITextAtlasTest:
             return UITextAtlasTest::sceneWithTitle(s_testArray[_currentUISceneId]);

tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h

@@ -66,6 +66,7 @@ enum
     kUILoadingBarTest_Scale9_State_Change,
     kUILoadingBarTest_Left_Scale9,
     kUILoadingBarTest_Right_Scale9,
+    kUILoadingBarReloadTexture,
     kUITextAtlasTest,
     kUITextTest,
     kUITextTest_LineWrap,

tests/cpp-tests/Resources/ccs-res

@@ -1 +1 @@
-Subproject commit 615f52a6c5fc1f60c6f01832d110c78a65be3a11
+Subproject commit ce5606d4e520d2671a678b0ba3d5a0b84fdb5ab9