diff --git a/cocos2d/core/platform/CCMacro.js b/cocos2d/core/platform/CCMacro.js index 5c295430a5..05cc21db32 100644 --- a/cocos2d/core/platform/CCMacro.js +++ b/cocos2d/core/platform/CCMacro.js @@ -2073,7 +2073,7 @@ cc.incrementGLDraws = function (addNumber) { * @method checkGLErrorDebug */ cc.checkGLErrorDebug = function () { - if (cc.renderMode === cc.game.RENDER_TYPE_WEBGL) { + if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) { var _error = cc._renderContext.getError(); if (_error) { cc.logID(2400, _error); diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index 35c7556b46..f52e9bd0db 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -750,14 +750,19 @@ else { break; case sys.BROWSER_TYPE_CHROME: // Chrome on android supports WebGL from v. 30 - if(browserVer >= 30.0) { + if (browserVer >= 30.0) { _supportWebGL = true; } else { _supportWebGL = false; } break; - case sys.BROWSER_TYPE_360: case sys.BROWSER_TYPE_UC: + if (browserVer > 11.0) { + _supportWebGL = true; + } else { + _supportWebGL = false; + } + case sys.BROWSER_TYPE_360: _supportWebGL = false; } } diff --git a/cocos2d/core/utils/CCProfiler.js b/cocos2d/core/utils/CCProfiler.js index e2a23cb5cd..a391603cf6 100644 --- a/cocos2d/core/utils/CCProfiler.js +++ b/cocos2d/core/utils/CCProfiler.js @@ -29,16 +29,7 @@ var macro = require('../platform/CCMacro'); var _fps = document.createElement('div'); _fps.id = 'fps'; -let stats = PStats.new(_fps, { - values: { - frame: { desc: 'Frame time (ms)', min: 0, max: 50, average: 500 }, - fps: { desc: 'Framerate (FPS)', below: 30, average: 500 }, - draws: { desc: 'Draw call' }, - logic: { desc: 'Game Logic (ms)', min: 0, max: 50, average: 500, color: '#080' }, - render: { desc: 'Renderer (ms)', min: 0, max: 50, average: 500, color: '#f90' } - }, - css: '.pstats {left: ' + macro.DIRECTOR_STATS_POSITION.x + 'px; bottom: ' + macro.DIRECTOR_STATS_POSITION.y + 'px;}' -}); +var stats = null; let _showFPS = false; @@ -84,6 +75,21 @@ cc.profiler = module.exports = { showStats () { if (!_showFPS) { + if (!stats) { + stats = PStats.new(_fps, { + showGraph: false, + values: { + frame: { desc: 'Frame time (ms)', min: 0, max: 50, average: 500 }, + fps: { desc: 'Framerate (FPS)', below: 30, average: 500 }, + draws: { desc: 'Draw call' }, + logic: { desc: 'Game Logic (ms)', min: 0, max: 50, average: 500, color: '#080' }, + render: { desc: 'Renderer (ms)', min: 0, max: 50, average: 500, color: '#f90' }, + mode: { desc: cc._renderType === cc.game.RENDER_TYPE_WEBGL ? 'WebGL' : 'Canvas', min: 1 } + }, + css: '.pstats {left: ' + macro.DIRECTOR_STATS_POSITION.x + 'px; bottom: ' + macro.DIRECTOR_STATS_POSITION.y + 'px;}' + }); + } + if (_fps.parentElement === null) { document.body.appendChild(_fps); }