rename checkCameraMask to isVisibleByVisitingCamera

cocos/2d/CCClippingNode.cpp

@@ -261,7 +261,7 @@ void ClippingNode::visit(Renderer *renderer, const Mat4 &parentTransform, uint32
     renderer->addCommand(&_afterDrawStencilCmd);
 
     int i = 0;
-    bool visibleByCamera = checkCameraMask();
+    bool visibleByCamera = isVisibleByVisitingCamera();
     
     if(!_children.empty())
     {

cocos/2d/CCLabel.cpp

@@ -1053,7 +1053,7 @@ void Label::drawTextSprite(Renderer *renderer, uint32_t parentFlags)
 
 void Label::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags)
 {
-    if (! _visible || _originalUTF8String.empty() || !checkCameraMask())
+    if (! _visible || _originalUTF8String.empty() || !isVisibleByVisitingCamera())
     {
         return;
     }

cocos/2d/CCNode.cpp

@@ -1225,7 +1225,7 @@ uint32_t Node::processParentFlags(const Mat4& parentTransform, uint32_t parentFl
     return flags;
 }
 
-bool Node::checkCameraMask() const
+bool Node::isVisibleByVisitingCamera() const
 {
     auto camera = Camera::getVisitingCamera();
     bool visibleByCamera = camera ? (unsigned short)camera->getCameraFlag() & _cameraMask : true;
@@ -1249,7 +1249,7 @@ void Node::visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t paren
     director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
     
-    bool visibleByCamera = checkCameraMask();
+    bool visibleByCamera = isVisibleByVisitingCamera();
 
     int i = 0;
 

cocos/2d/CCNode.h

@@ -1522,7 +1522,7 @@ protected:
     bool doEnumerateRecursive(const Node* node, const std::string &name, std::function<bool (Node *)> callback) const;
     
     //check whether this camera mask is visible by the current visiting camera
-    bool checkCameraMask() const;
+    bool isVisibleByVisitingCamera() const;
     
 #if CC_USE_PHYSICS
     void updatePhysicsBodyTransform(Scene* layer);

cocos/2d/CCNodeGrid.cpp

@@ -126,7 +126,7 @@ void NodeGrid::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t p
     }
     
     int i = 0;
-    bool visibleByCamera = checkCameraMask();
+    bool visibleByCamera = isVisibleByVisitingCamera();
 
     if(!_children.empty())
     {

cocos/2d/CCParticleBatchNode.cpp

@@ -130,7 +130,7 @@ void ParticleBatchNode::visit(Renderer *renderer, const Mat4 &parentTransform, u
     // The alternative is to have a void Sprite#visit, but
     // although this is less maintainable, is faster
     //
-    if (!_visible || !checkCameraMask())
+    if (!_visible || !isVisibleByVisitingCamera())
     {
         return;
     }

cocos/2d/CCProtectedNode.cpp

@@ -318,7 +318,7 @@ void ProtectedNode::visit(Renderer* renderer, const Mat4 &parentTransform, uint3
     //
     // draw self
     //
-    if (checkCameraMask())
+    if (isVisibleByVisitingCamera())
         this->draw(renderer, _modelViewTransform, flags);
     
     //

cocos/2d/CCRenderTexture.cpp

@@ -393,7 +393,7 @@ void RenderTexture::visit(Renderer *renderer, const Mat4 &parentTransform, uint3
 {
     // override visit.
 	// Don't call visit on its children
-    if (!_visible || !checkCameraMask())
+    if (!_visible || !isVisibleByVisitingCamera())
     {
         return;
     }

cocos/2d/CCSpriteBatchNode.cpp

@@ -147,7 +147,7 @@ void SpriteBatchNode::visit(Renderer *renderer, const Mat4 &parentTransform, uin
     // The alternative is to have a void Sprite#visit, but
     // although this is less maintainable, is faster
     //
-    if (! _visible || !checkCameraMask())
+    if (! _visible || !isVisibleByVisitingCamera())
     {
         return;
     }

cocos/editor-support/cocostudio/CCArmature.cpp

@@ -467,7 +467,7 @@ void Armature::onExit()
 void Armature::visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags)
 {
     // quick return if not visible. children won't be drawn.
-    if (!_visible || !checkCameraMask())
+    if (!_visible || !isVisibleByVisitingCamera())
     {
         return;
     }

cocos/editor-support/cocostudio/CCBatchNode.cpp

@@ -108,7 +108,7 @@ void BatchNode::removeChild(Node* child, bool cleanup)
 void BatchNode::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags)
 {
     // quick return if not visible. children won't be drawn.
-    if (!_visible || !checkCameraMask())
+    if (!_visible || !isVisibleByVisitingCamera())
     {
         return;
     }

cocos/ui/UIScale9Sprite.cpp

@@ -774,7 +774,7 @@ y+=ytranslate;                       \
         //
         // draw self
         //
-        if (checkCameraMask())
+        if (isVisibleByVisitingCamera())
             this->draw(renderer, _modelViewTransform, flags);
         
         //

extensions/GUI/CCScrollView/CCScrollView.cpp

@@ -581,7 +581,7 @@ void ScrollView::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
 
     this->beforeDraw();
-    bool visibleByCamera = checkCameraMask();
+    bool visibleByCamera = isVisibleByVisitingCamera();
 
 	if (!_children.empty())
     {

tools/cocos2d-console

@@ -1 +1 @@
-Subproject commit 5db5a4283aa22e362901e2924146ad66c2e1484f
+Subproject commit 4b020e4900e601a2d5845095f2e6970c13c59613