visit() using Matrix instead of kmMat4

cocos/2d/CCClippingNode.cpp

@@ -200,7 +200,7 @@ void ClippingNode::drawFullScreenQuadClearStencil()
     
 }
 
-void ClippingNode::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void ClippingNode::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if(!_visible)
         return;

cocos/2d/CCClippingNode.h

@@ -95,7 +95,7 @@ public:
      * @lua NA
      */
     virtual void onExit() override;
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     
 CC_CONSTRUCTOR_ACCESS:
     ClippingNode();

cocos/2d/CCLabel.cpp

@@ -1098,7 +1098,7 @@ void Label::drawTextSprite(Renderer *renderer, bool parentTransformUpdated)
     _textSprite->visit(renderer, _modelViewTransform, parentTransformUpdated);
 }
 
-void Label::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void Label::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if (! _visible || _originalUTF8String.empty())
     {

cocos/2d/CCLabel.h

@@ -240,7 +240,7 @@ public:
 
     virtual Rect getBoundingBox() const override;
 
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     virtual void draw(Renderer *renderer, const kmMat4 &transform, bool transformUpdated) override;
 
     /** Listen "come to background" message

cocos/2d/CCLabelTTF.cpp

@@ -262,7 +262,7 @@ void LabelTTF::setFlippedY(bool flippedY)
     }
 }
 
-void LabelTTF::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void LabelTTF::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if (_contentDirty)
     {

cocos/2d/CCLabelTTF.h

@@ -150,7 +150,7 @@ public:
      * @lua NA
      */
     virtual std::string getDescription() const override;
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     virtual const Size& getContentSize() const override;
 protected:
     Label*    _renderLabel;

cocos/2d/CCNode.cpp

@@ -938,7 +938,7 @@ void Node::visit()
     visit(renderer, parentTransform, true);
 }
 
-void Node::visit(Renderer* renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void Node::visit(Renderer* renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     // quick return if not visible. children won't be drawn.
     if (!_visible)

cocos/2d/CCNode.h

@@ -929,7 +929,7 @@ public:
     /**
      * Visits this node's children and draw them recursively.
      */
-    virtual void visit(Renderer *renderer, const kmMat4& parentTransform, bool parentTransformUpdated);
+    virtual void visit(Renderer *renderer, const Matrix& parentTransform, bool parentTransformUpdated);
     virtual void visit() final;
 
 

cocos/2d/CCNodeGrid.cpp

@@ -82,7 +82,7 @@ void NodeGrid::onGridEndDraw()
     }
 }
 
-void NodeGrid::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void NodeGrid::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     // quick return if not visible. children won't be drawn.
     if (!_visible)

cocos/2d/CCNodeGrid.h

@@ -55,7 +55,7 @@ public:
     void setTarget(Node *target);
 
     // overrides
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
 
 protected:
     NodeGrid();

cocos/2d/CCParallaxNode.cpp

@@ -145,7 +145,7 @@ The positions are updated at visit because:
 - using a timer is not guaranteed that it will called after all the positions were updated
 - overriding "draw" will only precise if the children have a z > 0
 */
-void ParallaxNode::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void ParallaxNode::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     //    Point pos = position_;
     //    Point    pos = [self convertToWorldSpace:Point::ZERO];

cocos/2d/CCParallaxNode.h

