Merge pull request #3368 from pandamicro/develop

Improve mobile browser adaptation

Author: pandamicro

CCBoot.js

@@ -1742,7 +1742,7 @@ var _initSys = function () {
     sys.browserType = sys.BROWSER_TYPE_UNKNOWN;
     /* Determine the browser type */
     (function(){
-        var typeReg1 = /mqqbrowser|sogou|qzone|liebao|micromessenger|ucbrowser|360 aphone|360browser|baiduboxapp|baidubrowser|maxthon|mxbrowser|trident|miuibrowser/i;
+        var typeReg1 = /micromessenger|mqqbrowser|sogou|qzone|liebao|ucbrowser|360 aphone|360browser|baiduboxapp|baidubrowser|maxthon|mxbrowser|trident|miuibrowser/i;
         var typeReg2 = /qqbrowser|chrome|safari|firefox|opr|oupeng|opera/i;
         var browserTypes = typeReg1.exec(ua);
         if(!browserTypes) browserTypes = typeReg2.exec(ua);
@@ -1859,10 +1859,17 @@ var _initSys = function () {
         var tmpCanvas = document.createElement("CANVAS");
         try{
             var context = cc.create3DContext(tmpCanvas, {'stencil': true});
-            if(context) {
+            if (context && context.getShaderPrecisionFormat) {
                 _supportWebGL = true;
             }
 
+            if (_supportWebGL && sys.os === sys.OS_IOS) {
+                // Not activating WebGL in iOS UIWebView because it may crash when entering background
+                if (!window.indexedDB) {
+                    _supportWebGL = false;
+                }
+            }
+
             if (_supportWebGL && sys.os === sys.OS_ANDROID) {
                 var browserVer = parseFloat(sys.browserVersion);
                 switch (sys.browserType) {

cocos2d/core/platform/CCEGLView.js

@@ -138,6 +138,9 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
     _viewName: "",
     // Custom callback for resize event
     _resizeCallback: null,
+
+    _orientationChanging: true,
+
     _scaleX: 1,
     _originalScaleX: 1,
     _scaleY: 1,
@@ -224,6 +227,11 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
         }
     },
 
+    _orientationChange: function () {
+        this._orientationChanging = true;
+        this._resizeEvent();
+    },
+
     /**
      * <p>
      * Sets view's target-densitydpi for android mobile browser. it can be set to:           <br/>
@@ -259,14 +267,14 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
             if (!this.__resizeWithBrowserSize) {
                 this.__resizeWithBrowserSize = true;
                 window.addEventListener('resize', this._resizeEvent);
-                window.addEventListener('orientationchange', this._resizeEvent);
+                window.addEventListener('orientationchange', this._orientationChange);
             }
         } else {
             //disable
             if (this.__resizeWithBrowserSize) {
                 this.__resizeWithBrowserSize = false;
                 window.removeEventListener('resize', this._resizeEvent);
-                window.removeEventListener('orientationchange', this._resizeEvent);
+                window.removeEventListener('orientationchange', this._orientationChange);
             }
         }
     },
@@ -305,7 +313,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
         var h = __BrowserGetter.availHeight(this._frame);
         var isLandscape = w >= h;
 
-        if (!cc.sys.isMobile ||
+        if (!this._orientationChanging || !cc.sys.isMobile ||
             (isLandscape && this._orientation & cc.ORIENTATION_LANDSCAPE) || 
             (!isLandscape && this._orientation & cc.ORIENTATION_PORTRAIT)) {
             locFrameSize.width = w;
@@ -323,6 +331,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
             cc.container.style.transformOrigin = '0px 0px 0px';
             this._isRotated = true;
         }
+        this._orientationChanging = false;
     },
 
     // hack

extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js

@@ -77,6 +77,7 @@
                         break;
                     case ccs.DISPLAY_TYPE_ARMATURE:
                         selNode.setShaderProgram(this._shaderProgram);
+                        this._updateColorAndOpacity(cmd, selBone);
                         cmd._parentCmd = this;
                         // Continue rendering in default
                     default: