Skip to content

Draft implementation of v3.12 renderer #3300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jun 22, 2016
Merged

Draft implementation of v3.12 renderer #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
03123d7
Draft implementation of v3.12 renderer
pandamicro Jun 11, 2016
b578473
Improve transform calculation
pandamicro Jun 12, 2016
0673348
Fix issues in draft implementation of new renderer
pandamicro Jun 13, 2016
90d2e79
Support WebGL on Chrome 30+
pandamicro Jun 13, 2016
5d1a764
Fix bugs in scroll view rendering, cache mode, and TTF updateColor
pandamicro Jun 13, 2016
0e2db62
Fix gl.bindBuffer issue
pandamicro Jun 14, 2016
cf4cd3a
Use bufferData instead of bufferSubData on iOS
pandamicro Jun 14, 2016
32f0c8e
Improve transform / visit performance
pandamicro Jun 14, 2016
d6f60cf
Improve Scissor clipping performance
pandamicro Jun 14, 2016
576d61b
Refactor Sprite vertices calculation and add Culling
pandamicro Jun 14, 2016
45069a9
Small changes and change version
pandamicro Jun 14, 2016
cb0060b
Remove culling and use bufferData instead of bufferSubData
pandamicro Jun 15, 2016
ce9be4f
Bug fixes
pandamicro Jun 16, 2016
81b2a6d
Tilemap new implementation with WebGL renderer
pandamicro Jun 21, 2016
00d7ea6
Improve audio engine behavior
pandamicro Jun 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions CCBoot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1857,19 +1857,27 @@ var _initSys = function () {
}

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;
}
else {
_supportWebGL = false;
}
break;
case sys.BROWSER_TYPE_CHROME:
// Chrome on android supports WebGL from v.30
if(browserVer >= 30.0) {
_supportWebGL = true;
} else {
_supportWebGL = false;
}
break;
case sys.BROWSER_TYPE_ANDROID:
// Android 5+ default browser
if (sys.osMainVersion && sys.osMainVersion >= 5) {
Expand Down Expand Up @@ -2323,7 +2331,10 @@ cc.game = /** @lends cc.game# */{
if (this._paused) return;
this._paused = true;
// Pause audio engine
cc.audioEngine && cc.audioEngine._pausePlaying();
if (cc.audioEngine) {
cc.audioEngine.stopAllEffects();
cc.audioEngine.pauseMusic();
}
// Pause main loop
if (this._intervalId)
window.cancelAnimationFrame(this._intervalId);
Expand All @@ -2337,7 +2348,9 @@ cc.game = /** @lends cc.game# */{
if (!this._paused) return;
this._paused = false;
// Resume audio engine
cc.audioEngine && cc.audioEngine._resumePlaying();
if (cc.audioEngine) {
cc.audioEngine.resumeMusic();
}
// Resume main loop
this._runMainLoop();
},
Expand Down
293 changes: 0 additions & 293 deletions cocos2d/actions/CCActionCamera.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cocos2d/audio/CCAudio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ cc.Audio.WebAudio.prototype = {
for(var i=0; i<ap[p].length; i++){
list[i].stop();
}
list.length = 0;
}
},

Expand Down
4 changes: 2 additions & 2 deletions cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,15 @@
this._clipElemType = !(!this._cangodhelpme() && node._stencil instanceof cc.DrawNode);
if (!node._stencil || !node._stencil.visible) {
if (this.inverted)
cc.Node.CanvasRenderCmd.prototype.visit.call(this, parentCmd); // draw everything
this.originVisit(parentCmd); // draw everything
return;
}

this._syncStatus(parentCmd);
cc.renderer.pushRenderCommand(this._rendererSaveCmd);
if(this._clipElemType){
// Draw everything first using node visit function
cc.Node.CanvasRenderCmd.prototype.visit.call(this, parentCmd);
this.originVisit(parentCmd);
}else{
node._stencil.visit(this);
}
Expand Down
Loading