@@ -67,7 +67,7 @@ public:
     virtual void addChild(Node * child, int zOrder, int tag) override;
     virtual void removeChild(Node* child, bool cleanup) override;
     virtual void removeAllChildrenWithCleanup(bool cleanup) override;
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
 
 protected:
     /** Adds a child to the container with a z-order, a parallax ratio and a position offset

cocos/2d/CCParticleBatchNode.cpp

@@ -120,7 +120,7 @@ bool ParticleBatchNode::initWithFile(const std::string& fileImage, int capacity)
 
 // override visit.
 // Don't call visit on it's children
-void ParticleBatchNode::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void ParticleBatchNode::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     // CAREFUL:
     // This visit is almost identical to Node#visit

cocos/2d/CCParticleBatchNode.h

@@ -91,7 +91,7 @@ public:
     inline void setTextureAtlas(TextureAtlas* atlas) { _textureAtlas = atlas; };
     
     // Overrides
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
 
     using Node::addChild;
     virtual void addChild(Node * child, int zOrder, int tag) override;

cocos/2d/CCRenderTexture.cpp

@@ -383,7 +383,7 @@ void RenderTexture::clearStencil(int stencilValue)
     glClearStencil(stencilClearValue);
 }
 
-void RenderTexture::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void RenderTexture::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     // override visit.
 	// Don't call visit on its children

cocos/2d/CCRenderTexture.h

@@ -154,7 +154,7 @@ public:
     };
     
     // Overrides
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     virtual void draw(Renderer *renderer, const kmMat4 &transform, bool transformUpdated) override;
 
     //flag: use stack matrix computed from scene hierarchy or generate new modelView and projection matrix

cocos/2d/CCSpriteBatchNode.cpp

@@ -131,7 +131,7 @@ SpriteBatchNode::~SpriteBatchNode()
 
 // override visit
 // don't call visit on it's children
-void SpriteBatchNode::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void SpriteBatchNode::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     CC_PROFILER_START_CATEGORY(kProfilerCategoryBatchSprite, "CCSpriteBatchNode - visit");
 

cocos/2d/CCSpriteBatchNode.h

@@ -155,7 +155,7 @@ public:
     */
     virtual const BlendFunc& getBlendFunc() const override;
 
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     
     using Node::addChild;
     virtual void addChild(Node * child, int zOrder, int tag) override;

cocos/2d/CCTextFieldTTF.cpp

@@ -263,7 +263,7 @@ void TextFieldTTF::setTextColor(const Color4B &color)
     Label::setTextColor(_colorText);
 }
 
-void TextFieldTTF::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void TextFieldTTF::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if (_delegate && _delegate->onVisit(this,renderer,parentTransform,parentTransformUpdated))
     {

cocos/2d/CCTextFieldTTF.h

@@ -165,7 +165,7 @@ public:
     virtual void setSecureTextEntry(bool value);
     virtual bool isSecureTextEntry();
 
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
 
 protected:
     //////////////////////////////////////////////////////////////////////////

cocos/editor-support/cocostudio/CCArmature.cpp

@@ -445,7 +445,7 @@ void Armature::onExit()
 }
 
 
