From 2437bb46ba1229fbb84be414e46376cad85cf09d Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 11 Jan 2016 12:22:29 +0800 Subject: [PATCH] Support webgl on Android 5 and qq browser 6.2 + --- CCBoot.js | 32 +++++++++++++------------------- cocos2d/core/platform/CCSys.js | 17 ++++++++++++++--- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/CCBoot.js b/CCBoot.js index 5e984fb13c..2a3b4c4a82 100644 --- a/CCBoot.js +++ b/CCBoot.js @@ -209,9 +209,7 @@ cc._engineLoaded = false; function _determineRenderType(config) { var CONFIG_KEY = cc.game.CONFIG_KEY, - userRenderMode = parseInt(config[CONFIG_KEY.renderMode]) || 0, - shieldOs = [cc.sys.OS_ANDROID], - shieldBrowser = []; + userRenderMode = parseInt(config[CONFIG_KEY.renderMode]) || 0; // Adjust RenderType if (isNaN(userRenderMode) || userRenderMode > 2 || userRenderMode < 0) @@ -219,29 +217,25 @@ function _determineRenderType(config) { // Determine RenderType cc._renderType = cc.game.RENDER_TYPE_CANVAS; - cc._supportRender = true; + cc._supportRender = false; - if ( userRenderMode === 2 || - ( userRenderMode === 0 && - shieldOs.indexOf(cc.sys.os) === -1 && - shieldBrowser.indexOf(cc.sys.browserType) === -1 )) { - if (cc.sys.capabilities["opengl"]) { + if (userRenderMode === 0) { + if (cc.sys.capabilities['opengl']) { cc._renderType = cc.game.RENDER_TYPE_WEBGL; cc._supportRender = true; } - else { - cc._supportRender = false; - } - } - if (userRenderMode === 1 - || (userRenderMode === 0 && !cc._supportRender)) { - if (cc.sys.capabilities["canvas"]) { + else if (cc.sys.capabilities['canvas']) { cc._renderType = cc.game.RENDER_TYPE_CANVAS; cc._supportRender = true; } - else { - cc._supportRender = false; - } + } + else if (userRenderMode === 1 && cc.sys.capabilities['canvas']) { + cc._renderType = cc.game.RENDER_TYPE_CANVAS; + cc._supportRender = true; + } + else if (userRenderMode === 2 && cc.sys.capabilities['opengl']) { + cc._renderType = cc.game.RENDER_TYPE_WEBGL; + cc._supportRender = true; } } diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index 677c59a7c4..51f26e7423 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -508,7 +508,7 @@ else { sys.browserType = sys.BROWSER_TYPE_UNKNOWN; /* Determine the browser type */ (function(){ - var typeReg1 = /sogou|qzone|liebao|micromessenger|ucbrowser|360 aphone|360browser|baiduboxapp|baidubrowser|maxthon|mxbrowser|trident|miuibrowser/i; + var typeReg1 = /mqqbrowser|sogou|qzone|liebao|micromessenger|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); @@ -536,8 +536,8 @@ else { sys.browserVersion = ""; /* Determine the browser version number */ (function(){ - var versionReg1 = /(micromessenger|mx|maxthon|baidu|sogou)(mobile)?(browser)?\/?([\d.]+)/i; - var versionReg2 = /(msie |rv:|firefox|chrome|ucbrowser|qq|oupeng|opera|opr|safari|miui)(mobile)?(browser)?\/?([\d.]+)/i; + var versionReg1 = /(micromessenger|qq|mx|maxthon|baidu|sogou)(mobile)?(browser)?\/?([\d.]+)/i; + var versionReg2 = /(msie |rv:|firefox|chrome|ucbrowser|oupeng|opera|opr|safari|miui)(mobile)?(browser)?\/?([\d.]+)/i; var tmp = ua.match(versionReg1); if(!tmp) tmp = ua.match(versionReg2); sys.browserVersion = tmp ? tmp[4] : ""; @@ -640,6 +640,14 @@ else { if(context) { _supportWebGL = true; } + + // Ruled out Android 4- except for QQ Brwoser 6.2+ + if (sys.os === sys.OS_ANDROID && sys.osMainVersion < 5) { + var browserVer = parseFloat(sys.browserVersion); + if (sys.browserType !== sys.BROWSER_TYPE_MOBILE_QQ || browserVer < 6.2) { + _supportWebGL = false; + } + } } catch (e) {} } @@ -721,9 +729,12 @@ sys.dump = function () { str += "isMobile : " + self.isMobile + "\r\n"; str += "language : " + self.language + "\r\n"; str += "browserType : " + self.browserType + "\r\n"; + str += "browserVersion : " + self.browserVersion + "\r\n"; str += "capabilities : " + JSON.stringify(self.capabilities) + "\r\n"; str += "os : " + self.os + "\r\n"; + str += "osVersion : " + self.osVersion + "\r\n"; str += "platform : " + self.platform + "\r\n"; + str += "Using " + (cc._renderType === cc.game.RENDER_TYPE_WEBGL ? "WEBGL" : "CANVAS") + " renderer." + "\r\n"; cc.log(str); };