From b8ed451cbba2eccff0d78138e6e125f341826afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C3=BCnger?= Date: Thu, 9 Jun 2016 15:46:11 +0200 Subject: [PATCH 1/3] Chrome on Android is supporting WebGL since v. 30 http://googlechromereleases.blogspot.dk/2013/08/chrome-beta-for-android-update_22.html --- cocos2d/core/platform/CCSys.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index d266377c71..417cdf6bc0 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -551,6 +551,8 @@ else { browserType = sys.BROWSER_TYPE_MAXTHON; else if (browserType === "opr") browserType = sys.BROWSER_TYPE_OPERA; + else if (browserType === "chrome") + browserType = sys.BROWSER_TYPE_CHROME; sys.browserType = browserType; })(); @@ -708,6 +710,15 @@ else { _supportWebGL = true; } break; + case sys.BROWSER_TYPE_CHROME: + // Chrome on android supports WebGL from v. 30 + var browserVer = parseFloat(sys.browserVersion); + if(browserVer >= 30.0) { + _supportWebGL = true; + } else { + _supportWebGL = false; + } + break; case sys.BROWSER_TYPE_UNKNOWN: case sys.BROWSER_TYPE_360: case sys.BROWSER_TYPE_MIUI: From 25521e34fefcdb0c2ae987c26957e55013e8312e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C3=BCnger?= Date: Mon, 13 Jun 2016 09:43:32 +0200 Subject: [PATCH 2/3] Fixed code --- cocos2d/core/platform/CCSys.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index 417cdf6bc0..992dd26ca4 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -308,7 +308,8 @@ sys.EDITOR_PAGE = 102; sys.EDITOR_CORE = 103; /** - * BROWSER_TYPE_WECHAT + * + _WECHAT * @property {String} BROWSER_TYPE_WECHAT * @readOnly * @default "wechat" @@ -551,8 +552,6 @@ else { browserType = sys.BROWSER_TYPE_MAXTHON; else if (browserType === "opr") browserType = sys.BROWSER_TYPE_OPERA; - else if (browserType === "chrome") - browserType = sys.BROWSER_TYPE_CHROME; sys.browserType = browserType; })(); @@ -691,12 +690,13 @@ else { } if (_supportWebGL && sys.os === sys.OS_ANDROID) { + var browserVer = parseFloat(sys.browserVersion); + switch (sys.browserType) { case sys.BROWSER_TYPE_MOBILE_QQ: case sys.BROWSER_TYPE_BAIDU: case sys.BROWSER_TYPE_BAIDU_APP: // QQ & Baidu Brwoser 6.2+ (using blink kernel) - var browserVer = parseFloat(sys.browserVersion); if (browserVer >= 6.2) { _supportWebGL = true; } @@ -712,7 +712,6 @@ else { break; case sys.BROWSER_TYPE_CHROME: // Chrome on android supports WebGL from v. 30 - var browserVer = parseFloat(sys.browserVersion); if(browserVer >= 30.0) { _supportWebGL = true; } else { From 4b3c81acb779211e915991d66256211f2e6b3cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C3=BCnger?= Date: Mon, 13 Jun 2016 09:46:27 +0200 Subject: [PATCH 3/3] Accidently deleted some code --- cocos2d/core/platform/CCSys.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index 992dd26ca4..f57e7239a1 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -306,10 +306,8 @@ sys.EDITOR_PAGE = 102; * @default 103 */ sys.EDITOR_CORE = 103; - /** - * - _WECHAT + * BROWSER_TYPE_WECHAT * @property {String} BROWSER_TYPE_WECHAT * @readOnly * @default "wechat"