-void Armature::visit(cocos2d::Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void Armature::visit(cocos2d::Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     // quick return if not visible. children won't be drawn.
     if (!_visible)

cocos/editor-support/cocostudio/CCArmature.h

@@ -159,7 +159,7 @@ public:
      * @js NA
      * @lua NA
      */
-    virtual void visit(cocos2d::Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(cocos2d::Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     virtual void draw(cocos2d::Renderer *renderer, const kmMat4 &transform, bool transformUpdated) override;
     virtual void update(float dt) override;
 

cocos/editor-support/cocostudio/CCBatchNode.cpp

@@ -101,7 +101,7 @@ void BatchNode::removeChild(Node* child, bool cleanup)
     Node::removeChild(child, cleanup);
 }
 
-void BatchNode::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void BatchNode::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     // quick return if not visible. children won't be drawn.
     if (!_visible)

cocos/editor-support/cocostudio/CCBatchNode.h

@@ -34,6 +34,8 @@ namespace cocos2d {
 
 namespace cocostudio {
 
+USING_NS_CC_MATH;
+    
 class BatchNode : public cocos2d::Node
 {
 public:
@@ -56,7 +58,7 @@ public:
     virtual void addChild(cocos2d::Node *pChild, int zOrder) override;
     virtual void addChild(cocos2d::Node *pChild, int zOrder, int tag) override;
     virtual void removeChild(cocos2d::Node* child, bool cleanup) override;
-    virtual void visit(cocos2d::Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(cocos2d::Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     virtual void draw(cocos2d::Renderer *renderer, const kmMat4 &transform, bool transformUpdated) override;
     
 protected:

cocos/ui/CCProtectedNode.cpp

@@ -272,7 +272,7 @@ void ProtectedNode::reorderProtectedChild(cocos2d::Node *child, int localZOrder)
     child->_setLocalZOrder(localZOrder);
 }
 
-void ProtectedNode::visit(Renderer* renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void ProtectedNode::visit(Renderer* renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     // quick return if not visible. children won't be drawn.
     if (!_visible)

cocos/ui/CCProtectedNode.h

@@ -127,7 +127,7 @@ public:
     
     /// @} end of Children and Parent
     
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool transformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool transformUpdated) override;
     
     virtual void cleanup() override;
     

cocos/ui/UILayout.cpp

@@ -712,7 +712,7 @@ bool Layout::hitTest(const Point &pt)
     return false;
 }
     
-void Layout::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void Layout::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if (!_enabled)
     {

cocos/ui/UILayout.h

@@ -240,7 +240,7 @@ public:
      */
     virtual void addChild(Node* child, int zOrder, int tag) override;
     
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
 
     virtual void removeChild(Node* child, bool cleanup = true) override;
     

cocos/ui/UIRichText.cpp

@@ -420,7 +420,7 @@ void RichText::pushToContainer(cocos2d::Node *renderer)
     _elementRenders[_elementRenders.size()-1]->pushBack(renderer);
 }
 
-void RichText::visit(cocos2d::Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void RichText::visit(cocos2d::Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if (_enabled)
     {

cocos/ui/UIRichText.h

@@ -102,7 +102,7 @@ public:
     void pushBackElement(RichElement* element);
     void removeElement(int index);
     void removeElement(RichElement* element);
-    virtual void visit(cocos2d::Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(cocos2d::Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     void setVerticalSpace(float space);
     virtual void setAnchorPoint(const Point &pt);
     virtual const Size& getContentSize() const;

cocos/ui/UIWidget.cpp

@@ -108,7 +108,7 @@ void Widget::onExit()
     ProtectedNode::onExit();
 }
 
-void Widget::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void Widget::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if (_enabled)
     {

cocos/ui/UIWidget.h

@@ -208,7 +208,7 @@ public:
      */
     virtual Widget* getChildByName(const char* name);
 
-    virtual void visit(cocos2d::Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(cocos2d::Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
 
     /**
      * Sets the touch event target/selector of the menu item

extensions/GUI/CCControlExtension/CCScale9Sprite.cpp

@@ -764,7 +764,7 @@ void Scale9Sprite::setInsetBottom(float insetBottom)
     this->updateCapInset();
 }
 
-void Scale9Sprite::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void Scale9Sprite::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     if(this->_positionsAreDirty)
     {

extensions/GUI/CCControlExtension/CCScale9Sprite.h

@@ -261,7 +261,7 @@ public:
      * @js NA
      * @lua NA
      */
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     virtual void setOpacityModifyRGB(bool bValue) override;
     virtual bool isOpacityModifyRGB(void) const override;
     virtual void setOpacity(GLubyte opacity) override;

extensions/GUI/CCEditBox/CCEditBox.cpp

@@ -318,7 +318,7 @@ void EditBox::setAnchorPoint(const Point& anchorPoint)
     }
 }
 
-void EditBox::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void EditBox::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
     ControlButton::visit(renderer, parentTransform, parentTransformUpdated);
     if (_editBoxImpl != NULL)

extensions/GUI/CCEditBox/CCEditBox.h

@@ -379,7 +379,7 @@ public:
      * @js NA
      * @lua NA
      */
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     /**
      * @js NA
      * @lua NA

extensions/GUI/CCScrollView/CCScrollView.cpp

@@ -553,7 +553,7 @@ void ScrollView::onAfterDraw()
     }
 }
 
-void ScrollView::visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated)
+void ScrollView::visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated)
 {
 	// quick return if not visible
 	if (!isVisible())

extensions/GUI/CCScrollView/CCScrollView.h

@@ -225,7 +225,7 @@ public:
      * @js NA
      * @lua NA
      */
-    virtual void visit(Renderer *renderer, const kmMat4 &parentTransform, bool parentTransformUpdated) override;
+    virtual void visit(Renderer *renderer, const Matrix &parentTransform, bool parentTransformUpdated) override;
     
     using Node::addChild;
     virtual void addChild(Node * child, int zOrder, int tag) override;