Merge pull request #1809 from pandamicro/master

在 UC 浏览器上开启 WebGL 渲染
This commit is contained in:
Wang Nan
2017-07-17 10:45:59 +08:00
committed by GitHub
3 changed files with 24 additions and 13 deletions
+1 -1
View File
@@ -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);
+7 -2
View File
@@ -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;
}
}
+16 -10
View File
@@ -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);
}