Optimize the performance of zIndex when there are a large number of nodes.

EngineErrorMap.md

@@ -2715,3 +2715,7 @@ LabelAtlas '%s' cannot be loaded, raw texture does not exist.
 ### 9101
 
 LabelAtlas '%s' cannot be loaded, fnt data does not exist.
+
+### 9102
+
+Program not support highp precision, will change to mediump.

cocos2d/core/CCNode.js

@@ -814,9 +814,11 @@ let NodeDefines = {
          * !#en
          * Group of node.<br/>
          * Which Group this node belongs to will resolve that this node's collision components can collide with which other collision componentns.<br/>
+         * When adding a child node to a father node, child node's group will be set same as father node's group.<br/>
          * !#zh
          * 节点的分组。<br/>
          * 节点的分组将关系到节点的碰撞组件可以与哪些碰撞组件相碰撞。<br/>
+         * 子节点在被加入到父节点时 group 会与父节点同步。<br/>
          * @property group
          * @type {String}
          */
@@ -1459,13 +1461,7 @@ let NodeDefines = {
                     this._localZOrder = (this._localZOrder & 0x0000ffff) | (value << 16);
                     this.emit(EventType.SIBLING_ORDER_CHANGED);
 
-                    if (this._parent) {
-                        this._onSiblingIndexChanged();
-                    }
-                }
-
-                if (CC_JSB && CC_NATIVERENDERER) {
-                    this._proxy.updateZOrder();
+                    this._onSiblingIndexChanged();
                 }
             }
         },
@@ -1537,14 +1533,9 @@ let NodeDefines = {
 
     _onSiblingIndexChanged () {
         // update rendering scene graph, sort them by arrivalOrder
-        var parent = this._parent;
-        var siblings = parent._children;
-        var i = 0, len = siblings.length, sibling;
-        for (; i < len; i++) {
-            sibling = siblings[i];
-            sibling._updateOrderOfArrival();
+        if (this._parent) {
+            this._parent._delaySort();
         }
-        parent._delaySort();
     },
 
     _onPreDestroy () {
@@ -3475,16 +3466,7 @@ let NodeDefines = {
     _updateOrderOfArrival () {
         var arrivalOrder = this._parent ? ++this._parent._childArrivalOrder : 0;
         this._localZOrder = (this._localZOrder & 0xffff0000) | arrivalOrder;
-        // redistribute
-        if (arrivalOrder === 0x0000ffff) {
-            var siblings = this._parent._children;
-
-            siblings.forEach(function (node, index) {
-                node._localZOrder = (node._localZOrder & 0xffff0000) | (index + 1);
-            });
-
-            this._parent._childArrivalOrder = siblings.length;
-        }
+
         this.emit(EventType.SIBLING_ORDER_CHANGED);
     },
 
@@ -3549,16 +3531,25 @@ let NodeDefines = {
      */
     sortAllChildren () {
         if (this._reorderChildDirty) {
+
+            this._reorderChildDirty = false;
+
+            // delay update arrivalOrder before sort children
+            var _children = this._children, child;
+            this._parent && (this._parent._childArrivalOrder = 1);
+            for (let i = 0, len = _children.length; i < len; i++) {
+                child = _children[i];
+                child._updateOrderOfArrival();
+            }
+
             // Optimize reordering event code to fix problems with setting zindex
             // https://github.com/cocos-creator/2d-tasks/issues/1186
             eventManager._setDirtyForNode(this);
 
-            this._reorderChildDirty = false;
-            var _children = this._children;
             if (_children.length > 1) {
                 // insertion sort
-                var len = _children.length, i, j, child;
-                for (i = 1; i < len; i++) {
+                var j, child;
+                for (let i = 1, len = _children.length; i < len; i++) {
                     child = _children[i];
                     j = i - 1;
 

cocos2d/core/assets/material/material-pool.js

@@ -39,7 +39,7 @@ class MaterialPool extends Pool {
     }
 
     put (mat) {
-        if (!this.enabled) {
+        if (!this.enabled || !mat._owner) {
             return;
         }
 

cocos2d/core/node-activator.js

@@ -187,7 +187,9 @@ var NodeActivator = cc.Class({
                 --originCount;
             }
         }
+
         node._childArrivalOrder = node._children.length;
+
         // activate children recursively
         for (let i = 0, len = node._children.length; i < len; ++i) {
             let child = node._children[i];

cocos2d/core/platform/CCSys.js

@@ -822,7 +822,11 @@ function initSys () {
             osMainVersion = parseInt(osVersion) || 0;
         }
         // refer to https://github.com/cocos-creator/engine/pull/5542 , thanks for contribition from @krapnikkk
-        else if (/(iPhone|iPad|iPod|MacIntel)/.exec(nav.platform)) { 
+        // ipad OS 13 safari identifies itself as "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15) AppleWebKit/605.1.15 (KHTML, like Gecko)" 
+        // so use maxTouchPoints to check whether it's desktop safari or not. 
+        // reference: https://stackoverflow.com/questions/58019463/how-to-detect-device-name-in-safari-on-ios-13-while-it-doesnt-show-the-correct
+        // FIXME: should remove it when touch-enabled macs are available
+        else if (/(iPhone|iPad|iPod)/.exec(nav.platform) || (nav.platform === 'MacIntel' && nav.maxTouchPoints && nav.maxTouchPoints > 1)) { 
             iOS = true;
             osVersion = '';
             osMainVersion = 0;

cocos2d/renderer/core/program-lib.js

@@ -63,6 +63,10 @@ function _unrollLoops(string) {
   return string.replace(pattern, replace);
 }
 
+function _replaceHighp(string) {
+  return string.replace(/\bhighp\b/g, 'mediump');
+}
+
 export default class ProgramLib {
   /**
    * @param {gfx.Device} device
@@ -73,6 +77,8 @@ export default class ProgramLib {
     // register templates
     this._templates = {};
     this._cache = {};
+
+    this._checkPrecision();
   }
 
   clear () {
@@ -228,8 +234,15 @@ export default class ProgramLib {
     let customDef = _generateDefines(defineList);
     let vert = _replaceMacroNums(tmpl.vert, defineList);
     vert = customDef + _unrollLoops(vert);
+    if (!this._highpSupported) {
+      vert = _replaceHighp(vert);
+    }
+
     let frag = _replaceMacroNums(tmpl.frag, defineList);
     frag = customDef + _unrollLoops(frag);
+    if (!this._highpSupported) {
+      frag = _replaceHighp(frag);
+    }
 
     program = new gfx.Program(this._device, {
       vert,
@@ -266,4 +279,19 @@ export default class ProgramLib {
       }
     }
   }
+
+  _checkPrecision () {
+    let gl = this._device._gl;
+    let highpSupported = false;
+    if (gl.getShaderPrecisionFormat) {
+        let vertHighp = gl.getShaderPrecisionFormat(gl.VERTEX_SHADER, gl.HIGH_FLOAT);
+        let fragHighp = gl.getShaderPrecisionFormat(gl.FRAGMENT_SHADER, gl.HIGH_FLOAT);
+        highpSupported = (vertHighp && vertHighp.precision > 0) &&
+          (fragHighp && fragHighp.precision > 0);
+    }
+    if (!highpSupported) {
+      cc.warnID(9102);
+    }
+    this._highpSupported = highpSupported;
+  }
 }