From bead8d603481e525d942dfc35722822938254021 Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 11 Apr 2018 11:14:43 +0800 Subject: [PATCH 01/53] implement Effect, Technique, Model and Pass in JS --- jsb/effect.js | 76 +++++++++++++++++++++++++++++++ jsb/model.js | 101 +++++++++++++++++++++++++++++++++++++++++ jsb/pass.js | 115 +++++++++++++++++++++++++++++++++++++++++++++++ jsb/renderer.js | 77 ++++++++++++++++++++++++++++++- jsb/technique.js | 38 ++++++++++++++++ 5 files changed, 405 insertions(+), 2 deletions(-) create mode 100644 jsb/effect.js create mode 100644 jsb/model.js create mode 100644 jsb/pass.js create mode 100644 jsb/technique.js diff --git a/jsb/effect.js b/jsb/effect.js new file mode 100644 index 0000000000..fe51c68c09 --- /dev/null +++ b/jsb/effect.js @@ -0,0 +1,76 @@ +let config = renderer.config; + +class Effect { + /** + * @param {Array} techniques + */ + constructor(techniques, properties = {}, defines = []) { + this._techniques = techniques; + this._properties = properties; + this._defines = defines; + + // TODO: check if params is valid for current technique??? + } + + clear() { + this._techniques.length = 0; + this._properties = null; + this._defines.length = 0; + } + + getTechnique(stage) { + let stageID = config.stageID(stage); + for (let i = 0; i < this._techniques.length; ++i) { + let tech = this._techniques[i]; + if (tech.stageIDs & stageID) { + return tech; + } + } + + return null; + } + + getProperty(name) { + return this._properties[name]; + } + + setProperty(name, value) { + // TODO: check if params is valid for current technique??? + this._properties[name] = value; + } + + getDefine(name) { + for (let i = 0; i < this._defines.length; ++i) { + let def = this._defines[i]; + if ( def.name === name ) { + return def.value; + } + } + + console.warn(`Failed to get define ${name}, define not found.`); + return null; + } + + define(name, value) { + for (let i = 0; i < this._defines.length; ++i) { + let def = this._defines[i]; + if ( def.name === name ) { + def.value = value; + return; + } + } + + console.warn(`Failed to set define ${name}, define not found.`); + } + + extractDefines(out = {}) { + for (let i = 0; i < this._defines.length; ++i) { + let def = this._defines[i]; + out[def.name] = def.value; + } + + return out; + } +} + +module.exports = Effect; diff --git a/jsb/model.js b/jsb/model.js new file mode 100644 index 0000000000..cbf2698da5 --- /dev/null +++ b/jsb/model.js @@ -0,0 +1,101 @@ +class Model { + constructor() { + this._poolID = -1; + this._node = null; + this._inputAssemblers = []; + this._effects = []; + this._defines = []; + this._dynamicIA = false; + this._viewID = -1; + + // TODO: we calculate aabb based on vertices + // this._aabb + } + + get inputAssemblerCount() { + return this._inputAssemblers.length; + } + + get dynamicIA() { + return this._dynamicIA; + } + + get drawItemCount() { + return this._dynamicIA ? 1 : this._inputAssemblers.length; + } + + setNode(node) { + this._node = node; + } + + setDynamicIA(enabled) { + this._dynamicIA = enabled; + } + + addInputAssembler(ia) { + if (this._inputAssemblers.indexOf(ia) !== -1) { + return; + } + this._inputAssemblers.push(ia); + } + + clearInputAssemblers() { + this._inputAssemblers.length = 0; + } + + addEffect(effect) { + if (this._effects.indexOf(effect) !== -1) { + return; + } + this._effects.push(effect); + + // + let defs = Object.create(null); + effect.extractDefines(defs); + this._defines.push(defs); + } + + clearEffects() { + this._effects.length = 0; + this._defines.length = 0; + } + + extractDrawItem(out, index) { + if (this._dynamicIA) { + out.model = this; + out.node = this._node; + out.ia = null; + out.effect = this._effects[0]; + out.defines = out.effect.extractDefines(this._defines[0]); + + return; + } + + if (index >= this._inputAssemblers.length ) { + out.model = null; + out.node = null; + out.ia = null; + out.effect = null; + out.defines = null; + + return; + } + + out.model = this; + out.node = this._node; + out.ia = this._inputAssemblers[index]; + + let effect, defines; + if (index < this._effects.length) { + effect = this._effects[index]; + defines = this._defines[index]; + } else { + effect = this._effects[this._effects.length-1]; + defines = this._defines[this._effects.length-1]; + } + out.effect = effect; + out.defines = effect.extractDefines(defines); + } +} + +module.exports = Model; diff --git a/jsb/pass.js b/jsb/pass.js new file mode 100644 index 0000000000..5198f5e269 --- /dev/null +++ b/jsb/pass.js @@ -0,0 +1,115 @@ +class Pass { + constructor(name) { + this._programName = name; + + // cullmode + this._cullMode = gfx.CULL_BACK; + + // blending + this._blend = false; + this._blendEq = gfx.BLEND_FUNC_ADD; + this._blendAlphaEq = gfx.BLEND_FUNC_ADD; + this._blendSrc = gfx.BLEND_ONE; + this._blendDst = gfx.BLEND_ZERO; + this._blendSrcAlpha = gfx.BLEND_ONE; + this._blendDstAlpha = gfx.BLEND_ZERO; + this._blendColor = 0xffffffff; + + // depth + this._depthTest = false; + this._depthWrite = false; + this._depthFunc = gfx.DS_FUNC_LESS, + + // stencil + this._stencilTest = false; + // front + this._stencilFuncFront = gfx.DS_FUNC_ALWAYS; + this._stencilRefFront = 0; + this._stencilMaskFront = 0xff; + this._stencilFailOpFront = gfx.STENCIL_OP_KEEP; + this._stencilZFailOpFront = gfx.STENCIL_OP_KEEP; + this._stencilZPassOpFront = gfx.STENCIL_OP_KEEP; + this._stencilWriteMaskFront = 0xff; + // back + this._stencilFuncBack = gfx.DS_FUNC_ALWAYS; + this._stencilRefBack = 0; + this._stencilMaskBack = 0xff; + this._stencilFailOpBack = gfx.STENCIL_OP_KEEP; + this._stencilZFailOpBack = gfx.STENCIL_OP_KEEP; + this._stencilZPassOpBack = gfx.STENCIL_OP_KEEP; + this._stencilWriteMaskBack = 0xff; + } + + setCullMode(cullMode) { + this._cullMode = cullMode; + } + + setBlend( + blendEq = gfx.BLEND_FUNC_ADD, + blendSrc = gfx.BLEND_ONE, + blendDst = gfx.BLEND_ZERO, + blendAlphaEq = gfx.BLEND_FUNC_ADD, + blendSrcAlpha = gfx.BLEND_ONE, + blendDstAlpha = gfx.BLEND_ZERO, + blendColor = 0xffffffff + ) { + this._blend = true; + this._blendEq = blendEq; + this._blendSrc = blendSrc; + this._blendDst = blendDst; + this._blendAlphaEq = blendAlphaEq; + this._blendSrcAlpha = blendSrcAlpha; + this._blendDstAlpha = blendDstAlpha; + this._blendColor = blendColor; + } + + setDepth( + depthTest = false, + depthWrite = false, + depthFunc = gfx.DS_FUNC_LESS + ) { + this._depthTest = depthTest; + this._depthWrite = depthWrite; + this._depthFunc = depthFunc; + } + + setStencilFront( + stencilFunc = gfx.DS_FUNC_ALWAYS, + stencilRef = 0, + stencilMask = 0xff, + stencilFailOp = gfx.STENCIL_OP_KEEP, + stencilZFailOp = gfx.STENCIL_OP_KEEP, + stencilZPassOp = gfx.STENCIL_OP_KEEP, + stencilWriteMask = 0xff + ) { + this._stencilTest = true; + this._stencilFuncFront = stencilFunc; + this._stencilRefFront = stencilRef; + this._stencilMaskFront = stencilMask; + this._stencilFailOpFront = stencilFailOp; + this._stencilZFailOpFront = stencilZFailOp; + this._stencilZPassOpFront = stencilZPassOp; + this._stencilWriteMaskFront = stencilWriteMask; + } + + setStencilBack( + stencilFunc = gfx.DS_FUNC_ALWAYS, + stencilRef = 0, + stencilMask = 0xff, + stencilFailOp = gfx.STENCIL_OP_KEEP, + stencilZFailOp = gfx.STENCIL_OP_KEEP, + stencilZPassOp = gfx.STENCIL_OP_KEEP, + stencilWriteMask = 0xff + ) { + this._stencilTest = true; + this._stencilFuncBack = stencilFunc; + this._stencilRefBack = stencilRef; + this._stencilMaskBack = stencilMask; + this._stencilFailOpBack = stencilFailOp; + this._stencilZFailOpBack = stencilZFailOp; + this._stencilZPassOpBack = stencilZPassOp; + this._stencilWriteMaskBack = stencilWriteMask; + } +} + +module.exports = Pass; diff --git a/jsb/renderer.js b/jsb/renderer.js index f6a1cc77e6..9cde55b6cf 100644 --- a/jsb/renderer.js +++ b/jsb/renderer.js @@ -59,7 +59,18 @@ renderer.CLEAR_COLOR = 1; renderer.CLEAR_DEPTH = 2; renderer.CLEAR_STENCIL = 4; -renderer.addStage = renderer.Config.addStage; +//renderer.addStage = renderer.Config.addStage; + +renderer.config = { + addStage: renderer.addStage, + // stageIDs: renderer.stageIDs, + stageIDs: renderer.stageIDs, + stageID: renderer.stageID +}; +renderer.Effect = require('./Effect'); +renderer.Technique = require('./Technique'); +renderer.Pass = require('./Pass'); +renderer.Model = require('./Model'); // ForwardRenderer adapter var _p; @@ -74,11 +85,73 @@ _p = renderer.InputAssembler.prototype; _p._ctor = function(vb, ib, pt = gfx.PT_TRIANGLES) { this.init(vb, ib, pt); }; - cc.defineGetterSetter(_p, "_vertexBuffer", _p.getVertexBuffer, _p.setVertexBuffer); cc.defineGetterSetter(_p, "_indexBuffer", _p.getIndexBuffer, _p.setIndexBuffer); cc.defineGetterSetter(_p, "_primitiveType", _p.getPrimitiveType, _p.setPrimitiveType); cc.defineGetterSetter(_p, "_start", _p.getStart, _p.setStart); cc.defineGetterSetter(_p, "_count", _p.getCount, _p.setCount); +// Scene +_p = renderer.Scene.prototype; +// _p.addModel = function(model) { +// // var modelNative = new renderer.ModelNative(); +// // var effects = model._effects; +// // var effectNatives = []; +// // for (var i = 0, len = effects.length; i < len; ++i) { +// // var effect = effects[i]; +// // var techniques = effect._techniques; +// // var techniqueNatives = []; +// // for (var j = 0, len1 = techniques.length; j < len1; ++j) { +// // var technique = techniques[j]; +// // var passesNatives = []; +// // var passes = technique.passes; +// // for (var k =0, len2 = passes.length; k < len2; ++k) { +// // var pass = passes[k]; +// // var passNative = new renderer.PassNative(pass._programName); +// // passNative.setCullMode(pass._cullMode); +// // passNative.setBlend(pass._blendEq, +// // pass._blendSrc, +// // pass._blendDst, +// // pass._blendAlphaEq, +// // pass._blendSrcAlpha, +// // pass._blendDstAlpha, +// // pass._blendColor); +// // passNative.setDepth(pass._depthTest, pass._depthWrite, pass._depthFunc); +// // passNative.setStencilFront(pass._stencilFuncFront, +// // pass._stencilRefFront, +// // pass._stencilMaskFront, +// // pass._stencilFailOpFront, +// // pass._stencilZFailOpFront, +// // pass._stencilZPassOpFront, +// // pass._stencilWriteMaskFront); +// // passNative.setStencilBack(pass._stencilFuncBack, +// // pass._stencilRefBack, +// // pass._stencilMaskBack, +// // pass._stencilFailOpBack, +// // pass._stencilZFailOpBack, +// // pass._stencilZPassOpBack, +// // pass._stencilWriteMaskBack); +// // passesNatives.push(passNative); +// // } +// // var techniqueNative = new renderer.TechniqueNative(technique._stages, technique._parameters, passesNatives, technique._layer); +// // techniqueNatives.push(techniqueNative); +// // } +// // var effectNative = new renderer.EffectNative(techniqueNatives, effect._properties, effect._defines); +// // modelNative.addEffect(effectNative); +// // } + +// // modelNative.setDynamicIA(model._dynamicIA); +// // modelNative.setViewId(model._viewID); +// // modelNative.setNode(model._node); + +// // var inputAssemblers = model._inputAssemblers; +// // for (var k = 0, len2 = inputAssemblers.length; k < len2; ++k) { +// // modelNative.addInputAssembler(inputAssemblers[k]); +// // } + +// // this.addModelNative(modelNative); +// this.addModelNative(model); +// }; +_p.removeModel = function() {} + diff --git a/jsb/technique.js b/jsb/technique.js new file mode 100644 index 0000000000..3bdbb42ba9 --- /dev/null +++ b/jsb/technique.js @@ -0,0 +1,38 @@ +let config = renderer.config; + +let _genID = 0; + +class Technique { + /** + * @param {Array} stages + * @param {Array} parameters + * @param {Array} passes + * @param {Number} layer + */ + constructor(stages, parameters, passes, layer = 0) { + this._id = _genID++; + this._stageIDs = config.stageIDs(stages); + this.stageIDs = this._stageIDs; + this._parameters = parameters; // {name, type, size, val} + this._passes = passes; + this.passes = this._passes; + this._layer = layer; + this._stages = stages; + // TODO: this._version = 'webgl' or 'webgl2' // ???? + } + + setStages(stages) { + this._stageIDs = config.stageIDs(stages); + this._stages = stages; + } + + // get passes() { + // return this._passes; + // } + + // get stageIDs() { + // return this._stageIDs; + // } +} + +module.exports = Technique; \ No newline at end of file From 5823a230655c398cecd034a51112212a812135d9 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 9 Apr 2018 19:07:22 +0800 Subject: [PATCH 02/53] Add transform system to reduce matrix update overhead Removed world-matrix-changed event, event system is too slow --- cocos2d/core/CCDirector.js | 25 +++- cocos2d/core/CCNode.js | 98 +++++---------- cocos2d/core/camera/CCCamera.js | 20 +-- cocos2d/core/components/CCLabel.js | 1 - cocos2d/core/components/CCSprite.js | 9 -- .../renderer/assemblers/graphics/index.js | 7 +- .../core/renderer/assemblers/label/bmfont.js | 1 - cocos2d/core/renderer/assemblers/label/ttf.js | 1 - .../core/renderer/assemblers/motion-streak.js | 1 - .../renderer/assemblers/sprite/bar-filled.js | 2 +- .../core/renderer/assemblers/sprite/mesh.js | 4 +- .../core/renderer/assemblers/sprite/simple.js | 4 +- .../core/renderer/assemblers/sprite/sliced.js | 2 - .../core/renderer/assemblers/sprite/tiled.js | 1 - .../renderer/canvas/canvas-render-walker.js | 4 - .../core/renderer/render-component-walker.js | 4 - cocos2d/core/systems/transform.js | 114 ++++++++++++++++++ cocos2d/core/utils/base-node.js | 9 ++ cocos2d/tilemap/tmx-layer-assembler.js | 2 +- cocos2d/videoplayer/video-player-impl.js | 1 - cocos2d/webview/webview-impl.js | 1 - extensions/dragonbones/CCSlot.js | 3 +- extensions/dragonbones/canvas-assembler.js | 1 - extensions/dragonbones/webgl-assembler.js | 1 - 24 files changed, 193 insertions(+), 123 deletions(-) create mode 100644 cocos2d/core/systems/transform.js diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index 92354855af..efb81d0486 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -32,6 +32,7 @@ const NodeActivator = require('./node-activator'); const EventListeners = require('./event/event-listeners'); const renderer = require('./renderer'); const eventManager = require('./event-manager'); +const transformSys = require('./systems/transform'); //---------------------------------------------------------------------------------------------------------------------- @@ -913,6 +914,7 @@ cc.Director.prototype = { * Run main loop of director */ mainLoop: CC_EDITOR ? function (deltaTime, updateAnimate) { + // Update if (!this._paused) { this.emit(cc.Director.EVENT_BEFORE_UPDATE); @@ -926,13 +928,19 @@ cc.Director.prototype = { this._compScheduler.lateUpdatePhase(deltaTime); this.emit(cc.Director.EVENT_AFTER_UPDATE); + + transformSys.update(); } - this.emit(cc.Director.EVENT_BEFORE_DRAW); // Render + this.emit(cc.Director.EVENT_BEFORE_DRAW); renderer.render(this._scene); - this._totalFrames++; + + // After draw this.emit(cc.Director.EVENT_AFTER_DRAW); + transformSys.afterDraw(); + + this._totalFrames++; } : function () { if (this._purgeDirectorInNextLoop) { @@ -943,6 +951,7 @@ cc.Director.prototype = { // calculate "global" dt this.calculateDeltaTime(); + // Update if (!this._paused) { this.emit(cc.Director.EVENT_BEFORE_UPDATE); // Call start for new added components @@ -957,14 +966,20 @@ cc.Director.prototype = { this.emit(cc.Director.EVENT_AFTER_UPDATE); // Destroy entities that have been removed recently cc.Object._deferredDestroy(); + // Update transform for all dirty nodes + transformSys.update(); } - this.emit(cc.Director.EVENT_BEFORE_DRAW); + // Render + this.emit(cc.Director.EVENT_BEFORE_DRAW); renderer.render(this._scene); - this._totalFrames++; + + // After draw this.emit(cc.Director.EVENT_AFTER_DRAW); - + transformSys.afterDraw(); + eventManager.frameUpdateListeners(); + this._totalFrames++; } }, diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 819d355a6c..ef16dc9408 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -35,6 +35,7 @@ const eventManager = require('./event-manager'); const macro = require('./platform/CCMacro'); const misc = require('./utils/misc'); const Event = require('./event/event'); +const transformSys = require('./systems/transform'); const Flags = cc.Object.Flags; const Destroying = Flags.Destroying; @@ -43,7 +44,6 @@ const POSITION_CHANGED = 'position-changed'; const SIZE_CHANGED = 'size-changed'; const ANCHOR_CHANGED = 'anchor-changed'; const ROTATION_CHANGED = 'rotation-changed'; -const WORLD_MATRIX_CHANGED = 'world-matrix-changed'; const SCALE_CHANGED = 'scale-changed'; const CHILD_REORDER = 'child-reorder'; @@ -421,7 +421,7 @@ var Node = cc.Class({ } localPosition.x = value; - this._localMatDirty = true; + transformSys.setNodeDirty(this); // fast check event var cache = this._hasListenerCache; @@ -464,7 +464,7 @@ var Node = cc.Class({ } localPosition.y = value; - this._localMatDirty = true; + transformSys.setNodeDirty(this); // fast check event var cache = this._hasListenerCache; @@ -494,7 +494,7 @@ var Node = cc.Class({ if (value !== localPosition.z) { if (!CC_EDITOR || isFinite(value)) { localPosition.z = value; - this._localMatDirty = true; + transformSys.setNodeDirty(this); } else { cc.error(ERR_INVALID_NUMBER, 'new z'); @@ -524,7 +524,7 @@ var Node = cc.Class({ this._rotationX = this._rotationY = value; // Update quaternion from rotation math.quat.fromEuler(this._quat, 0, 0, -value); - this._localMatDirty = true; + transformSys.setNodeDirty(this); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -557,7 +557,7 @@ var Node = cc.Class({ else { math.quat.fromEuler(this._quat, value, this._rotationY, 0); } - this._localMatDirty = true; + transformSys.setNodeDirty(this); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -590,7 +590,7 @@ var Node = cc.Class({ else { math.quat.fromEuler(this._quat, this._rotationX, value, 0); } - this._localMatDirty = true; + transformSys.setNodeDirty(this); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -625,7 +625,7 @@ var Node = cc.Class({ set (value) { if (this._scale.x !== value) { this._scale.x = value; - this._localMatDirty = true; + transformSys.setNodeDirty(this); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -651,7 +651,7 @@ var Node = cc.Class({ set (value) { if (this._scale.y !== value) { this._scale.y = value; - this._localMatDirty = true; + transformSys.setNodeDirty(this); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -676,7 +676,7 @@ var Node = cc.Class({ }, set (value) { this._skewX = value; - this._localMatDirty = true; + transformSys.setNodeDirty(this); } }, @@ -695,7 +695,7 @@ var Node = cc.Class({ }, set (value) { this._skewY = value; - this._localMatDirty = true; + transformSys.setNodeDirty(this); } }, @@ -908,8 +908,8 @@ var Node = cc.Class({ this._matrix = mathPools.mat4.get(); this._worldMatrix = mathPools.mat4.get(); - this._localMatDirty = true; - this._worldMatDirty = true; + this._localMatDirty = false; + this._worldMatDirty = false; this._cullingMask = 1 << this.groupIndex; }, @@ -983,6 +983,9 @@ var Node = cc.Class({ var actionManager = ActionManagerExist ? cc.director.getActionManager() : null; if (active) { // activate + // Force update transform + transformSys.setNodeDirty(this); + // ActionManager & EventManager actionManager && actionManager.resumeTarget(this); eventManager.resumeTarget(this); if (this._touchListener) { @@ -1281,7 +1284,7 @@ var Node = cc.Class({ testPt = cc.v2(point); } - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); math.mat4.invert(_mat4_temp, this._worldMatrix); math.vec2.transformMat4(testPt, testPt, _mat4_temp); testPt.x += this._anchorPoint.x * this._contentSize.width; @@ -1531,7 +1534,7 @@ var Node = cc.Class({ else { return cc.error(ERR_INVALID_NUMBER, 'y of new position'); } - this._localMatDirty = true; + transformSys.setNodeDirty(this); // fast check event var cache = this._hasListenerCache; @@ -1583,7 +1586,7 @@ var Node = cc.Class({ if (this._scale.x !== scaleX || this._scale.y !== scaleY) { this._scale.x = scaleX; this._scale.y = scaleY; - this._localMatDirty = true; + transformSys.setNodeDirty(this); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -1721,7 +1724,7 @@ var Node = cc.Class({ locAnchorPoint.x = point; locAnchorPoint.y = y; } - this._localMatDirty = true; + transformSys.setNodeDirty(this); this.emit(ANCHOR_CHANGED); }, @@ -1789,7 +1792,7 @@ var Node = cc.Class({ math.vec3.copy(this._position, pos); } - this._localMatDirty = true; + transformSys.setNodeDirty(this); // fast check event var cache = this._hasListenerCache; @@ -1901,44 +1904,6 @@ var Node = cc.Class({ } }, - _calculWorldMatrix () { - // Avoid as much function call as possible - if (this._localMatDirty) { - this._updateLocalMatrix(); - } - - // Assume parent world matrix is correct - if (this._parent) { - let parentMat = this._parent._worldMatrix; - math.mat4.mul(this._worldMatrix, parentMat, this._matrix); - } - else { - math.mat4.copy(this._worldMatrix, this._matrix); - } - this._worldMatDirty = false; - - this.emit(WORLD_MATRIX_CHANGED); - - for (let i = 0, len = this._children.length; i < len; ++i) { - let child = this._children[i]; - child._calculWorldMatrix(); - } - }, - - _updateWorldMatrix () { - let curr = this; - let changedRoot = null; - while (curr) { - if (curr._localMatDirty || curr._worldMatDirty) { - changedRoot = curr; - } - curr = curr._parent; - } - if (changedRoot) { - changedRoot._calculWorldMatrix(); - } - }, - /** * !#en * Get the local transform matrix (4x4), based on parent node coordinates @@ -1967,7 +1932,7 @@ var Node = cc.Class({ * node.getLocalMatrix(mat4); */ getWorldMatrix (out) { - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); return math.mat4.copy(out, this._worldMatrix); }, @@ -1981,7 +1946,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToNodeSpace(cc.v2(100, 100)); */ convertToNodeSpace (worldPoint) { - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); math.mat4.invert(_mat4_temp, this._worldMatrix); let out = new cc.Vec2(); math.vec2.transformMat4(out, worldPoint, _mat4_temp); @@ -2000,7 +1965,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToWorldSpace(cc.v2(100, 100)); */ convertToWorldSpace (nodePoint) { - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); let out = new cc.Vec2( nodePoint.x - this._anchorPoint.x * this._contentSize.width, nodePoint.y - this._anchorPoint.y * this._contentSize.height @@ -2022,7 +1987,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToNodeSpaceAR(cc.v2(100, 100)); */ convertToNodeSpaceAR (worldPoint) { - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); math.mat4.invert(_mat4_temp, this._worldMatrix); let out = new cc.Vec2(); return math.vec2.transformMat4(out, worldPoint, _mat4_temp); @@ -2042,7 +2007,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToWorldSpaceAR(cc.v2(100, 100)); */ convertToWorldSpaceAR (nodePoint) { - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); let out = new cc.Vec2(); return math.vec2.transformMat4(out, nodePoint, this._worldMatrix); }, @@ -2116,7 +2081,7 @@ var Node = cc.Class({ if (!out) { out = AffineTrans.identity(); } - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); var contentSize = this._contentSize; _vec3_temp.x = -this._anchorPoint.x * contentSize.width; @@ -2147,7 +2112,7 @@ var Node = cc.Class({ if (!out) { out = AffineTrans.identity(); } - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); return AffineTrans.fromMat4(out, this._matrix); }, @@ -2190,7 +2155,7 @@ var Node = cc.Class({ if (!out) { out = AffineTrans.identity(); } - this._updateWorldMatrix(); + transformSys._updateWorldMatrix(this); math.mat4.invert(_mat4_temp, this._worldMatrix); return AffineTrans.fromMat4(out, _mat4_temp); }, @@ -2259,7 +2224,7 @@ var Node = cc.Class({ */ getBoundingBoxToWorld () { if (this._parent) { - this._parent._updateWorldMatrix(); + transformSys._updateWorldMatrix(this._parent); return this._getBoundingBoxTo(this._parent._worldMatrix); } else { @@ -2398,9 +2363,6 @@ var Node = cc.Class({ }, onRestore: CC_EDITOR && function () { - this._localMatDirty = true; - this._worldMatDirty = true; - this._onRestoreBase(); var actionManager = cc.director.getActionManager(); diff --git a/cocos2d/core/camera/CCCamera.js b/cocos2d/core/camera/CCCamera.js index e1498b9f2a..9dbc0eb816 100644 --- a/cocos2d/core/camera/CCCamera.js +++ b/cocos2d/core/camera/CCCamera.js @@ -291,8 +291,8 @@ let Camera = cc.Class({ }, onEnable () { - this.node.on('world-matrix-changed', this._onMatrixDirty, this); this._matrixDirty = true; + cc.director.on(cc.Director.EVENT_AFTER_DRAW, this.afterDraw, this); if (game.renderType === game.RENDER_TYPE_WEBGL) { renderer.scene.addCamera(this._camera); @@ -301,7 +301,7 @@ let Camera = cc.Class({ }, onDisable () { - this.node.off('world-matrix-changed', this._onMatrixDirty, this); + cc.director.off(cc.Director.EVENT_AFTER_DRAW, this.afterDraw, this); if (game.renderType === game.RENDER_TYPE_WEBGL) { renderer.scene.removeCamera(this._camera); @@ -432,17 +432,19 @@ let Camera = cc.Class({ root = root || cc.director.getScene(); if (!root) return null; - this.lateUpdate(); + // force update node world matrix + this.node.getWorldMatrix(_mat4_temp_1); + this.afterDraw(); renderer._walker.visit(root); renderer._forward.renderCamera(this._camera, renderer.scene); }, - lateUpdate: !CC_EDITOR && function () { + afterDraw: !CC_EDITOR && function () { let node = this.node; - node.getWorldMatrix(_mat4_temp_1); - - if (!this._matrixDirty) return; + if (!this._matrixDirty && !node._worldMatUpdated) + return; + let camera = this._camera; let fov = Math.atan(Math.tan(this._fov/2) / this.zoomRatio)*2; camera.setFov(fov); @@ -454,8 +456,8 @@ let Camera = cc.Class({ height = targetTexture.height; } - _vec3_temp_1.x = _mat4_temp_1.m12; - _vec3_temp_1.y = _mat4_temp_1.m13; + _vec3_temp_1.x = node._worldMatrix.m12; + _vec3_temp_1.y = node._worldMatrix.m13; _vec3_temp_1.z = 0; node.z = height / 1.1566; diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 7b05dcffe3..9ce192ad96 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -494,7 +494,6 @@ var Label = cc.Class({ if (!this._renderData) { this._renderData = this._assembler.createData(this); - this._renderData.worldMatDirty = true; } }, diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index 0b97ae1be5..f72905492a 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -487,7 +487,6 @@ var Sprite = cc.Class({ this.node.on('size-changed', this._onNodeSizeDirty, this); this.node.on('anchor-changed', this._onNodeSizeDirty, this); - this.node.on('world-matrix-changed', this._onNodeMatrixDirty, this); }, onDisable: function () { @@ -495,7 +494,6 @@ var Sprite = cc.Class({ this.node.off('size-changed', this._onNodeSizeDirty, this); this.node.off('anchor-changed', this._onNodeSizeDirty, this); - this.node.off('world-matrix-changed', this._onNodeMatrixDirty, this); }, _onNodeSizeDirty () { @@ -504,12 +502,6 @@ var Sprite = cc.Class({ } }, - _onNodeMatrixDirty () { - if (this._renderData) { - this._renderData.worldMatDirty = true; - } - }, - _updateAssembler: function () { let assembler = Sprite._assembler.getAssembler(this); @@ -520,7 +512,6 @@ var Sprite = cc.Class({ if (!this._renderData) { this._renderData = this._assembler.createData(this); - this._renderData.worldMatDirty = true; this._renderData.material = this._material; } }, diff --git a/cocos2d/core/renderer/assemblers/graphics/index.js b/cocos2d/core/renderer/assemblers/graphics/index.js index 752cba56e8..88af67d93a 100644 --- a/cocos2d/core/renderer/assemblers/graphics/index.js +++ b/cocos2d/core/renderer/assemblers/graphics/index.js @@ -49,7 +49,6 @@ const sin = Math.sin; const atan2 = Math.atan2; const abs = Math.abs; -let _matrix = math.mat4.create(); let _renderData = null; let _impl = null; let _curColor = 0; @@ -95,9 +94,9 @@ let graphicsAssembler = js.addon({ z = node._position.z; // vertex buffer - node.getWorldMatrix(_matrix); - let a = _matrix.m00, b = _matrix.m01, c = _matrix.m04, d = _matrix.m05, - tx = _matrix.m12, ty = _matrix.m13; + let matrix = node._worldMatrix; + let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, + tx = matrix.m12, ty = matrix.m13; let nodeColor = node.color, nodeR = nodeColor.r / 255, diff --git a/cocos2d/core/renderer/assemblers/label/bmfont.js b/cocos2d/core/renderer/assemblers/label/bmfont.js index 862023629e..2feb40bf2f 100644 --- a/cocos2d/core/renderer/assemblers/label/bmfont.js +++ b/cocos2d/core/renderer/assemblers/label/bmfont.js @@ -41,7 +41,6 @@ module.exports = js.addon({ let z = node._position.z; let color = node.color._val; - node._updateWorldMatrix(); let matrix = node._worldMatrix; let a = matrix.m00, b = matrix.m01, diff --git a/cocos2d/core/renderer/assemblers/label/ttf.js b/cocos2d/core/renderer/assemblers/label/ttf.js index c458aebdc6..c1679a813e 100644 --- a/cocos2d/core/renderer/assemblers/label/ttf.js +++ b/cocos2d/core/renderer/assemblers/label/ttf.js @@ -56,7 +56,6 @@ module.exports = js.addon({ let z = node._position.z; let color = cc.Color.WHITE._val; - node._updateWorldMatrix(); let matrix = node._worldMatrix; let a = matrix.m00, b = matrix.m01, diff --git a/cocos2d/core/renderer/assemblers/motion-streak.js b/cocos2d/core/renderer/assemblers/motion-streak.js index 3bbbf903ce..d5f5b9da6d 100644 --- a/cocos2d/core/renderer/assemblers/motion-streak.js +++ b/cocos2d/core/renderer/assemblers/motion-streak.js @@ -104,7 +104,6 @@ var motionStreakAssembler = js.addon({ let stroke = comp._stroke / 2; let node = comp.node; - node._updateWorldMatrix(); let matrix = node._worldMatrix; let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, tx = matrix.m12, ty = matrix.m13; diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index bd3f2ead10..8e3eabd147 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -63,7 +63,7 @@ module.exports = { if (vertDirty) { this.updateVerts(sprite, fillStart, fillEnd); } - if (vertDirty || renderData.worldMatDirty) { + if (vertDirty || sprite.node._worldMatUpdated) { this.updateWorldVerts(sprite); } }, diff --git a/cocos2d/core/renderer/assemblers/sprite/mesh.js b/cocos2d/core/renderer/assemblers/sprite/mesh.js index 799da554a3..fcfad67f29 100644 --- a/cocos2d/core/renderer/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/assemblers/sprite/mesh.js @@ -52,7 +52,7 @@ module.exports = { if (vertDirty) { this.updateVerts(sprite); } - if (vertDirty || renderData.worldMatDirty) { + if (vertDirty || sprite.node._worldMatUpdated) { this.updateWorldVerts(sprite); } }, @@ -136,8 +136,6 @@ module.exports = { world.x = local.x * a + local.y * c + tx; world.y = local.x * b + local.y * d + ty; } - - renderData.worldMatDirty = false; }, fillBuffers (sprite, batchData, vertexId, vbuf, uintbuf, ibuf) { diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index 71f2da53cd..0083645daa 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -40,7 +40,7 @@ module.exports = js.addon({ if (vertDirty) { this.updateVerts(sprite); } - if (vertDirty || renderData.worldMatDirty) { + if (vertDirty || sprite.node._worldMatUpdated) { this.updateWorldVerts(sprite); } }, @@ -138,8 +138,6 @@ module.exports = js.addon({ world.x = local.x * a + local.y * c + tx; world.y = local.x * b + local.y * d + ty; } - - renderData.worldMatDirty = false; }, updateVerts (sprite) { diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index 68d21b7478..a267ed5797 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -170,8 +170,6 @@ module.exports = { world.v = rowD.v; } } - - renderData.worldMatDirty = false; }, update: simpleRenderUtil.update diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index a6ef006f17..1774508e9c 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -139,7 +139,6 @@ module.exports = { let row = Math.ceil(vRepeat), col = Math.ceil(hRepeat); - node._updateWorldMatrix(); let matrix = node._worldMatrix; let a = matrix.m00, b = matrix.m01, diff --git a/cocos2d/core/renderer/canvas/canvas-render-walker.js b/cocos2d/core/renderer/canvas/canvas-render-walker.js index 135e949da0..7fd9e4d170 100644 --- a/cocos2d/core/renderer/canvas/canvas-render-walker.js +++ b/cocos2d/core/renderer/canvas/canvas-render-walker.js @@ -42,10 +42,6 @@ RenderComponentWalker.prototype = { reset() {}, _handleRender (node) { - if (node._localMatDirty) { - node._calculWorldMatrix(); - } - let comp = node._renderComponent; let opacity = node.opacity; let assembler = comp && comp.constructor._assembler; diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index 45916a6c69..47e99c9dfe 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -139,10 +139,6 @@ RenderComponentWalker.prototype = { }, _handleRender (node) { - if (node._localMatDirty) { - node._calculWorldMatrix(); - } - if (node.groupIndex !== 0) { this._curCameraNode = node; } diff --git a/cocos2d/core/systems/transform.js b/cocos2d/core/systems/transform.js new file mode 100644 index 0000000000..6539c3724c --- /dev/null +++ b/cocos2d/core/systems/transform.js @@ -0,0 +1,114 @@ +/**************************************************************************** + Copyright (c) 2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +const renderEngine = require('../renderer/render-engine'); +const math = renderEngine.math; + +module.exports = { + _dirtyNodes: [], + _updatedNodes: [], + + _calculWorldMatrix (node) { + // Avoid as much function call as possible + if (node._localMatDirty) { + node._updateLocalMatrix(); + } + + // Assume parent world matrix is correct + if (node._parent) { + let parentMat = node._parent._worldMatrix; + math.mat4.mul(node._worldMatrix, parentMat, node._matrix); + } + else { + math.mat4.copy(node._worldMatrix, node._matrix); + } + node._worldMatDirty = false; + node._worldMatUpdated = true; + // For resetting _worldMatUpdated flag in afterDraw + this._updatedNodes.push(node); + + let children = node._children; + for (let i = 0, len = children.length; i < len; ++i) { + let child = children[i]; + this._calculWorldMatrix(child); + } + }, + + _updateWorldMatrix (node) { + let changedRoot = null; + while (node) { + if (node._localMatDirty || node._worldMatDirty) { + changedRoot = node; + } + node = node._parent; + } + if (changedRoot) { + this._calculWorldMatrix(changedRoot); + } + }, + + setNodeDirty (node) { + if (!node._localMatDirty) { + node._localMatDirty = true; + if (!this._dirtyNodes[node._level]) { + this._dirtyNodes[node._level] = []; + } + this._dirtyNodes[node._level].push(node); + } + }, + + setWorldDirty (node) { + if (!node._worldMatDirty) { + node._worldMatDirty = true; + if (!this._dirtyNodes[node._level]) { + this._dirtyNodes[node._level] = []; + } + this._dirtyNodes[node._level].push(node); + } + }, + + update () { + let levels = this._dirtyNodes; + for (let i = 0, l = levels.length; i < l; i++) { + let nodes = levels[i]; + if (nodes) { + for (let j = 0, n = nodes.length; j < n; j++) { + let node = nodes[j]; + if (node._localMatDirty || node._worldMatDirty) { + this._calculWorldMatrix(node); + } + } + nodes.length = 0; + } + } + }, + + afterDraw () { + for (let i = 0, l = this._updatedNodes.length; i < l; i++) { + this._updatedNodes[i]._worldMatUpdated = false; + } + this._updatedNodes.length = 0; + } +}; \ No newline at end of file diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 3d6f4e4930..675130d69f 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -128,6 +128,14 @@ var BaseNode = cc.Class({ _active: true, + /** + * @property _level + * @type {Number} + * @default 0 + * @private + */ + _level: 0, + /** * @property _components * @type {Component[]} @@ -353,6 +361,7 @@ var BaseNode = cc.Class({ if (CC_DEBUG && (value._objFlags & Deactivating)) { cc.errorID(3821); } + this._level = value._level + 1; eventManager._setDirtyForNode(this); value._children.push(this); value.emit(CHILD_ADDED, this); diff --git a/cocos2d/tilemap/tmx-layer-assembler.js b/cocos2d/tilemap/tmx-layer-assembler.js index 83af5812c4..aad85d1775 100644 --- a/cocos2d/tilemap/tmx-layer-assembler.js +++ b/cocos2d/tilemap/tmx-layer-assembler.js @@ -110,7 +110,7 @@ let tmxAssembler = js.addon({ let appx = node._anchorPoint.x * node._contentSize.width, appy = node._anchorPoint.y * node._contentSize.height; - node.getWorldMatrix(_mat4_temp); + mat4.copy(_mat4_temp, node._worldMatrix); vec3.set(_vec3_temp, -appx, -appy, 0); mat4.translate(_mat4_temp, _mat4_temp, _vec3_temp); diff --git a/cocos2d/videoplayer/video-player-impl.js b/cocos2d/videoplayer/video-player-impl.js index 62c72824ed..ded173ea9b 100644 --- a/cocos2d/videoplayer/video-player-impl.js +++ b/cocos2d/videoplayer/video-player-impl.js @@ -366,7 +366,6 @@ let VideoPlayerImpl = cc.Class({ updateMatrix (node) { if (!this._video || !this._visible) return; - node._updateWorldMatrix(); var mat = node._worldMatrix; if (!this._forceUpdate && this._m00 === mat.m00 && this._m01 === mat.m01 && this._m04 === mat.m04 && this._m05 === mat.m05 && this._m12 === mat.m12 && this._m13 === mat.m13 && diff --git a/cocos2d/webview/webview-impl.js b/cocos2d/webview/webview-impl.js index a989061aaf..495b051051 100644 --- a/cocos2d/webview/webview-impl.js +++ b/cocos2d/webview/webview-impl.js @@ -299,7 +299,6 @@ var WebViewImpl = cc.Class({ updateMatrix (node) { if (!this._div || !this._visible) return; - node._updateWorldMatrix(); var mat = node._worldMatrix; if (!this._forceUpdate && this._m00 === mat.m00 && this._m01 === mat.m01 && this._m04 === mat.m04 && this._m05 === mat.m05 && this._m12 === mat.m12 && this._m13 === mat.m13 && diff --git a/extensions/dragonbones/CCSlot.js b/extensions/dragonbones/CCSlot.js index b5a94773ac..408a73cf46 100644 --- a/extensions/dragonbones/CCSlot.js +++ b/extensions/dragonbones/CCSlot.js @@ -25,6 +25,7 @@ const renderEngine = require('../../cocos2d/core/renderer/render-engine'); const math = renderEngine.math; +const transformSys = require('../../cocos2d/core/systems/transform'); const BlendFactor = require('../../cocos2d/core/platform/CCMacro'); const BinaryOffset = dragonBones.BinaryOffset; @@ -354,7 +355,7 @@ dragonBones.CCSlot = cc.Class({ let node = this._display.node; math.mat4.copy(node._matrix, t); node._localMatDirty = false; - node._worldMatDirty = true; + transformSys.setWorldDirty(node); } this._updateVertices(); diff --git a/extensions/dragonbones/canvas-assembler.js b/extensions/dragonbones/canvas-assembler.js index eaa686712a..e73c1d71ae 100644 --- a/extensions/dragonbones/canvas-assembler.js +++ b/extensions/dragonbones/canvas-assembler.js @@ -17,7 +17,6 @@ let armatureAssembler = { ctx.save(); let node = comp.node; - node._updateWorldMatrix(); let matrix = node._worldMatrix; let texture = comp.dragonAtlasAsset.texture; diff --git a/extensions/dragonbones/webgl-assembler.js b/extensions/dragonbones/webgl-assembler.js index 1fa0bab08a..fbb66f3823 100644 --- a/extensions/dragonbones/webgl-assembler.js +++ b/extensions/dragonbones/webgl-assembler.js @@ -100,7 +100,6 @@ let armatureAssembler = js.addon({ let node = comp.node; _z = node._position.z; - node._updateWorldMatrix(); _worldMatrix = node._worldMatrix; _a = _worldMatrix.m00; _b = _worldMatrix.m01; _c = _worldMatrix.m04; _d = _worldMatrix.m05; _tx = _worldMatrix.m12; _ty = _worldMatrix.m13; From b1cfce20084028c1b10aa9a3189ff78c755f4c70 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 10 Apr 2018 17:05:52 +0800 Subject: [PATCH 03/53] Improve transform sys logic --- cocos2d/core/CCDirector.js | 5 +++-- cocos2d/core/systems/transform.js | 28 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index efb81d0486..860f45fa49 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -30,6 +30,7 @@ const AutoReleaseUtils = require('./load-pipeline/auto-release-utils'); const ComponentScheduler = require('./component-scheduler'); const NodeActivator = require('./node-activator'); const EventListeners = require('./event/event-listeners'); +const Obj = require('./platform/CCObject'); const renderer = require('./renderer'); const eventManager = require('./event-manager'); const transformSys = require('./systems/transform'); @@ -441,7 +442,7 @@ cc.Director.prototype = { this._scene = null; // purge destroyed nodes belongs to old scene - cc.Object._deferredDestroy(); + Obj._deferredDestroy(); CC_BUILD && CC_DEBUG && console.timeEnd('Destroy'); if (onBeforeLoadScene) { @@ -965,7 +966,7 @@ cc.Director.prototype = { // User can use this event to do things after update this.emit(cc.Director.EVENT_AFTER_UPDATE); // Destroy entities that have been removed recently - cc.Object._deferredDestroy(); + Obj._deferredDestroy(); // Update transform for all dirty nodes transformSys.update(); } diff --git a/cocos2d/core/systems/transform.js b/cocos2d/core/systems/transform.js index 6539c3724c..2dc47e4550 100644 --- a/cocos2d/core/systems/transform.js +++ b/cocos2d/core/systems/transform.js @@ -26,7 +26,7 @@ const renderEngine = require('../renderer/render-engine'); const math = renderEngine.math; -module.exports = { +let transformSys = { _dirtyNodes: [], _updatedNodes: [], @@ -89,19 +89,21 @@ module.exports = { } }, + _updateLevel (nodes) { + let node; + for (let i = 0, n = nodes.length; i < n; i++) { + node = nodes[i]; + if (node._localMatDirty || node._worldMatDirty) { + this._calculWorldMatrix(node); + } + } + nodes.length = 0; + }, + update () { let levels = this._dirtyNodes; for (let i = 0, l = levels.length; i < l; i++) { - let nodes = levels[i]; - if (nodes) { - for (let j = 0, n = nodes.length; j < n; j++) { - let node = nodes[j]; - if (node._localMatDirty || node._worldMatDirty) { - this._calculWorldMatrix(node); - } - } - nodes.length = 0; - } + this._updateLevel(levels[i]); } }, @@ -111,4 +113,6 @@ module.exports = { } this._updatedNodes.length = 0; } -}; \ No newline at end of file +}; + +module.exports = transformSys; \ No newline at end of file From 3dcaf1937620d3682cae934a0b63f1a3ef3bcd30 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 11 Apr 2018 14:15:08 +0800 Subject: [PATCH 04/53] Visit render component with chain instead of walking scene graph --- cocos2d/core/CCNode.js | 10 +- cocos2d/core/components/CCRenderComponent.js | 15 ++ .../core/renderer/render-component-walker.js | 58 +++--- .../core/renderer/utils/hierarchy-chain.js | 177 ++++++++++++++++++ 4 files changed, 228 insertions(+), 32 deletions(-) create mode 100644 cocos2d/core/renderer/utils/hierarchy-chain.js diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index ef16dc9408..e690e0dd2f 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -36,6 +36,7 @@ const macro = require('./platform/CCMacro'); const misc = require('./utils/misc'); const Event = require('./event/event'); const transformSys = require('./systems/transform'); +const hierarchyChain = require('./renderer/utils/hierarchy-chain'); const Flags = cc.Object.Flags; const Destroying = Flags.Destroying; @@ -1006,6 +1007,10 @@ var Node = cc.Class({ }, _onHierarchyChanged (oldParent) { + this._updateOrderOfArrival(); + if (this._parent && this._parent._delaySort) { + this._parent._delaySort(); + } this._onHierarchyChangedBase(oldParent); cc._widgetManager._nodesOrderDirty = true; }, @@ -1078,6 +1083,8 @@ var Node = cc.Class({ eventManager.pauseTarget(this); } + hierarchyChain.rebuild(this); + let children = this._children; for (let i = 0, len = children.length; i < len; i++) { children[i]._onBatchCreated(); @@ -2288,14 +2295,12 @@ var Node = cc.Class({ // invokes the parent setter child.parent = this; - child._updateOrderOfArrival(); if (zIndex !== undefined) { child.zIndex = zIndex; } if (name !== undefined) { child.name = name; } - this._delaySort(); }, /** @@ -2349,6 +2354,7 @@ var Node = cc.Class({ } _children[j + 1] = child; } + hierarchyChain.rebuild(this); this.emit(CHILD_REORDER); } cc.director.__fastOff(cc.Director.EVENT_AFTER_UPDATE, this.sortAllChildren, this); diff --git a/cocos2d/core/components/CCRenderComponent.js b/cocos2d/core/components/CCRenderComponent.js index 5ed1bd5cd3..0fef52fafe 100644 --- a/cocos2d/core/components/CCRenderComponent.js +++ b/cocos2d/core/components/CCRenderComponent.js @@ -26,6 +26,7 @@ const Component = require('./CCComponent'); const defaultVertexFormat = require('../renderer/vertex-format'); const renderEngine = require('../renderer/render-engine'); +const hierarchyChain = require('../renderer/utils/hierarchy-chain'); const RenderData = renderEngine.RenderData; /** @@ -51,14 +52,28 @@ var RenderComponent = cc.Class({ this.__allocedDatas = []; this._vertexFormat = defaultVertexFormat; this._toPostHandle = false; + // Render component chain entries + this._chain = { + comp: this, + next: null + }; + this._postChain = null; }, onEnable () { this.node._renderComponent = this; + // When parent children order dirty, its children's render component will be rechained in sortAllChildren + if (!this.node.parent._reorderChildDirty) { + hierarchyChain.rebuildSelf(this.node); + } }, onDisable () { this.node._renderComponent = null; + // When parent children order dirty, its children's render component will be rechained in sortAllChildren + if (!this.node.parent._reorderChildDirty) { + hierarchyChain.rebuildSelf(this.node); + } }, onDestroy () { diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index 47e99c9dfe..d0f243c759 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -27,6 +27,7 @@ const macro = require('../platform/CCMacro'); const renderEngine = require('./render-engine'); const defaultVertexFormat = require('./vertex-format'); const StencilManager = require('./stencil-manager'); +const hierarchyChain = require('./utils/hierarchy-chain'); const gfx = renderEngine.gfx; const RecyclePool = renderEngine.RecyclePool; const InputAssembler = renderEngine.InputAssembler; @@ -97,9 +98,6 @@ var RenderComponentWalker = function (device, renderScene) { this._sortKey = 0; this._curCameraNode = null; - - this._handleRender = this._handleRender.bind(this); - this._postHandleRender = this._postHandleRender.bind(this); }; RenderComponentWalker.prototype = { @@ -138,31 +136,6 @@ RenderComponentWalker.prototype = { this._stencilMgr.reset(); }, - _handleRender (node) { - if (node.groupIndex !== 0) { - this._curCameraNode = node; - } - - let group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; - node._cullingMask = 1 << group; - - let comp = node._renderComponent; - if (comp) { - this.renderComp(comp, comp.constructor._assembler); - } - }, - - _postHandleRender (node) { - let comp = node._renderComponent; - if (comp && comp.constructor._postAssembler) { - this.renderComp(comp, comp.constructor._postAssembler); - } - - if (this._curCameraNode === node) { - this._curCameraNode = null; - } - }, - _flush (batchData) { let vfmt = batchData.vfmt, material = batchData.material, @@ -308,8 +281,33 @@ RenderComponentWalker.prototype = { visit (scene) { this.reset(); - // Store all render components to _queue - scene.walk(this._handleRender, this._postHandleRender); + let entry = hierarchyChain.entry(scene); + while (entry) { + let comp = entry.comp; + + // Pre handle + if (!entry.post) { + let node = comp.node; + if (node.groupIndex !== 0) { + this._curCameraNode = node; + } + + let group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; + node._cullingMask = 1 << group; + + this.renderComp(comp, comp.constructor._assembler); + } + // Post handle + else { + this.renderComp(comp, comp.constructor._postAssembler); + + if (this._curCameraNode === node) { + this._curCameraNode = null; + } + } + + entry = entry.next; + } this._flush(_batchData); } diff --git a/cocos2d/core/renderer/utils/hierarchy-chain.js b/cocos2d/core/renderer/utils/hierarchy-chain.js new file mode 100644 index 0000000000..ab5da98603 --- /dev/null +++ b/cocos2d/core/renderer/utils/hierarchy-chain.js @@ -0,0 +1,177 @@ +/**************************************************************************** + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +function findPrevious (node) { + let parent = node.parent; + // reach root scene + if (!parent) { + return null; + } + + // Find previous render component in siblings + let children = parent.children; + let index = children.indexOf(node); + let previous = null, comp = null; + for (let i = index - 1; i >= 0; i--) { + let sibling = children[i]; + previous = findLast(sibling); + if (previous) { + return previous; + } + } + + // Find previous render component in parent level + if (parent._renderComponent) { + return parent._renderComponent._chain; + } + else { + return findPrevious(parent); + } +} + +function findNext (node) { + let parent = node.parent; + // reach root scene + if (!parent) { + return null; + } + + // Find next render component in siblings + let children = parent.children; + let index = children.indexOf(node); + let next = null; + for (let i = index + 1; i < children.length; i++) { + let sibling = children[i]; + next = findFirst(sibling); + if (next) { + return next; + } + } + + let comp = parent._renderComponent; + if (comp && comp.constructor._postAssembler) { + if (!comp._postChain) { + comp._postChain = { + post: true, + comp: comp, + next: null + } + } + // If parent's component has post assembler, we need to chain it to the next component + return comp._postChain; + } + + // Find next render component in parent level + return findNext(parent); +} + +function findFirst (node) { + if (node._renderComponent) { + return node._renderComponent._chain; + } + + let children = node.children; + let first; + for (let i = 0; i < children.length; i++) { + let child = children[i]; + first = findFirst(child); + if (first) { + return first; + } + } + return null; +} + +function findLast (node) { + let comp = node._renderComponent; + if (comp && comp.constructor._postAssembler) { + if (!comp._postChain) { + comp._postChain = { + post: true, + comp: comp, + next: null + } + } + // If parent's component has post assembler, we need to chain it to the next component + return comp._postChain; + } + + let children = node.children; + let last; + for (let i = children.length - 1; i >= 0; i--) { + last = findLast(children[i]); + if (last) { + return last; + } + } + return comp ? comp._chain : null; +} + +module.exports = { + rebuildSelf (node) { + let previous = findPrevious(node); + let next = findNext(node); + let first = findFirst(node); + // If first not exist, then no render component inside the current node + if (first) { + if (previous) { + previous.next = first; + } + let last = findLast(node); + last.next = next; + } + else if (previous) { + previous.next = next; + } + }, + + rebuild (node) { + let previous = node._renderComponent ? node._renderComponent._chain : findPrevious(node); + // Rebuild for all children + let children = node.children; + let curr, first; + for (let i = 0; i < children.length; i++) { + curr = children[i]; + first = findFirst(curr); + // If first not exist, then no render component inside the current node, nothing to do + if (first) { + if (previous) { + // Rebuild chain for previous render component and the first render component in sub tree + previous.next = first; + } + // Set previous to the last render component in sub tree + previous = findLast(curr); + } + } + if (previous) { + // Link the last render component's next to the outside next render component + previous.next = findNext(node); + } + }, + + entry (scene) { + return findFirst(scene); + } +} \ No newline at end of file From 6d0872f1bf8e67728bc4c24f257ec8fca276b78f Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 11 Apr 2018 14:59:39 +0800 Subject: [PATCH 05/53] Small improvements --- cocos2d/core/CCNode.js | 2 +- cocos2d/core/renderer/utils/hierarchy-chain.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index e690e0dd2f..97ee498c25 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1008,7 +1008,7 @@ var Node = cc.Class({ _onHierarchyChanged (oldParent) { this._updateOrderOfArrival(); - if (this._parent && this._parent._delaySort) { + if (this._parent) { this._parent._delaySort(); } this._onHierarchyChangedBase(oldParent); diff --git a/cocos2d/core/renderer/utils/hierarchy-chain.js b/cocos2d/core/renderer/utils/hierarchy-chain.js index ab5da98603..461b153dca 100644 --- a/cocos2d/core/renderer/utils/hierarchy-chain.js +++ b/cocos2d/core/renderer/utils/hierarchy-chain.js @@ -24,14 +24,14 @@ ****************************************************************************/ function findPrevious (node) { - let parent = node.parent; + let parent = node._parent; // reach root scene if (!parent) { return null; } // Find previous render component in siblings - let children = parent.children; + let children = parent._children; let index = children.indexOf(node); let previous = null, comp = null; for (let i = index - 1; i >= 0; i--) { @@ -52,14 +52,14 @@ function findPrevious (node) { } function findNext (node) { - let parent = node.parent; + let parent = node._parent; // reach root scene if (!parent) { return null; } // Find next render component in siblings - let children = parent.children; + let children = parent._children; let index = children.indexOf(node); let next = null; for (let i = index + 1; i < children.length; i++) { @@ -92,7 +92,7 @@ function findFirst (node) { return node._renderComponent._chain; } - let children = node.children; + let children = node._children; let first; for (let i = 0; i < children.length; i++) { let child = children[i]; @@ -118,7 +118,7 @@ function findLast (node) { return comp._postChain; } - let children = node.children; + let children = node._children; let last; for (let i = children.length - 1; i >= 0; i--) { last = findLast(children[i]); @@ -150,7 +150,7 @@ module.exports = { rebuild (node) { let previous = node._renderComponent ? node._renderComponent._chain : findPrevious(node); // Rebuild for all children - let children = node.children; + let children = node._children; let curr, first; for (let i = 0; i < children.length; i++) { curr = children[i]; From c5b586c5d7d8da298957576a7b023c22865339a7 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 11 Apr 2018 20:10:24 +0800 Subject: [PATCH 06/53] Fix old parent chain issue --- cocos2d/core/CCNode.js | 4 ++++ .../core/renderer/render-component-walker.js | 9 ++++---- .../core/renderer/utils/hierarchy-chain.js | 22 ++++++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 97ee498c25..0bae93e421 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1007,6 +1007,10 @@ var Node = cc.Class({ }, _onHierarchyChanged (oldParent) { + if (oldParent) { + // Unchain from old parent + hierarchyChain.unchainSelf(); + } this._updateOrderOfArrival(); if (this._parent) { this._parent._delaySort(); diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index d0f243c759..d0e33750b3 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -284,10 +284,11 @@ RenderComponentWalker.prototype = { let entry = hierarchyChain.entry(scene); while (entry) { let comp = entry.comp; + let node = comp.node; + let assembler = null; // Pre handle if (!entry.post) { - let node = comp.node; if (node.groupIndex !== 0) { this._curCameraNode = node; } @@ -295,16 +296,16 @@ RenderComponentWalker.prototype = { let group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; node._cullingMask = 1 << group; - this.renderComp(comp, comp.constructor._assembler); + assembler = comp.constructor._assembler; } // Post handle else { - this.renderComp(comp, comp.constructor._postAssembler); - if (this._curCameraNode === node) { this._curCameraNode = null; } + assembler = comp.constructor._postAssembler; } + this.renderComp(comp, assembler); entry = entry.next; } diff --git a/cocos2d/core/renderer/utils/hierarchy-chain.js b/cocos2d/core/renderer/utils/hierarchy-chain.js index 461b153dca..38fe8401c4 100644 --- a/cocos2d/core/renderer/utils/hierarchy-chain.js +++ b/cocos2d/core/renderer/utils/hierarchy-chain.js @@ -130,20 +130,30 @@ function findLast (node) { } module.exports = { + unchainSelf (node) { + let last = findLast(node); + if (last) { + // Chain previous node to the next node + let previous = findPrevious(node); + if (previous) { + previous.next = last.next; + } + } + }, + rebuildSelf (node) { let previous = findPrevious(node); - let next = findNext(node); let first = findFirst(node); // If first not exist, then no render component inside the current node if (first) { + let last = findLast(node); if (previous) { + last.next = previous.next; previous.next = first; } - let last = findLast(node); - last.next = next; - } - else if (previous) { - previous.next = next; + else { + last.next = null; + } } }, From a0091761dab4b738b9f51790b0e82107b79d3778 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 12 Apr 2018 11:37:52 +0800 Subject: [PATCH 07/53] Sync world mat dirty to ensure mat dirty flag reliable --- cocos2d/core/CCDirector.js | 7 - cocos2d/core/CCNode.js | 126 ++++++++++++++---- cocos2d/core/camera/CCCamera.js | 11 +- .../renderer/assemblers/sprite/bar-filled.js | 4 +- .../core/renderer/assemblers/sprite/index.js | 4 +- .../core/renderer/assemblers/sprite/mesh.js | 8 +- .../core/renderer/assemblers/sprite/simple.js | 9 +- .../core/renderer/assemblers/sprite/sliced.js | 5 +- .../renderer/canvas/canvas-render-walker.js | 4 + .../core/renderer/render-component-walker.js | 7 +- cocos2d/core/systems/transform.js | 118 ---------------- extensions/dragonbones/CCSlot.js | 3 +- extensions/dragonbones/webgl-assembler.js | 2 +- 13 files changed, 130 insertions(+), 178 deletions(-) delete mode 100644 cocos2d/core/systems/transform.js diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index 860f45fa49..7c489a7a2b 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -33,7 +33,6 @@ const EventListeners = require('./event/event-listeners'); const Obj = require('./platform/CCObject'); const renderer = require('./renderer'); const eventManager = require('./event-manager'); -const transformSys = require('./systems/transform'); //---------------------------------------------------------------------------------------------------------------------- @@ -929,8 +928,6 @@ cc.Director.prototype = { this._compScheduler.lateUpdatePhase(deltaTime); this.emit(cc.Director.EVENT_AFTER_UPDATE); - - transformSys.update(); } // Render @@ -939,7 +936,6 @@ cc.Director.prototype = { // After draw this.emit(cc.Director.EVENT_AFTER_DRAW); - transformSys.afterDraw(); this._totalFrames++; @@ -967,8 +963,6 @@ cc.Director.prototype = { this.emit(cc.Director.EVENT_AFTER_UPDATE); // Destroy entities that have been removed recently Obj._deferredDestroy(); - // Update transform for all dirty nodes - transformSys.update(); } // Render @@ -977,7 +971,6 @@ cc.Director.prototype = { // After draw this.emit(cc.Director.EVENT_AFTER_DRAW); - transformSys.afterDraw(); eventManager.frameUpdateListeners(); this._totalFrames++; diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 0bae93e421..f94064addb 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -35,7 +35,6 @@ const eventManager = require('./event-manager'); const macro = require('./platform/CCMacro'); const misc = require('./utils/misc'); const Event = require('./event/event'); -const transformSys = require('./systems/transform'); const hierarchyChain = require('./renderer/utils/hierarchy-chain'); const Flags = cc.Object.Flags; @@ -56,6 +55,7 @@ var emptyFunc = function () {}; var _mat4_temp = math.mat4.create(); var _vec3_temp = math.vec3.create(); var _quat_temp = math.quat.create(); +var _parents = []; var _globalOrderOfArrival = 1; /** @@ -309,6 +309,16 @@ function _checkListeners (node, events) { return true; } +function _syncWorldDirty (children) { + for (let i = 0, l = children.length; i < l; i++) { + let child = children[i]; + child._worldMatDirty = true; + if (child._children.length > 0) { + _syncWorldDirty(child._children); + } + } +} + /** * !#en * Class of all entities in Cocos Creator scenes.
@@ -422,7 +432,7 @@ var Node = cc.Class({ } localPosition.x = value; - transformSys.setNodeDirty(this); + this.setLocalDirty(); // fast check event var cache = this._hasListenerCache; @@ -465,7 +475,7 @@ var Node = cc.Class({ } localPosition.y = value; - transformSys.setNodeDirty(this); + this.setLocalDirty(); // fast check event var cache = this._hasListenerCache; @@ -495,7 +505,7 @@ var Node = cc.Class({ if (value !== localPosition.z) { if (!CC_EDITOR || isFinite(value)) { localPosition.z = value; - transformSys.setNodeDirty(this); + this.setLocalDirty(); } else { cc.error(ERR_INVALID_NUMBER, 'new z'); @@ -525,7 +535,7 @@ var Node = cc.Class({ this._rotationX = this._rotationY = value; // Update quaternion from rotation math.quat.fromEuler(this._quat, 0, 0, -value); - transformSys.setNodeDirty(this); + this.setLocalDirty(); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -558,7 +568,7 @@ var Node = cc.Class({ else { math.quat.fromEuler(this._quat, value, this._rotationY, 0); } - transformSys.setNodeDirty(this); + this.setLocalDirty(); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -591,7 +601,7 @@ var Node = cc.Class({ else { math.quat.fromEuler(this._quat, this._rotationX, value, 0); } - transformSys.setNodeDirty(this); + this.setLocalDirty(); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -626,7 +636,7 @@ var Node = cc.Class({ set (value) { if (this._scale.x !== value) { this._scale.x = value; - transformSys.setNodeDirty(this); + this.setLocalDirty(); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -652,7 +662,7 @@ var Node = cc.Class({ set (value) { if (this._scale.y !== value) { this._scale.y = value; - transformSys.setNodeDirty(this); + this.setLocalDirty(); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -677,7 +687,7 @@ var Node = cc.Class({ }, set (value) { this._skewX = value; - transformSys.setNodeDirty(this); + this.setLocalDirty(); } }, @@ -696,7 +706,7 @@ var Node = cc.Class({ }, set (value) { this._skewY = value; - transformSys.setNodeDirty(this); + this.setLocalDirty(); } }, @@ -911,6 +921,7 @@ var Node = cc.Class({ this._worldMatrix = mathPools.mat4.get(); this._localMatDirty = false; this._worldMatDirty = false; + this.setLocalDirty(); this._cullingMask = 1 << this.groupIndex; }, @@ -984,8 +995,6 @@ var Node = cc.Class({ var actionManager = ActionManagerExist ? cc.director.getActionManager() : null; if (active) { // activate - // Force update transform - transformSys.setNodeDirty(this); // ActionManager & EventManager actionManager && actionManager.resumeTarget(this); eventManager.resumeTarget(this); @@ -1295,7 +1304,7 @@ var Node = cc.Class({ testPt = cc.v2(point); } - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); math.mat4.invert(_mat4_temp, this._worldMatrix); math.vec2.transformMat4(testPt, testPt, _mat4_temp); testPt.x += this._anchorPoint.x * this._contentSize.width; @@ -1545,7 +1554,7 @@ var Node = cc.Class({ else { return cc.error(ERR_INVALID_NUMBER, 'y of new position'); } - transformSys.setNodeDirty(this); + this.setLocalDirty(); // fast check event var cache = this._hasListenerCache; @@ -1597,7 +1606,7 @@ var Node = cc.Class({ if (this._scale.x !== scaleX || this._scale.y !== scaleY) { this._scale.x = scaleX; this._scale.y = scaleY; - transformSys.setNodeDirty(this); + this.setLocalDirty(); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -1735,7 +1744,7 @@ var Node = cc.Class({ locAnchorPoint.x = point; locAnchorPoint.y = y; } - transformSys.setNodeDirty(this); + this.setLocalDirty(); this.emit(ANCHOR_CHANGED); }, @@ -1802,8 +1811,7 @@ var Node = cc.Class({ else { math.vec3.copy(this._position, pos); } - - transformSys.setNodeDirty(this); + this.setLocalDirty(); // fast check event var cache = this._hasListenerCache; @@ -1915,6 +1923,68 @@ var Node = cc.Class({ } }, + _calculWorldMatrix () { + // Avoid as much function call as possible + if (this._localMatDirty) { + this._updateLocalMatrix(); + } + + // Assume parent world matrix is correct + if (this._parent) { + let parentMat = this._parent._worldMatrix; + math.mat4.mul(this._worldMatrix, parentMat, this._matrix); + } + else { + math.mat4.copy(this._worldMatrix, this._matrix); + } + this._worldMatDirty = false; + }, + + _updateWorldMatrix () { + let node = this; + // Find root of world matrix changing + while (node) { + if (node._worldMatDirty) { + _parents.push(node); + } + else { + break; + } + node = node._parent; + } + // Update world matrix of all changed parents + for (let i = _parents.length - 1; i >= 0; i--) { + _parents[i]._calculWorldMatrix(); + } + _parents.length = 0; + }, + + setLocalDirty () { + if (!this._localMatDirty) { + this._localMatDirty = true; + // Sync world mat dirty to sub tree + if (!this._worldMatDirty) { + this._worldMatDirty = true; + if (this._children.length > 0) { + _syncWorldDirty(this._children); + } + } + } + }, + + setWorldDirty () { + if (!this._worldMatDirty) { + this._worldMatDirty = true; + // Sync world mat dirty to sub tree + if (!this._worldMatDirty) { + this._worldMatDirty = true; + if (this._children.length > 0) { + _syncWorldDirty(this._children); + } + } + } + }, + /** * !#en * Get the local transform matrix (4x4), based on parent node coordinates @@ -1943,7 +2013,7 @@ var Node = cc.Class({ * node.getLocalMatrix(mat4); */ getWorldMatrix (out) { - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); return math.mat4.copy(out, this._worldMatrix); }, @@ -1957,7 +2027,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToNodeSpace(cc.v2(100, 100)); */ convertToNodeSpace (worldPoint) { - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); math.mat4.invert(_mat4_temp, this._worldMatrix); let out = new cc.Vec2(); math.vec2.transformMat4(out, worldPoint, _mat4_temp); @@ -1976,7 +2046,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToWorldSpace(cc.v2(100, 100)); */ convertToWorldSpace (nodePoint) { - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); let out = new cc.Vec2( nodePoint.x - this._anchorPoint.x * this._contentSize.width, nodePoint.y - this._anchorPoint.y * this._contentSize.height @@ -1998,7 +2068,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToNodeSpaceAR(cc.v2(100, 100)); */ convertToNodeSpaceAR (worldPoint) { - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); math.mat4.invert(_mat4_temp, this._worldMatrix); let out = new cc.Vec2(); return math.vec2.transformMat4(out, worldPoint, _mat4_temp); @@ -2018,7 +2088,7 @@ var Node = cc.Class({ * var newVec2 = node.convertToWorldSpaceAR(cc.v2(100, 100)); */ convertToWorldSpaceAR (nodePoint) { - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); let out = new cc.Vec2(); return math.vec2.transformMat4(out, nodePoint, this._worldMatrix); }, @@ -2092,7 +2162,7 @@ var Node = cc.Class({ if (!out) { out = AffineTrans.identity(); } - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); var contentSize = this._contentSize; _vec3_temp.x = -this._anchorPoint.x * contentSize.width; @@ -2123,7 +2193,7 @@ var Node = cc.Class({ if (!out) { out = AffineTrans.identity(); } - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); return AffineTrans.fromMat4(out, this._matrix); }, @@ -2166,7 +2236,7 @@ var Node = cc.Class({ if (!out) { out = AffineTrans.identity(); } - transformSys._updateWorldMatrix(this); + this._updateWorldMatrix(); math.mat4.invert(_mat4_temp, this._worldMatrix); return AffineTrans.fromMat4(out, _mat4_temp); }, @@ -2235,7 +2305,7 @@ var Node = cc.Class({ */ getBoundingBoxToWorld () { if (this._parent) { - transformSys._updateWorldMatrix(this._parent); + this._parent._updateWorldMatrix(); return this._getBoundingBoxTo(this._parent._worldMatrix); } else { diff --git a/cocos2d/core/camera/CCCamera.js b/cocos2d/core/camera/CCCamera.js index 9dbc0eb816..3f07157585 100644 --- a/cocos2d/core/camera/CCCamera.js +++ b/cocos2d/core/camera/CCCamera.js @@ -292,8 +292,6 @@ let Camera = cc.Class({ onEnable () { this._matrixDirty = true; - cc.director.on(cc.Director.EVENT_AFTER_DRAW, this.afterDraw, this); - if (game.renderType === game.RENDER_TYPE_WEBGL) { renderer.scene.addCamera(this._camera); } @@ -301,8 +299,6 @@ let Camera = cc.Class({ }, onDisable () { - cc.director.off(cc.Director.EVENT_AFTER_DRAW, this.afterDraw, this); - if (game.renderType === game.RENDER_TYPE_WEBGL) { renderer.scene.removeCamera(this._camera); } @@ -434,15 +430,15 @@ let Camera = cc.Class({ // force update node world matrix this.node.getWorldMatrix(_mat4_temp_1); - this.afterDraw(); + this.lateUpdate(); renderer._walker.visit(root); renderer._forward.renderCamera(this._camera, renderer.scene); }, - afterDraw: !CC_EDITOR && function () { + lateUpdate: !CC_EDITOR && function () { let node = this.node; - if (!this._matrixDirty && !node._worldMatUpdated) + if (!this._matrixDirty && !node._worldMatDirty) return; let camera = this._camera; @@ -456,6 +452,7 @@ let Camera = cc.Class({ height = targetTexture.height; } + node._updateWorldMatrix(); _vec3_temp_1.x = node._worldMatrix.m12; _vec3_temp_1.y = node._worldMatrix.m13; _vec3_temp_1.z = 0; diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index 8e3eabd147..fbab6e14c7 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -29,7 +29,7 @@ const FillType = Sprite.FillType; const simpleRenderUtil = require('./simple'); module.exports = { - update (sprite) { + update (sprite, batchData) { let renderData = sprite._renderData; let uvDirty = renderData.uvDirty, vertDirty = renderData.vertDirty; @@ -63,7 +63,7 @@ module.exports = { if (vertDirty) { this.updateVerts(sprite, fillStart, fillEnd); } - if (vertDirty || sprite.node._worldMatUpdated) { + if (vertDirty || batchData.worldMatUpdated) { this.updateWorldVerts(sprite); } }, diff --git a/cocos2d/core/renderer/assemblers/sprite/index.js b/cocos2d/core/renderer/assemblers/sprite/index.js index 97aaafbe87..61c16cc784 100644 --- a/cocos2d/core/renderer/assemblers/sprite/index.js +++ b/cocos2d/core/renderer/assemblers/sprite/index.js @@ -67,13 +67,13 @@ let spriteAssembler = js.addon({ return util; }, - updateRenderData (sprite) { + updateRenderData (sprite, batchData) { let datas = sprite.__allocedDatas; if (!sprite.spriteFrame || !sprite.getMaterial() || !sprite._renderData) { return datas; } - sprite._assembler.update(sprite); + sprite._assembler.update(sprite, batchData); return datas; }, diff --git a/cocos2d/core/renderer/assemblers/sprite/mesh.js b/cocos2d/core/renderer/assemblers/sprite/mesh.js index fcfad67f29..741a60d252 100644 --- a/cocos2d/core/renderer/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/assemblers/sprite/mesh.js @@ -28,7 +28,7 @@ module.exports = { return sprite.requestRenderData(); }, - update (sprite) { + update (sprite, batchData) { let renderData = sprite._renderData; let frame = sprite.spriteFrame; @@ -52,7 +52,7 @@ module.exports = { if (vertDirty) { this.updateVerts(sprite); } - if (vertDirty || sprite.node._worldMatUpdated) { + if (vertDirty || batchData.worldMatUpdated) { this.updateWorldVerts(sprite); } }, @@ -125,8 +125,8 @@ module.exports = { updateWorldVerts (sprite) { let node = sprite.node, renderData = sprite._renderData, - data = renderData._data, - matrix = node._worldMatrix; + data = renderData._data; + let matrix = node._worldMatrix; let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, tx = matrix.m12, ty = matrix.m13; diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index 0083645daa..01d02e907e 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -29,7 +29,7 @@ const assembler = require('../assembler'); module.exports = js.addon({ useModel: false, - update (sprite) { + update (sprite, batchData) { let renderData = sprite._renderData; if (renderData.uvDirty) { @@ -40,7 +40,7 @@ module.exports = js.addon({ if (vertDirty) { this.updateVerts(sprite); } - if (vertDirty || sprite.node._worldMatUpdated) { + if (vertDirty || batchData.worldMatUpdated) { this.updateWorldVerts(sprite); } }, @@ -127,8 +127,9 @@ module.exports = js.addon({ updateWorldVerts (sprite) { let node = sprite.node, renderData = sprite._renderData, - data = renderData._data, - matrix = node._worldMatrix; + data = renderData._data; + + let matrix = node._worldMatrix; let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, tx = matrix.m12, ty = matrix.m13; diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index a267ed5797..83b2a83a53 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -154,8 +154,9 @@ module.exports = { updateWorldVerts (sprite) { let node = sprite.node, renderData = sprite._renderData, - data = renderData._data, - matrix = node._worldMatrix; + data = renderData._data; + + let matrix = node._worldMatrix; let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, tx = matrix.m12, ty = matrix.m13; diff --git a/cocos2d/core/renderer/canvas/canvas-render-walker.js b/cocos2d/core/renderer/canvas/canvas-render-walker.js index 7fd9e4d170..21e02144cd 100644 --- a/cocos2d/core/renderer/canvas/canvas-render-walker.js +++ b/cocos2d/core/renderer/canvas/canvas-render-walker.js @@ -63,6 +63,10 @@ RenderComponentWalker.prototype = { let ctx = this._device._ctx; let cam = this._camera; ctx.setTransform(cam.a, cam.b, cam.c, cam.d, cam.tx, cam.ty); + let node = comp.node; + if (node._worldMatDirty) { + node._updateWorldMatrix(); + } let drawCall = renderer.draw(ctx, comp); this._device._stats.drawcalls += drawCall; }, diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index d0e33750b3..8d42996a1e 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -43,6 +43,7 @@ const MAX_INDICE_BYTES = MAX_INDICE * 2; var _batchData = { node: null, + worldMatUpdated: false, vfmt: null, material: null, data: null, @@ -295,7 +296,6 @@ RenderComponentWalker.prototype = { let group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; node._cullingMask = 1 << group; - assembler = comp.constructor._assembler; } // Post handle @@ -305,7 +305,12 @@ RenderComponentWalker.prototype = { } assembler = comp.constructor._postAssembler; } + if (node._worldMatDirty) { + node._updateWorldMatrix(); + _batchData.worldMatUpdated = true; + } this.renderComp(comp, assembler); + _batchData.worldMatUpdated = false; entry = entry.next; } diff --git a/cocos2d/core/systems/transform.js b/cocos2d/core/systems/transform.js deleted file mode 100644 index 2dc47e4550..0000000000 --- a/cocos2d/core/systems/transform.js +++ /dev/null @@ -1,118 +0,0 @@ -/**************************************************************************** - Copyright (c) 2018 Xiamen Yaji Software Co., Ltd. - - http://www.cocos.com - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated engine source code (the "Software"), a limited, - worldwide, royalty-free, non-assignable, revocable and non-exclusive license - to use Cocos Creator solely to develop games on your target platforms. You shall - not use Cocos Creator software for developing other software or tools that's - used for developing games. You are not granted to publish, distribute, - sublicense, and/or sell copies of Cocos Creator. - - The software or tools in this License Agreement are licensed, not sold. - Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -const renderEngine = require('../renderer/render-engine'); -const math = renderEngine.math; - -let transformSys = { - _dirtyNodes: [], - _updatedNodes: [], - - _calculWorldMatrix (node) { - // Avoid as much function call as possible - if (node._localMatDirty) { - node._updateLocalMatrix(); - } - - // Assume parent world matrix is correct - if (node._parent) { - let parentMat = node._parent._worldMatrix; - math.mat4.mul(node._worldMatrix, parentMat, node._matrix); - } - else { - math.mat4.copy(node._worldMatrix, node._matrix); - } - node._worldMatDirty = false; - node._worldMatUpdated = true; - // For resetting _worldMatUpdated flag in afterDraw - this._updatedNodes.push(node); - - let children = node._children; - for (let i = 0, len = children.length; i < len; ++i) { - let child = children[i]; - this._calculWorldMatrix(child); - } - }, - - _updateWorldMatrix (node) { - let changedRoot = null; - while (node) { - if (node._localMatDirty || node._worldMatDirty) { - changedRoot = node; - } - node = node._parent; - } - if (changedRoot) { - this._calculWorldMatrix(changedRoot); - } - }, - - setNodeDirty (node) { - if (!node._localMatDirty) { - node._localMatDirty = true; - if (!this._dirtyNodes[node._level]) { - this._dirtyNodes[node._level] = []; - } - this._dirtyNodes[node._level].push(node); - } - }, - - setWorldDirty (node) { - if (!node._worldMatDirty) { - node._worldMatDirty = true; - if (!this._dirtyNodes[node._level]) { - this._dirtyNodes[node._level] = []; - } - this._dirtyNodes[node._level].push(node); - } - }, - - _updateLevel (nodes) { - let node; - for (let i = 0, n = nodes.length; i < n; i++) { - node = nodes[i]; - if (node._localMatDirty || node._worldMatDirty) { - this._calculWorldMatrix(node); - } - } - nodes.length = 0; - }, - - update () { - let levels = this._dirtyNodes; - for (let i = 0, l = levels.length; i < l; i++) { - this._updateLevel(levels[i]); - } - }, - - afterDraw () { - for (let i = 0, l = this._updatedNodes.length; i < l; i++) { - this._updatedNodes[i]._worldMatUpdated = false; - } - this._updatedNodes.length = 0; - } -}; - -module.exports = transformSys; \ No newline at end of file diff --git a/extensions/dragonbones/CCSlot.js b/extensions/dragonbones/CCSlot.js index 408a73cf46..06cde606fa 100644 --- a/extensions/dragonbones/CCSlot.js +++ b/extensions/dragonbones/CCSlot.js @@ -25,7 +25,6 @@ const renderEngine = require('../../cocos2d/core/renderer/render-engine'); const math = renderEngine.math; -const transformSys = require('../../cocos2d/core/systems/transform'); const BlendFactor = require('../../cocos2d/core/platform/CCMacro'); const BinaryOffset = dragonBones.BinaryOffset; @@ -355,7 +354,7 @@ dragonBones.CCSlot = cc.Class({ let node = this._display.node; math.mat4.copy(node._matrix, t); node._localMatDirty = false; - transformSys.setWorldDirty(node); + node.setWorldDirty(); } this._updateVertices(); diff --git a/extensions/dragonbones/webgl-assembler.js b/extensions/dragonbones/webgl-assembler.js index fbb66f3823..c89be14a13 100644 --- a/extensions/dragonbones/webgl-assembler.js +++ b/extensions/dragonbones/webgl-assembler.js @@ -99,7 +99,7 @@ let armatureAssembler = js.addon({ let node = comp.node; _z = node._position.z; - + _worldMatrix = node._worldMatrix; _a = _worldMatrix.m00; _b = _worldMatrix.m01; _c = _worldMatrix.m04; _d = _worldMatrix.m05; _tx = _worldMatrix.m12; _ty = _worldMatrix.m13; From 21cf3ee8521db5731c893f45392b7b4885d04815 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 12 Apr 2018 11:45:18 +0800 Subject: [PATCH 08/53] optimize performance --- jsb/effect.js | 12 ++++++ jsb/pass.js | 40 ++++++++++++++++++++ jsb/renderer.js | 96 +++++++++++++++++++++--------------------------- jsb/technique.js | 5 +++ 4 files changed, 99 insertions(+), 54 deletions(-) diff --git a/jsb/effect.js b/jsb/effect.js index fe51c68c09..0f75a9051e 100644 --- a/jsb/effect.js +++ b/jsb/effect.js @@ -9,6 +9,15 @@ class Effect { this._properties = properties; this._defines = defines; + var techniqueObjs = []; + var techniqueObj; + for (var i = 0, len = techniques.length; i < len; ++i) { + techniqueObj = techniques[i]._nativeObj; + techniqueObjs.push(techniqueObj); + } + + this._nativeObj = new renderer.EffectNative(techniqueObjs, properties, defines); + // TODO: check if params is valid for current technique??? } @@ -37,6 +46,7 @@ class Effect { setProperty(name, value) { // TODO: check if params is valid for current technique??? this._properties[name] = value; + this._nativeObj.setProperty(name, value); } getDefine(name) { @@ -60,6 +70,8 @@ class Effect { } } + this._nativeObj.setDefine(name, value); + console.warn(`Failed to set define ${name}, define not found.`); } diff --git a/jsb/pass.js b/jsb/pass.js index 5198f5e269..94a594d206 100644 --- a/jsb/pass.js +++ b/jsb/pass.js @@ -38,10 +38,14 @@ class Pass { this._stencilZFailOpBack = gfx.STENCIL_OP_KEEP; this._stencilZPassOpBack = gfx.STENCIL_OP_KEEP; this._stencilWriteMaskBack = 0xff; + + this._binary = new Uint32Array(25); + this._updateBinary(); } setCullMode(cullMode) { this._cullMode = cullMode; + this._binary[0] = cullMode; } setBlend( @@ -61,6 +65,8 @@ class Pass { this._blendSrcAlpha = blendSrcAlpha; this._blendDstAlpha = blendDstAlpha; this._blendColor = blendColor; + + this._updateBinary(); } setDepth( @@ -71,6 +77,8 @@ class Pass { this._depthTest = depthTest; this._depthWrite = depthWrite; this._depthFunc = depthFunc; + + this._updateBinary(); } setStencilFront( @@ -90,6 +98,8 @@ class Pass { this._stencilZFailOpFront = stencilZFailOp; this._stencilZPassOpFront = stencilZPassOp; this._stencilWriteMaskFront = stencilWriteMask; + + this._updateBinary(); } setStencilBack( @@ -109,6 +119,36 @@ class Pass { this._stencilZFailOpBack = stencilZFailOp; this._stencilZPassOpBack = stencilZPassOp; this._stencilWriteMaskBack = stencilWriteMask; + + this._updateBinary(); + } + + _updateBinary() { + this._binary[0] = this._cullMode; + this._binary[1] = this._blendEq; + this._binary[2] = this._blendSrc; + this._binary[3] = this._blendDst; + this._binary[4] = this._blendAlphaEq; + this._binary[5] = this._blendSrcAlpha; + this._binary[6] = this._blendDstAlpha; + this._binary[7] = this._blendColor; + this._binary[8] = this._depthTest; + this._binary[9] = this._depthWrite; + this._binary[10] = this._depthFunc; + this._binary[11] = this._stencilFuncFront; + this._binary[12] = this._stencilRefFront; + this._binary[13] = this._stencilMaskFront; + this._binary[14] = this._stencilFailOpFront; + this._binary[15] = this._stencilZFailOpFront; + this._binary[16] = this._stencilZPassOpFront; + this._binary[17] = this._stencilWriteMaskFront; + this._binary[18] = this._stencilFuncBack; + this._binary[19] = this._stencilRefBack; + this._binary[20] = this._stencilMaskBack; + this._binary[21] = this._stencilFailOpBack; + this._binary[22] = this._stencilZFailOpBack; + this._binary[23] = this._stencilZPassOpBack; + this._binary[24] = this._stencilWriteMaskBack; } } diff --git a/jsb/renderer.js b/jsb/renderer.js index 9cde55b6cf..c8b49e9b8f 100644 --- a/jsb/renderer.js +++ b/jsb/renderer.js @@ -94,62 +94,50 @@ cc.defineGetterSetter(_p, "_count", _p.getCount, _p.setCount); // Scene _p = renderer.Scene.prototype; // _p.addModel = function(model) { -// // var modelNative = new renderer.ModelNative(); -// // var effects = model._effects; -// // var effectNatives = []; -// // for (var i = 0, len = effects.length; i < len; ++i) { -// // var effect = effects[i]; -// // var techniques = effect._techniques; -// // var techniqueNatives = []; -// // for (var j = 0, len1 = techniques.length; j < len1; ++j) { -// // var technique = techniques[j]; -// // var passesNatives = []; -// // var passes = technique.passes; -// // for (var k =0, len2 = passes.length; k < len2; ++k) { -// // var pass = passes[k]; -// // var passNative = new renderer.PassNative(pass._programName); -// // passNative.setCullMode(pass._cullMode); -// // passNative.setBlend(pass._blendEq, -// // pass._blendSrc, -// // pass._blendDst, -// // pass._blendAlphaEq, -// // pass._blendSrcAlpha, -// // pass._blendDstAlpha, -// // pass._blendColor); -// // passNative.setDepth(pass._depthTest, pass._depthWrite, pass._depthFunc); -// // passNative.setStencilFront(pass._stencilFuncFront, -// // pass._stencilRefFront, -// // pass._stencilMaskFront, -// // pass._stencilFailOpFront, -// // pass._stencilZFailOpFront, -// // pass._stencilZPassOpFront, -// // pass._stencilWriteMaskFront); -// // passNative.setStencilBack(pass._stencilFuncBack, -// // pass._stencilRefBack, -// // pass._stencilMaskBack, -// // pass._stencilFailOpBack, -// // pass._stencilZFailOpBack, -// // pass._stencilZPassOpBack, -// // pass._stencilWriteMaskBack); -// // passesNatives.push(passNative); -// // } -// // var techniqueNative = new renderer.TechniqueNative(technique._stages, technique._parameters, passesNatives, technique._layer); -// // techniqueNatives.push(techniqueNative); -// // } -// // var effectNative = new renderer.EffectNative(techniqueNatives, effect._properties, effect._defines); -// // modelNative.addEffect(effectNative); -// // } +// var effects = model._effects; +// var elementsOfPass = 25; +// for (var i = 0, len = effects.length; i < len; ++i) { +// var effect = effects[i]; +// var techniques = effect._techniques; +// for (var j = 0, len1 = techniques.length; j < len1; ++j) { +// var technique = techniques[j]; +// var passesBinary = new Uint32Array(elementsOfPass * passes.length); +// var passes = technique.passes; +// Uin32Array passBinary[25]; +// for (var k =0, len2 = passes.length; k < len2; ++k) { +// var pass = passes[k]; +// var offset = elementsOfPass * k; +// // var passNative = new renderer.PassNative(pass._programName); +// // passNative.setCullMode(pass._cullMode); +// // passNative.setBlend(pass._blendEq, +// // pass._blendSrc, +// // pass._blendDst, +// // pass._blendAlphaEq, +// // pass._blendSrcAlpha, +// // pass._blendDstAlpha, +// // pass._blendColor); +// // passNative.setDepth(pass._depthTest, pass._depthWrite, pass._depthFunc); +// // passNative.setStencilFront(pass._stencilFuncFront, +// // pass._stencilRefFront, +// // pass._stencilMaskFront, +// // pass._stencilFailOpFront, +// // pass._stencilZFailOpFront, +// // pass._stencilZPassOpFront, +// // pass._stencilWriteMaskFront); +// // passNative.setStencilBack(pass._stencilFuncBack, +// // pass._stencilRefBack, +// // pass._stencilMaskBack, +// // pass._stencilFailOpBack, +// // pass._stencilZFailOpBack, +// // pass._stencilZPassOpBack, +// // pass._stencilWriteMaskBack); +// // passesNatives.push(passNative); +// } +// } -// // modelNative.setDynamicIA(model._dynamicIA); -// // modelNative.setViewId(model._viewID); -// // modelNative.setNode(model._node); +// } -// // var inputAssemblers = model._inputAssemblers; -// // for (var k = 0, len2 = inputAssemblers.length; k < len2; ++k) { -// // modelNative.addInputAssembler(inputAssemblers[k]); -// // } - -// // this.addModelNative(modelNative); + // this.addModelNative(model); // }; _p.removeModel = function() {} diff --git a/jsb/technique.js b/jsb/technique.js index 3bdbb42ba9..7a2672c0a8 100644 --- a/jsb/technique.js +++ b/jsb/technique.js @@ -19,11 +19,16 @@ class Technique { this._layer = layer; this._stages = stages; // TODO: this._version = 'webgl' or 'webgl2' // ???? + + this._nativeObj = new renderer.TechniqueNative(stages, parameters, passes, layer); + } setStages(stages) { this._stageIDs = config.stageIDs(stages); this._stages = stages; + + this._nativeObj.setStages(stages); } // get passes() { From 277707d89297e215744774ea6d4a678cd557d65d Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 12 Apr 2018 12:04:12 +0800 Subject: [PATCH 09/53] Fix setWorldDirty and Camera update --- cocos2d/core/CCNode.js | 7 ++----- cocos2d/core/camera/CCCamera.js | 6 ++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index f94064addb..b5e1921efa 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1976,11 +1976,8 @@ var Node = cc.Class({ if (!this._worldMatDirty) { this._worldMatDirty = true; // Sync world mat dirty to sub tree - if (!this._worldMatDirty) { - this._worldMatDirty = true; - if (this._children.length > 0) { - _syncWorldDirty(this._children); - } + if (this._children.length > 0) { + _syncWorldDirty(this._children); } } }, diff --git a/cocos2d/core/camera/CCCamera.js b/cocos2d/core/camera/CCCamera.js index 3f07157585..d9eb84ff3e 100644 --- a/cocos2d/core/camera/CCCamera.js +++ b/cocos2d/core/camera/CCCamera.js @@ -292,6 +292,7 @@ let Camera = cc.Class({ onEnable () { this._matrixDirty = true; + cc.director.on(cc.Director.EVENT_BEFORE_DRAW, this.beforeDraw, this); if (game.renderType === game.RENDER_TYPE_WEBGL) { renderer.scene.addCamera(this._camera); } @@ -299,6 +300,7 @@ let Camera = cc.Class({ }, onDisable () { + cc.director.off(cc.Director.EVENT_BEFORE_DRAW, this.beforeDraw, this); if (game.renderType === game.RENDER_TYPE_WEBGL) { renderer.scene.removeCamera(this._camera); } @@ -430,12 +432,12 @@ let Camera = cc.Class({ // force update node world matrix this.node.getWorldMatrix(_mat4_temp_1); - this.lateUpdate(); + this.beforeDraw(); renderer._walker.visit(root); renderer._forward.renderCamera(this._camera, renderer.scene); }, - lateUpdate: !CC_EDITOR && function () { + beforeDraw: !CC_EDITOR && function () { let node = this.node; if (!this._matrixDirty && !node._worldMatDirty) From 89e4e658ac1046e83a3d125842a997d42bc601be Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 12 Apr 2018 13:44:12 +0800 Subject: [PATCH 10/53] remove unneeded codes --- jsb/renderer.js | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/jsb/renderer.js b/jsb/renderer.js index c8b49e9b8f..a640f35187 100644 --- a/jsb/renderer.js +++ b/jsb/renderer.js @@ -93,53 +93,6 @@ cc.defineGetterSetter(_p, "_count", _p.getCount, _p.setCount); // Scene _p = renderer.Scene.prototype; -// _p.addModel = function(model) { -// var effects = model._effects; -// var elementsOfPass = 25; -// for (var i = 0, len = effects.length; i < len; ++i) { -// var effect = effects[i]; -// var techniques = effect._techniques; -// for (var j = 0, len1 = techniques.length; j < len1; ++j) { -// var technique = techniques[j]; -// var passesBinary = new Uint32Array(elementsOfPass * passes.length); -// var passes = technique.passes; -// Uin32Array passBinary[25]; -// for (var k =0, len2 = passes.length; k < len2; ++k) { -// var pass = passes[k]; -// var offset = elementsOfPass * k; -// // var passNative = new renderer.PassNative(pass._programName); -// // passNative.setCullMode(pass._cullMode); -// // passNative.setBlend(pass._blendEq, -// // pass._blendSrc, -// // pass._blendDst, -// // pass._blendAlphaEq, -// // pass._blendSrcAlpha, -// // pass._blendDstAlpha, -// // pass._blendColor); -// // passNative.setDepth(pass._depthTest, pass._depthWrite, pass._depthFunc); -// // passNative.setStencilFront(pass._stencilFuncFront, -// // pass._stencilRefFront, -// // pass._stencilMaskFront, -// // pass._stencilFailOpFront, -// // pass._stencilZFailOpFront, -// // pass._stencilZPassOpFront, -// // pass._stencilWriteMaskFront); -// // passNative.setStencilBack(pass._stencilFuncBack, -// // pass._stencilRefBack, -// // pass._stencilMaskBack, -// // pass._stencilFailOpBack, -// // pass._stencilZFailOpBack, -// // pass._stencilZPassOpBack, -// // pass._stencilWriteMaskBack); -// // passesNatives.push(passNative); -// } -// } - -// } - - -// this.addModelNative(model); -// }; _p.removeModel = function() {} From ad986709d9813bebd6e732a104984177e7cf3d3f Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 12 Apr 2018 13:44:28 +0800 Subject: [PATCH 11/53] make codes more effect --- jsb/pass.js | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/jsb/pass.js b/jsb/pass.js index 94a594d206..8c77aae1c6 100644 --- a/jsb/pass.js +++ b/jsb/pass.js @@ -66,7 +66,13 @@ class Pass { this._blendDstAlpha = blendDstAlpha; this._blendColor = blendColor; - this._updateBinary(); + this._binary[1] = this._blendEq; + this._binary[2] = this._blendSrc; + this._binary[3] = this._blendDst; + this._binary[4] = this._blendAlphaEq; + this._binary[5] = this._blendSrcAlpha; + this._binary[6] = this._blendDstAlpha; + this._binary[7] = this._blendColor; } setDepth( @@ -78,7 +84,9 @@ class Pass { this._depthWrite = depthWrite; this._depthFunc = depthFunc; - this._updateBinary(); + this._binary[8] = this._depthTest; + this._binary[9] = this._depthWrite; + this._binary[10] = this._depthFunc; } setStencilFront( @@ -99,7 +107,13 @@ class Pass { this._stencilZPassOpFront = stencilZPassOp; this._stencilWriteMaskFront = stencilWriteMask; - this._updateBinary(); + this._binary[11] = this._stencilFuncFront; + this._binary[12] = this._stencilRefFront; + this._binary[13] = this._stencilMaskFront; + this._binary[14] = this._stencilFailOpFront; + this._binary[15] = this._stencilZFailOpFront; + this._binary[16] = this._stencilZPassOpFront; + this._binary[17] = this._stencilWriteMaskFront; } setStencilBack( @@ -120,7 +134,13 @@ class Pass { this._stencilZPassOpBack = stencilZPassOp; this._stencilWriteMaskBack = stencilWriteMask; - this._updateBinary(); + this._binary[18] = this._stencilFuncBack; + this._binary[19] = this._stencilRefBack; + this._binary[20] = this._stencilMaskBack; + this._binary[21] = this._stencilFailOpBack; + this._binary[22] = this._stencilZFailOpBack; + this._binary[23] = this._stencilZPassOpBack; + this._binary[24] = this._stencilWriteMaskBack; } _updateBinary() { From 04e12f4e1da83c0fa54ffb95989838b2e14f35a7 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 12 Apr 2018 16:58:51 +0800 Subject: [PATCH 12/53] Fix unchainSelf usage --- cocos2d/core/CCNode.js | 4 ---- cocos2d/core/utils/base-node.js | 28 ++++++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 0bae93e421..97ee498c25 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1007,10 +1007,6 @@ var Node = cc.Class({ }, _onHierarchyChanged (oldParent) { - if (oldParent) { - // Unchain from old parent - hierarchyChain.unchainSelf(); - } this._updateOrderOfArrival(); if (this._parent) { this._parent._delaySort(); diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 675130d69f..97f6762cc0 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -24,20 +24,20 @@ THE SOFTWARE. ****************************************************************************/ -var PrefabHelper = require('./prefab-helper'); -var Flags = require('../platform/CCObject').Flags; -var misc = require('./misc'); -var js = require('../platform/js'); -var IdGenerater = require('../platform/id-generater'); -var eventManager = require('../event-manager'); +const PrefabHelper = require('./prefab-helper'); +const Flags = require('../platform/CCObject').Flags; +const misc = require('./misc'); +const js = require('../platform/js'); +const IdGenerater = require('../platform/id-generater'); +const eventManager = require('../event-manager'); +const hierarchyChain = require('../renderer/utils/hierarchy-chain'); -var Destroying = Flags.Destroying; -var DontDestroy = Flags.DontDestroy; -var Deactivating = Flags.Deactivating; - -var CHILD_ADDED = 'child-added'; -var CHILD_REMOVED = 'child-removed'; +const Destroying = Flags.Destroying; +const DontDestroy = Flags.DontDestroy; +const Deactivating = Flags.Deactivating; +const CHILD_ADDED = 'child-added'; +const CHILD_REMOVED = 'child-removed'; var idGenerater = new IdGenerater('Node'); @@ -353,6 +353,10 @@ var BaseNode = cc.Class({ if (CC_DEBUG && oldParent && (oldParent._objFlags & Deactivating)) { cc.errorID(3821); } + if (oldParent) { + // Unchain from old parent + hierarchyChain.unchainSelf(this); + } this._parent = value || null; this._onSetParent(value); From ecd8015ec25a4e32b9fbe63e146a934f1fbe2d69 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 12 Apr 2018 19:26:05 +0800 Subject: [PATCH 13/53] Fix _updateWorldMatrix issue --- cocos2d/core/CCNode.js | 14 +++++++++----- cocos2d/core/renderer/render-component-walker.js | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index b5e1921efa..3034a23b30 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1942,21 +1942,25 @@ var Node = cc.Class({ _updateWorldMatrix () { let node = this; + let n = -1; // Find root of world matrix changing while (node) { if (node._worldMatDirty) { - _parents.push(node); + n++; + _parents[n] = node; } else { break; } node = node._parent; } - // Update world matrix of all changed parents - for (let i = _parents.length - 1; i >= 0; i--) { - _parents[i]._calculWorldMatrix(); + if (n >= 0) { + _parents.length = n + 1; + // Update world matrix of all changed parents + for (let i = n; i >= 0; i--) { + _parents[i]._calculWorldMatrix(); + } } - _parents.length = 0; }, setLocalDirty () { diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index 8d42996a1e..cff1f6f453 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -125,6 +125,7 @@ RenderComponentWalker.prototype = { // reset caches for handle render components _batchData.node = null; + _batchData.worldMatUpdated = false; _batchData.vfmt = null; _batchData.material = null; _batchData.data = null; From 6e8637d6231d37bb46465697d8d1735561f6db61 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 12 Apr 2018 21:07:08 +0800 Subject: [PATCH 14/53] Improve transform for 2d and while loop --- cocos2d/core/CCNode.js | 108 +++++++++++------- .../core/renderer/render-component-walker.js | 16 +-- 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 3034a23b30..ed477687da 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1901,22 +1901,60 @@ var Node = cc.Class({ if (this._localMatDirty) { // Update transform let t = this._matrix; - math.mat4.fromRTS(t, this._quat, this._position, this._scale); + //math.mat4.fromRTS(t, this._quat, this._position, this._scale); + let hasRotation = this._rotationX || this._rotationY; + let hasSkew = this._skewX || this._skewY; + let sx = this._scale.x, sy = this._scale.y; - // skew - if (this._skewX || this._skewY) { - let a = t.m00, b = t.m01, c = t.m04, d = t.m05; - let skx = Math.tan(this._skewX * ONE_DEGREE); - let sky = Math.tan(this._skewY * ONE_DEGREE); - if (skx === Infinity) - skx = 99999999; - if (sky === Infinity) - sky = 99999999; - t.m00 = a + c * sky; - t.m01 = b + d * sky; - t.m04 = c + a * skx; - t.m05 = d + b * skx; + if (hasRotation || hasSkew) { + let a = 1, b = 0, c = 0, d = 1; + // position + t.m12 = this._position.x; + t.m13 = this._position.y; + // rotation + if (hasRotation) { + let rotationRadiansX = this._rotationX * ONE_DEGREE; + c = Math.sin(rotationRadiansX); + d = Math.cos(rotationRadiansX); + if (this._rotationY === this._rotationX) { + a = d; + b = -c; + } + else { + let rotationRadiansY = this._rotationY * ONE_DEGREE; + a = Math.cos(rotationRadiansY); + b = -Math.sin(rotationRadiansY); + } + } + // scale + t.m00 = a *= sx; + t.m01 = b *= sx; + t.m04 = c *= sy; + t.m05 = d *= sy; + // skew + if (hasSkew) { + let a = t.m00, b = t.m01, c = t.m04, d = t.m05; + let skx = Math.tan(this._skewX * ONE_DEGREE); + let sky = Math.tan(this._skewY * ONE_DEGREE); + if (skx === Infinity) + skx = 99999999; + if (sky === Infinity) + sky = 99999999; + t.m00 = a + c * sky; + t.m01 = b + d * sky; + t.m04 = c + a * skx; + t.m05 = d + b * skx; + } } + else { + t.m00 = sx; + t.m01 = 0; + t.m04 = 0; + t.m05 = sy; + t.m12 = this._position.x; + t.m13 = this._position.y; + } + this._localMatDirty = false; // Register dirty status of world matrix so that it can be recalculated this._worldMatDirty = true; @@ -1931,8 +1969,15 @@ var Node = cc.Class({ // Assume parent world matrix is correct if (this._parent) { - let parentMat = this._parent._worldMatrix; - math.mat4.mul(this._worldMatrix, parentMat, this._matrix); + let pt = this._parent._worldMatrix; + let wt = this._worldMatrix; + let t = this._matrix; + wt.m00 = t.m00 * pt.m00 + t.m01 * pt.m04; + wt.m01 = t.m00 * pt.m01 + t.m01 * pt.m05; + wt.m04 = t.m04 * pt.m00 + t.m05 * pt.m04; + wt.m05 = t.m04 * pt.m01 + t.m05 * pt.m05; + wt.m12 = t.m12 * pt.m00 + t.m13 * pt.m04 + pt.m12; + wt.m13 = t.m12 * pt.m01 + t.m13 * pt.m05 + pt.m13; } else { math.mat4.copy(this._worldMatrix, this._matrix); @@ -1941,38 +1986,23 @@ var Node = cc.Class({ }, _updateWorldMatrix () { - let node = this; let n = -1; // Find root of world matrix changing - while (node) { - if (node._worldMatDirty) { - n++; - _parents[n] = node; - } - else { - break; - } - node = node._parent; + for (let node = this; node && node._worldMatDirty; node = node._parent) { + n++; + _parents[n] = node; } - if (n >= 0) { - _parents.length = n + 1; - // Update world matrix of all changed parents - for (let i = n; i >= 0; i--) { - _parents[i]._calculWorldMatrix(); - } + // Update world matrix of all changed parents + for (let i = n; i >= 0; i--) { + _parents[i]._calculWorldMatrix(); + _parents[i] = null; } }, setLocalDirty () { if (!this._localMatDirty) { this._localMatDirty = true; - // Sync world mat dirty to sub tree - if (!this._worldMatDirty) { - this._worldMatDirty = true; - if (this._children.length > 0) { - _syncWorldDirty(this._children); - } - } + this.setWorldDirty(); } }, diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index cff1f6f453..e8a67c4700 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -280,11 +280,18 @@ RenderComponentWalker.prototype = { } }, + _transform (node) { + if (node._worldMatDirty) { + node._updateWorldMatrix(); + _batchData.worldMatUpdated = true; + } + }, + visit (scene) { this.reset(); let entry = hierarchyChain.entry(scene); - while (entry) { + for (; entry; entry = entry.next) { let comp = entry.comp; let node = comp.node; let assembler = null; @@ -306,14 +313,9 @@ RenderComponentWalker.prototype = { } assembler = comp.constructor._postAssembler; } - if (node._worldMatDirty) { - node._updateWorldMatrix(); - _batchData.worldMatUpdated = true; - } + this._transform(node); this.renderComp(comp, assembler); _batchData.worldMatUpdated = false; - - entry = entry.next; } this._flush(_batchData); From b31712a2e642d12a5aa580d8fd5f5a8e1a209c06 Mon Sep 17 00:00:00 2001 From: minggo Date: Fri, 13 Apr 2018 14:25:30 +0800 Subject: [PATCH 15/53] use native object to improve performance --- jsb/vertex-format-jsb.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jsb/vertex-format-jsb.js b/jsb/vertex-format-jsb.js index d61910f4e5..62448b01ea 100644 --- a/jsb/vertex-format-jsb.js +++ b/jsb/vertex-format-jsb.js @@ -72,6 +72,8 @@ class VertexFormat { let el = this._elements[i]; el.stride = this._bytes; } + + this._nativeObj = new gfx.VertexFormatNative(this._elements); } /** From 8389f0a8330b96921d09605ae790aa957771c155 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 13 Apr 2018 15:59:26 +0800 Subject: [PATCH 16/53] No world vertex cache for simple sprite --- .../renderer/assemblers/mask-assembler.js | 2 +- .../core/renderer/assemblers/sprite/index.js | 6 +-- .../core/renderer/assemblers/sprite/simple.js | 45 ++++++------------- .../core/renderer/assemblers/sprite/sliced.js | 16 ++++++- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/cocos2d/core/renderer/assemblers/mask-assembler.js b/cocos2d/core/renderer/assemblers/mask-assembler.js index e2584a0544..e12a6ac9e2 100644 --- a/cocos2d/core/renderer/assemblers/mask-assembler.js +++ b/cocos2d/core/renderer/assemblers/mask-assembler.js @@ -94,7 +94,7 @@ let maskFrontAssembler = js.addon({ if (mask.spriteFrame) { datas = mask._renderDatas; datas.length = 0; - renderData.dataLength = 8; + renderData.dataLength = 4; spriteAssembler.update(mask); renderData.material = mask.getMaterial(); datas.push(renderData); diff --git a/cocos2d/core/renderer/assemblers/sprite/index.js b/cocos2d/core/renderer/assemblers/sprite/index.js index 61c16cc784..7bae69ef1a 100644 --- a/cocos2d/core/renderer/assemblers/sprite/index.js +++ b/cocos2d/core/renderer/assemblers/sprite/index.js @@ -69,12 +69,10 @@ let spriteAssembler = js.addon({ updateRenderData (sprite, batchData) { let datas = sprite.__allocedDatas; - if (!sprite.spriteFrame || !sprite.getMaterial() || !sprite._renderData) { - return datas; + if (sprite.spriteFrame && sprite._material && sprite._renderData) { + sprite._assembler.update(sprite, batchData); } - sprite._assembler.update(sprite, batchData); - return datas; }, diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index 01d02e907e..aac18873b8 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -40,9 +40,6 @@ module.exports = js.addon({ if (vertDirty) { this.updateVerts(sprite); } - if (vertDirty || batchData.worldMatUpdated) { - this.updateWorldVerts(sprite); - } }, fillBuffers (sprite, batchData, vertexId, vbuf, uintbuf, ibuf) { @@ -53,11 +50,14 @@ module.exports = js.addon({ let node = sprite.node; let z = node._position.z; let color = node._color._val; + let matrix = node._worldMatrix; + let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, + tx = matrix.m12, ty = matrix.m13; for (let i = 0; i < 4; i++) { let vert = data[i]; - vbuf[vertexOffset ++] = vert.x; - vbuf[vertexOffset ++] = vert.y; + vbuf[vertexOffset ++] = vert.x * a + vert.y * c + tx; + vbuf[vertexOffset ++] = vert.x * b + vert.y * d + ty; vbuf[vertexOffset ++] = z; uintbuf[vertexOffset ++] = color; vbuf[vertexOffset ++] = vert.u; @@ -76,7 +76,7 @@ module.exports = js.addon({ let renderData = sprite.requestRenderData(); // 0-4 for world verts // 5-8 for local verts - renderData.dataLength = 8; + renderData.dataLength = 4; renderData.vertexCount = 4; renderData.indiceCount = 6; return renderData; @@ -124,23 +124,6 @@ module.exports = js.addon({ renderData.uvDirty = false; }, - updateWorldVerts (sprite) { - let node = sprite.node, - renderData = sprite._renderData, - data = renderData._data; - - let matrix = node._worldMatrix; - let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, - tx = matrix.m12, ty = matrix.m13; - - for (let i = 0; i < 4; i++) { - let local = data[i+4]; - let world = data[i]; - world.x = local.x * a + local.y * c + tx; - world.y = local.x * b + local.y * d + ty; - } - }, - updateVerts (sprite) { let renderData = sprite._renderData, node = sprite.node, @@ -170,14 +153,14 @@ module.exports = js.addon({ t = ch + trimTop * scaleY - appy; } - data[4].x = l; - data[4].y = b; - data[5].x = r; - data[5].y = b; - data[6].x = l; - data[6].y = t; - data[7].x = r; - data[7].y = t; + data[0].x = l; + data[0].y = b; + data[1].x = r; + data[1].y = b; + data[2].x = l; + data[2].y = t; + data[3].x = r; + data[3].y = t; renderData.vertDirty = false; } diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index 83b2a83a53..ed68b1c5a9 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -173,5 +173,19 @@ module.exports = { } }, - update: simpleRenderUtil.update + update (sprite, batchData) { + let renderData = sprite._renderData; + + if (renderData.uvDirty) { + this.updateUVs(sprite); + } + + let vertDirty = renderData.vertDirty; + if (vertDirty) { + this.updateVerts(sprite); + } + if (vertDirty || batchData.worldMatUpdated) { + this.updateWorldVerts(sprite); + } + }, }; From 6dfaecd86aa8d391a8faec9026892c92b1720f86 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 13 Apr 2018 15:59:37 +0800 Subject: [PATCH 17/53] Small improvements --- cocos2d/core/CCDirector.js | 12 ++++++------ cocos2d/core/CCNode.js | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js index 7c489a7a2b..ab2deef17f 100644 --- a/cocos2d/core/CCDirector.js +++ b/cocos2d/core/CCDirector.js @@ -121,7 +121,7 @@ cc.Director = function () { // FPS this._totalFrames = 0; - this._lastUpdate = Date.now(); + this._lastUpdate = performance.now(); this._deltaTime = 0.0; // Scheduler for user registration update @@ -135,7 +135,7 @@ cc.Director = function () { var self = this; cc.game.on(cc.game.EVENT_SHOW, function () { - self._lastUpdate = Date.now(); + self._lastUpdate = performance.now(); }); }; @@ -143,7 +143,7 @@ cc.Director.prototype = { constructor: cc.Director, init: function () { this._totalFrames = 0; - this._lastUpdate = Date.now(); + this._lastUpdate = performance.now(); this._paused = false; this._purgeDirectorInNextLoop = false; this._winSizeInPoints = cc.size(0, 0); @@ -212,7 +212,7 @@ cc.Director.prototype = { * calculates delta time since last time it was called */ calculateDeltaTime: function () { - var now = Date.now(); + var now = performance.now(); this._deltaTime = (now - this._lastUpdate) / 1000; if ((cc.game.config[cc.game.CONFIG_KEY.debugMode] > 0) && (this._deltaTime > 1)) @@ -674,7 +674,7 @@ cc.Director.prototype = { return; } - this._lastUpdate = Date.now(); + this._lastUpdate = performance.now(); if (!this._lastUpdate) { cc.logID(1200); } @@ -900,7 +900,7 @@ cc.Director.prototype = { */ startAnimation: function () { this.invalid = false; - this._lastUpdate = Date.now(); + this._lastUpdate = performance.now(); }, /* diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 9261460019..76afc5fc72 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1904,9 +1904,6 @@ var Node = cc.Class({ if (hasRotation || hasSkew) { let a = 1, b = 0, c = 0, d = 1; - // position - t.m12 = this._position.x; - t.m13 = this._position.y; // rotation if (hasRotation) { let rotationRadiansX = this._rotationX * ONE_DEGREE; @@ -1947,9 +1944,10 @@ var Node = cc.Class({ t.m01 = 0; t.m04 = 0; t.m05 = sy; - t.m12 = this._position.x; - t.m13 = this._position.y; } + // position + t.m12 = this._position.x; + t.m13 = this._position.y; this._localMatDirty = false; // Register dirty status of world matrix so that it can be recalculated From 38ab4811fb2de4dae23f8203695365877959dc0b Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Fri, 13 Apr 2018 17:48:30 +0800 Subject: [PATCH 18/53] optimize bufferData --- .../core/renderer/render-component-walker.js | 182 ++++++++++-------- 1 file changed, 104 insertions(+), 78 deletions(-) diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index e8a67c4700..9b3e036c94 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -48,7 +48,9 @@ var _batchData = { material: null, data: null, vertexOffset: 0, + byteStart: 0, byteOffset: 0, + indiceStart: 0, indiceOffset: 0, cullingMask: 1, MAX_VERTEX: MAX_VERTEX, @@ -60,32 +62,8 @@ var RenderComponentWalker = function (device, renderScene) { this._device = device; this._stencilMgr = StencilManager.sharedManager; - // Buffers - this._vData = new Float32Array(MAX_VERTEX * FLOATS_PER_VERT); - this._uintVData = new Uint32Array(this._vData.buffer); - this._iData = new Uint16Array(MAX_INDICE); let defaultFormat = new gfx.VertexFormat([]); - this._vbPool = new RecyclePool(function () { - let vb = new gfx.VertexBuffer( - device, - defaultFormat, - gfx.USAGE_DYNAMIC, - null, - 0 - ); - return vb; - }, 16); - this._ibPool = new RecyclePool(function () { - var ib = new gfx.IndexBuffer( - device, - gfx.INDEX_FMT_UINT16, - gfx.USAGE_STATIC, - null, - 0 - ); - return ib; - }, 16); this._iaPool = new RecyclePool(function () { return new InputAssembler(); }, 16); @@ -93,7 +71,17 @@ var RenderComponentWalker = function (device, renderScene) { this._modelPool = new RecyclePool(() => { return new renderEngine.Model(); }, 16); - + + + // buffers + this._vb = null; + this._ib = null; + this._buffersToDestroy = []; + + this._maxVertexCount = MAX_VERTEX; + this._maxIndiceCount = MAX_INDICE; + this._reallocBuffer(this._maxVertexCount, this._maxIndiceCount); + this._batchedModels = []; this._dummyNode = new cc.Node(); this._sortKey = 0; @@ -107,8 +95,6 @@ RenderComponentWalker.prototype = { reset() { // Reset pools this._iaPool.reset(); - this._vbPool.reset(); - this._ibPool.reset(); // Reset scene let scene = this._renderScene; @@ -130,7 +116,9 @@ RenderComponentWalker.prototype = { _batchData.material = null; _batchData.data = null; _batchData.vertexOffset = 0; + _batchData.byteStart = 0; _batchData.byteOffset = 0; + _batchData.indiceStart = 0; _batchData.indiceOffset = 0; _batchData.cullingMask = 1; @@ -138,49 +126,70 @@ RenderComponentWalker.prototype = { this._stencilMgr.reset(); }, - _flush (batchData) { - let vfmt = batchData.vfmt, - material = batchData.material, - vertexByte = batchData.byteOffset, - cullingMask = batchData.cullingMask, - vertexCount = batchData.vertexOffset, - indiceCount = batchData.indiceOffset, - vDataSize = Math.min(bits.nextPow2(vertexByte), MAX_VERTEX_BYTES), - vertexsData = null, - indicesData = null; + _uploadData () { + // update vertext data + let vertexsData = new Float32Array(this._vData.buffer, 0, _batchData.byteOffset / 4); + let indicesData = new Uint16Array(this._iData.buffer, 0, _batchData.indiceOffset); - // Prepare data view for vb ib - if (material && vertexCount > 0 && indiceCount > 0) { - vertexsData = new Float32Array(this._vData.buffer, 0, vDataSize / 4); - indicesData = new Uint16Array(this._iData.buffer, 0, indiceCount); + let gl = this._device._gl; + let vb = this._vb; + vb.update(0, vertexsData); + + let ib = this._ib; + ib.update(0, indicesData); + }, + + _reallocBuffer (vertexCount, indiceCount) { + _batchData.vertexOffset = 0; + _batchData.byteStart = 0; + _batchData.byteOffset = 0; + _batchData.indiceStart = 0; + _batchData.indiceOffset = 0; + + if (this._vb) { + this._buffersToDestroy.push(this._vb); } - else { + if (this._ib) { + this._buffersToDestroy.push(this._ib); + } + + this._vData = new Float32Array(vertexCount * FLOATS_PER_VERT); + this._uintVData = new Uint32Array(this._vData.buffer); + this._iData = new Uint16Array(indiceCount); + + this._vb = new gfx.VertexBuffer( + this._device, + defaultVertexFormat, + gfx.USAGE_DYNAMIC, + this._vData.buffer, + vertexCount + ); + + this._ib = new gfx.IndexBuffer( + this._device, + gfx.INDEX_FMT_UINT16, + gfx.USAGE_STATIC, + this._iData.buffer, + indiceCount + ); + }, + + _flush () { + let material = _batchData.material, + indiceStart = _batchData.indiceStart, + indiceOffset = _batchData.indiceOffset, + indiceCount = indiceOffset - indiceStart; + if (!material || indiceCount <= 0) { return; } let effect = material.effect; - // Generate vb, ib, ia - let device = this._device; - let vb = this._vbPool.add(); - device._stats.vb -= vb._bytes; - vb._format = vfmt; - vb._numVertices = vertexCount; - vb._bytes = vDataSize; - vb.update(0, vertexsData); - device._stats.vb += vb._bytes; - - let ib = this._ibPool.add(); - device._stats.ib -= ib._bytes; - ib._numIndices = indiceCount; - ib._bytes = BYTE_PER_INDEX * indiceCount; - ib.update(0, indicesData); - device._stats.ib += ib._bytes; - + // Generate ia let ia = this._iaPool.add(); - ia._vertexBuffer = vb; - ia._indexBuffer = ib; - ia._start = 0; + ia._vertexBuffer = this._vb; + ia._indexBuffer = this._ib; + ia._start = indiceStart; ia._count = indiceCount; // Check stencil state and modify pass @@ -190,18 +199,21 @@ RenderComponentWalker.prototype = { let model = this._modelPool.add(); this._batchedModels.push(model); model.sortKey = this._sortKey++; - model._cullingMask = CC_EDITOR ? 1 : cullingMask; - model.setNode(batchData.node); + model._cullingMask = CC_EDITOR ? 1 : _batchData.cullingMask; + model.setNode(_batchData.node); model.addEffect(effect); model.addInputAssembler(ia); this._renderScene.addModel(model); + + _batchData.byteStart = _batchData.byteOffset; + _batchData.indiceStart = _batchData.indiceOffset; }, - _flushIA (batchData) { - let material = batchData.material, - cullingMask = batchData.cullingMask, - iaRenderData = batchData.data; + _flushIA () { + let material = _batchData.material, + cullingMask = _batchData.cullingMask, + iaRenderData = _batchData.data; if (!iaRenderData.ia) { return; @@ -215,7 +227,7 @@ RenderComponentWalker.prototype = { this._batchedModels.push(model); model.sortKey = this._sortKey++; model._cullingMask = CC_EDITOR ? 1 : cullingMask; - model.setNode(batchData.node); + model.setNode(_batchData.node); model.addEffect(effect); model.addInputAssembler(iaRenderData.ia); @@ -247,35 +259,41 @@ RenderComponentWalker.prototype = { continue; } + // need to realloc buffers + if ((_batchData.vertexOffset + data.vertexCount) > this._maxVertexCount || + (_batchData.indiceOffset + data.indiceCount) > this._maxIndiceCount) { + this._uploadData(); + + this._maxVertexCount *= 2; + this._maxIndiceCount *= 2; + this._reallocBuffer(this._maxVertexCount, this._maxIndiceCount); + } + // Check ia data, each ia data should be packed into a separated model iaData = data.type === IARenderData.type; // breaking batch broken = iaData || !_batchData.material || _batchData.material._hash != material._hash || - _batchData.cullingMask !== cullingMask || - (_batchData.vertexOffset + data.vertexCount > MAX_VERTEX) || - (_batchData.indiceOffset + data.indiceCount > MAX_INDICE); + _batchData.cullingMask !== cullingMask; if (broken) { this._flush(_batchData); + _batchData.node = assembler.useModel ? comp.node : this._dummyNode; _batchData.material = material; _batchData.vfmt = comp._vertexFormat; - _batchData.vertexOffset = 0; - _batchData.byteOffset = 0; - _batchData.indiceOffset = 0; _batchData.cullingMask = cullingMask; } _batchData.data = data; if (iaData) { - this._flushIA(_batchData); + this._flushIA(); } else { assembler.fillBuffers(comp, _batchData, _batchData.vertexOffset, this._vData, this._uintVData, this._iData); - _batchData.vertexOffset += data.vertexCount; _batchData.byteOffset += data.vertexCount * comp._vertexFormat._bytes; _batchData.indiceOffset += data.indiceCount; + _batchData.vertexOffset += data.vertexCount; } } }, @@ -290,6 +308,13 @@ RenderComponentWalker.prototype = { visit (scene) { this.reset(); + if (this._buffersToDestroy.length !== 0) { + for (let i = 0, l = this._buffersToDestroy.length; i < l; i++) { + this._buffersToDestroy[i].destroy(); + } + this._buffersToDestroy.length = 0; + } + let entry = hierarchyChain.entry(scene); for (; entry; entry = entry.next) { let comp = entry.comp; @@ -318,7 +343,8 @@ RenderComponentWalker.prototype = { _batchData.worldMatUpdated = false; } - this._flush(_batchData); + this._flush(); + this._uploadData(); } } From db29ec79c1236298194eeba2774132f9618f0070 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 13 Apr 2018 22:53:23 +0800 Subject: [PATCH 19/53] Fix render component chain not updated for one child --- cocos2d/core/CCNode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 76afc5fc72..147c2f80fe 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -2453,9 +2453,9 @@ var Node = cc.Class({ } _children[j + 1] = child; } - hierarchyChain.rebuild(this); this.emit(CHILD_REORDER); } + hierarchyChain.rebuild(this); cc.director.__fastOff(cc.Director.EVENT_AFTER_UPDATE, this.sortAllChildren, this); } }, From 607d7b222839e9215c8354c7b8de4589b878f2f0 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 13 Apr 2018 22:53:33 +0800 Subject: [PATCH 20/53] Improve render component disable performance --- cocos2d/core/components/CCRenderComponent.js | 4 ---- cocos2d/core/renderer/render-component-walker.js | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/components/CCRenderComponent.js b/cocos2d/core/components/CCRenderComponent.js index 0fef52fafe..48028bab40 100644 --- a/cocos2d/core/components/CCRenderComponent.js +++ b/cocos2d/core/components/CCRenderComponent.js @@ -70,10 +70,6 @@ var RenderComponent = cc.Class({ onDisable () { this.node._renderComponent = null; - // When parent children order dirty, its children's render component will be rechained in sortAllChildren - if (!this.node.parent._reorderChildDirty) { - hierarchyChain.rebuildSelf(this.node); - } }, onDestroy () { diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index e8a67c4700..e91a96a3b7 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -294,6 +294,9 @@ RenderComponentWalker.prototype = { for (; entry; entry = entry.next) { let comp = entry.comp; let node = comp.node; + if (!comp._enabled || !node._activeInHierarchy) { + continue; + } let assembler = null; // Pre handle From aceac05710f1c99a9ccc5044924499b10dd6d016 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 14 Apr 2018 23:37:01 +0800 Subject: [PATCH 21/53] Minor code arrangement --- .../core/renderer/assemblers/sprite/index.js | 2 +- .../core/renderer/render-component-walker.js | 186 ++++++++++-------- 2 files changed, 106 insertions(+), 82 deletions(-) diff --git a/cocos2d/core/renderer/assemblers/sprite/index.js b/cocos2d/core/renderer/assemblers/sprite/index.js index 7bae69ef1a..1ded075403 100644 --- a/cocos2d/core/renderer/assemblers/sprite/index.js +++ b/cocos2d/core/renderer/assemblers/sprite/index.js @@ -69,7 +69,7 @@ let spriteAssembler = js.addon({ updateRenderData (sprite, batchData) { let datas = sprite.__allocedDatas; - if (sprite.spriteFrame && sprite._material && sprite._renderData) { + if (sprite._spriteFrame && sprite._material && sprite._renderData) { sprite._assembler.update(sprite, batchData); } diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index c7f10f324b..3f076d4bae 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -41,27 +41,27 @@ const MAX_VERTEX_BYTES = MAX_VERTEX * defaultVertexFormat._bytes; const MAX_INDICE = MAX_VERTEX * BYTE_PER_INDEX; const MAX_INDICE_BYTES = MAX_INDICE * 2; -var _batchData = { - node: null, - worldMatUpdated: false, - vfmt: null, - material: null, - data: null, - vertexOffset: 0, - byteStart: 0, - byteOffset: 0, - indiceStart: 0, - indiceOffset: 0, - cullingMask: 1, - MAX_VERTEX: MAX_VERTEX, - MAX_INDICE: MAX_INDICE -}; - var RenderComponentWalker = function (device, renderScene) { this._renderScene = renderScene; this._device = device; this._stencilMgr = StencilManager.sharedManager; + this._batchData = { + node: null, + worldMatUpdated: false, + vfmt: null, + material: null, + data: null, + vertexOffset: 0, + byteStart: 0, + byteOffset: 0, + indiceStart: 0, + indiceOffset: 0, + cullingMask: 1, + MAX_VERTEX: MAX_VERTEX, + MAX_INDICE: MAX_INDICE + }; + let defaultFormat = new gfx.VertexFormat([]); this._iaPool = new RecyclePool(function () { @@ -109,18 +109,27 @@ RenderComponentWalker.prototype = { models.length = 0; this._sortKey = 0; + // Reset useless buffers + if (this._buffersToDestroy.length !== 0) { + for (let i = 0, l = this._buffersToDestroy.length; i < l; i++) { + this._buffersToDestroy[i].destroy(); + } + this._buffersToDestroy.length = 0; + } + // reset caches for handle render components - _batchData.node = null; - _batchData.worldMatUpdated = false; - _batchData.vfmt = null; - _batchData.material = null; - _batchData.data = null; - _batchData.vertexOffset = 0; - _batchData.byteStart = 0; - _batchData.byteOffset = 0; - _batchData.indiceStart = 0; - _batchData.indiceOffset = 0; - _batchData.cullingMask = 1; + let batchData = this._batchData; + batchData.node = null; + batchData.worldMatUpdated = false; + batchData.vfmt = null; + batchData.material = null; + batchData.data = null; + batchData.vertexOffset = 0; + batchData.byteStart = 0; + batchData.byteOffset = 0; + batchData.indiceStart = 0; + batchData.indiceOffset = 0; + batchData.cullingMask = 1; // reset stencil manager's cache this._stencilMgr.reset(); @@ -128,8 +137,8 @@ RenderComponentWalker.prototype = { _uploadData () { // update vertext data - let vertexsData = new Float32Array(this._vData.buffer, 0, _batchData.byteOffset / 4); - let indicesData = new Uint16Array(this._iData.buffer, 0, _batchData.indiceOffset); + let vertexsData = new Float32Array(this._vData.buffer, 0, this._batchData.byteOffset / 4); + let indicesData = new Uint16Array(this._iData.buffer, 0, this._batchData.indiceOffset); let gl = this._device._gl; let vb = this._vb; @@ -140,11 +149,12 @@ RenderComponentWalker.prototype = { }, _reallocBuffer (vertexCount, indiceCount) { - _batchData.vertexOffset = 0; - _batchData.byteStart = 0; - _batchData.byteOffset = 0; - _batchData.indiceStart = 0; - _batchData.indiceOffset = 0; + let batchData = this._batchData; + batchData.vertexOffset = 0; + batchData.byteStart = 0; + batchData.byteOffset = 0; + batchData.indiceStart = 0; + batchData.indiceOffset = 0; if (this._vb) { this._buffersToDestroy.push(this._vb); @@ -175,9 +185,10 @@ RenderComponentWalker.prototype = { }, _flush () { - let material = _batchData.material, - indiceStart = _batchData.indiceStart, - indiceOffset = _batchData.indiceOffset, + let batchData = this._batchData, + material = batchData.material, + indiceStart = batchData.indiceStart, + indiceOffset = batchData.indiceOffset, indiceCount = indiceOffset - indiceStart; if (!material || indiceCount <= 0) { return; @@ -199,21 +210,22 @@ RenderComponentWalker.prototype = { let model = this._modelPool.add(); this._batchedModels.push(model); model.sortKey = this._sortKey++; - model._cullingMask = CC_EDITOR ? 1 : _batchData.cullingMask; - model.setNode(_batchData.node); + model._cullingMask = CC_EDITOR ? 1 : batchData.cullingMask; + model.setNode(batchData.node); model.addEffect(effect); model.addInputAssembler(ia); this._renderScene.addModel(model); - _batchData.byteStart = _batchData.byteOffset; - _batchData.indiceStart = _batchData.indiceOffset; + batchData.byteStart = batchData.byteOffset; + batchData.indiceStart = batchData.indiceOffset; }, _flushIA () { - let material = _batchData.material, - cullingMask = _batchData.cullingMask, - iaRenderData = _batchData.data; + let batchData = this._batchData, + material = batchData.material, + cullingMask = batchData.cullingMask, + iaRenderData = batchData.data; if (!iaRenderData.ia) { return; @@ -227,19 +239,20 @@ RenderComponentWalker.prototype = { this._batchedModels.push(model); model.sortKey = this._sortKey++; model._cullingMask = CC_EDITOR ? 1 : cullingMask; - model.setNode(_batchData.node); + model.setNode(batchData.node); model.addEffect(effect); model.addInputAssembler(iaRenderData.ia); this._renderScene.addModel(model); }, - renderComp (comp, assembler) { + _commitComp (comp, assembler) { if (!assembler) { return; } - let material = null, + let batchData = this._batchData, + material = null, datas = null, data = null, cullingMask = 1, @@ -247,7 +260,7 @@ RenderComponentWalker.prototype = { iaData = false; // Update render data - datas = assembler.updateRenderData(comp, _batchData); + datas = assembler.updateRenderData(comp, batchData); cullingMask = comp.node._cullingMask; @@ -260,8 +273,8 @@ RenderComponentWalker.prototype = { } // need to realloc buffers - if ((_batchData.vertexOffset + data.vertexCount) > this._maxVertexCount || - (_batchData.indiceOffset + data.indiceCount) > this._maxIndiceCount) { + if ((batchData.vertexOffset + data.vertexCount) > this._maxVertexCount || + (batchData.indiceOffset + data.indiceCount) > this._maxIndiceCount) { this._uploadData(); this._maxVertexCount *= 2; @@ -274,55 +287,59 @@ RenderComponentWalker.prototype = { // breaking batch broken = iaData || - !_batchData.material || _batchData.material._hash != material._hash || - _batchData.cullingMask !== cullingMask; + !batchData.material || batchData.material._hash != material._hash || + batchData.cullingMask !== cullingMask; if (broken) { - this._flush(_batchData); + this._flush(batchData); - _batchData.node = assembler.useModel ? comp.node : this._dummyNode; - _batchData.material = material; - _batchData.vfmt = comp._vertexFormat; - _batchData.cullingMask = cullingMask; + batchData.node = assembler.useModel ? comp.node : this._dummyNode; + batchData.material = material; + batchData.vfmt = comp._vertexFormat; + batchData.cullingMask = cullingMask; } - _batchData.data = data; + batchData.data = data; if (iaData) { this._flushIA(); } else { - assembler.fillBuffers(comp, _batchData, _batchData.vertexOffset, this._vData, this._uintVData, this._iData); - _batchData.byteOffset += data.vertexCount * comp._vertexFormat._bytes; - _batchData.indiceOffset += data.indiceCount; - _batchData.vertexOffset += data.vertexCount; + assembler.fillBuffers(comp, batchData, batchData.vertexOffset, this._vData, this._uintVData, this._iData); + batchData.byteOffset += data.vertexCount * comp._vertexFormat._bytes; + batchData.indiceOffset += data.indiceCount; + batchData.vertexOffset += data.vertexCount; } } }, - _transform (node) { - if (node._worldMatDirty) { - node._updateWorldMatrix(); - _batchData.worldMatUpdated = true; + _findEntry (node) { + if (node._renderComponent) { + return node._renderComponent._chain; } + + let children = node._children; + let first; + for (let i = 0; i < children.length; i++) { + let child = children[i]; + first = this._findEntry(child); + if (first) { + return first; + } + } + return null; }, visit (scene) { this.reset(); - if (this._buffersToDestroy.length !== 0) { - for (let i = 0, l = this._buffersToDestroy.length; i < l; i++) { - this._buffersToDestroy[i].destroy(); - } - this._buffersToDestroy.length = 0; - } - - let entry = hierarchyChain.entry(scene); + let entry = this._findEntry(scene); + let comp, node, assembler, group; for (; entry; entry = entry.next) { - let comp = entry.comp; - let node = comp.node; + comp = entry.comp; + node = comp.node; if (!comp._enabled || !node._activeInHierarchy) { continue; } - let assembler = null; + assembler = null; // Pre handle if (!entry.post) { @@ -330,7 +347,7 @@ RenderComponentWalker.prototype = { this._curCameraNode = node; } - let group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; + group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; node._cullingMask = 1 << group; assembler = comp.constructor._assembler; } @@ -341,9 +358,16 @@ RenderComponentWalker.prototype = { } assembler = comp.constructor._postAssembler; } - this._transform(node); - this.renderComp(comp, assembler); - _batchData.worldMatUpdated = false; + + // Transform + if (node._worldMatDirty) { + node._updateWorldMatrix(); + this._batchData.worldMatUpdated = true; + } + + // Commit component render data + this._commitComp(comp, assembler); + this._batchData.worldMatUpdated = false; } this._flush(); From 4ea054b46c3f6fca256c947641058bdc6f22a42c Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Sun, 15 Apr 2018 18:08:55 +0800 Subject: [PATCH 22/53] support dynamic atlas packer --- cocos2d/core/components/CCLabel.js | 2 - cocos2d/core/components/CCMotionStreak.js | 2 - cocos2d/core/components/CCSprite.js | 49 +++++++------ cocos2d/core/graphics/graphics.js | 1 - .../core/renderer/assemblers/sprite/index.js | 6 ++ .../core/renderer/render-component-walker.js | 10 +++ .../core/renderer/utils/atlas/atlas-packer.js | 35 ++++++++++ cocos2d/core/renderer/utils/atlas/atlas.js | 69 +++++++++++++++++++ cocos2d/tilemap/CCTiledLayer.js | 3 +- 9 files changed, 146 insertions(+), 31 deletions(-) create mode 100644 cocos2d/core/renderer/utils/atlas/atlas-packer.js create mode 100644 cocos2d/core/renderer/utils/atlas/atlas.js diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 9ce192ad96..8199e2a152 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -383,7 +383,6 @@ var Label = cc.Class({ this._fontAtlas = null; this._material = null; this._updateAssembler(); - this._activateMaterial(); this._updateRenderData(); }, type: cc.Font, @@ -470,7 +469,6 @@ var Label = cc.Class({ this._super(); this._updateAssembler(); - this._activateMaterial(); }, onDestroy () { diff --git a/cocos2d/core/components/CCMotionStreak.js b/cocos2d/core/components/CCMotionStreak.js index 24623e2b80..282c4d0960 100644 --- a/cocos2d/core/components/CCMotionStreak.js +++ b/cocos2d/core/components/CCMotionStreak.js @@ -159,7 +159,6 @@ var MotionStreak = cc.Class({ set: function (value) { this._texture = value; this._material = null; - this._activateMaterial(); }, type: cc.Texture2D, animatable: false, @@ -210,7 +209,6 @@ var MotionStreak = cc.Class({ onEnable: function () { this._super(); - this._activateMaterial(); this.reset(); }, diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index f72905492a..3158b33506 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -466,7 +466,6 @@ var Sprite = cc.Class({ setState: function (state) { this._state = state; this._material = null; - this._activateMaterial(); }, /** @@ -483,8 +482,6 @@ var Sprite = cc.Class({ this._updateAssembler(); - this._activateMaterial(); - this.node.on('size-changed', this._onNodeSizeDirty, this); this.node.on('anchor-changed', this._onNodeSizeDirty, this); }, @@ -517,40 +514,45 @@ var Sprite = cc.Class({ }, _activateMaterial: function () { + if (this._material) return; + + let spriteFrame = this._spriteFrame; // cannot be activated if texture not loaded yet - if (!this._spriteFrame || !this._spriteFrame.textureLoaded()) { + if (!spriteFrame || !spriteFrame.textureLoaded()) { return; } // Get material - if (!this._material) { - let texture = this._spriteFrame.getTexture(); - let url = texture.url; - let key = url; - if (this._state === State.GRAY) { - key = url + ':gray'; - } - if (this._state === State.GRAY) { - this._material = new GraySpriteMaterial(); - } - else { - this._material = new SpriteMaterial(); - } - // TODO: old texture in material have been released by loader - this._material.texture = texture; + let texture = spriteFrame.getTexture(); + let url = texture.url; + let key = url; + if (this._state === State.GRAY) { + key = url + ':gray'; } + let material; + if (this._state === State.GRAY) { + material = new GraySpriteMaterial(); + } + else { + material = new SpriteMaterial(); + } + // TODO: old texture in material have been released by loader + material.texture = texture; + if (this.srcBlendFactor !== gfx.BLEND_SRC_ALPHA || this.dstBlendFactor !== gfx.BLEND_ONE_MINUS_SRC_ALPHA) { // Update hash inside this._updateBlendFunc(); } else { - this._material.updateHash(); + material.updateHash(); } if (this._renderData) { - this._renderData.material = this._material; + this._renderData.material = material; } + + this._material = material; }, _updateBlendFunc: function () { @@ -632,10 +634,7 @@ var Sprite = cc.Class({ if (!this.isValid) { return; } - // Reactivate material - if (this.enabledInHierarchy) { - this._activateMaterial(); - } + this._applySpriteSize(); }, diff --git a/cocos2d/core/graphics/graphics.js b/cocos2d/core/graphics/graphics.js index f4c893e19b..91aae49813 100644 --- a/cocos2d/core/graphics/graphics.js +++ b/cocos2d/core/graphics/graphics.js @@ -176,7 +176,6 @@ let Graphics = cc.Class({ onEnable () { this._super(); - this._activateMaterial(); }, onDestroy () { diff --git a/cocos2d/core/renderer/assemblers/sprite/index.js b/cocos2d/core/renderer/assemblers/sprite/index.js index 1ded075403..964ff562cb 100644 --- a/cocos2d/core/renderer/assemblers/sprite/index.js +++ b/cocos2d/core/renderer/assemblers/sprite/index.js @@ -27,6 +27,8 @@ const js = require('../../../platform/js'); const assembler = require('../assembler'); const Sprite = require('../../../components/CCSprite'); const renderEngine = require('../../render-engine'); +const atlasPakcer = require('../../utils/atlas/atlas-packer'); + const SpriteType = Sprite.Type; const FillType = Sprite.FillType; @@ -41,6 +43,10 @@ const meshRenderUtil = require('./mesh'); let spriteAssembler = js.addon({ useModel: false, + checkPacker (comp) { + atlasPakcer.insertSpriteFrame(comp.spriteFrame); + }, + getAssembler (sprite) { let util = simpleRenderUtil; diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index 3f076d4bae..f0a110ca73 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -28,6 +28,7 @@ const renderEngine = require('./render-engine'); const defaultVertexFormat = require('./vertex-format'); const StencilManager = require('./stencil-manager'); const hierarchyChain = require('./utils/hierarchy-chain'); + const gfx = renderEngine.gfx; const RecyclePool = renderEngine.RecyclePool; const InputAssembler = renderEngine.InputAssembler; @@ -41,6 +42,8 @@ const MAX_VERTEX_BYTES = MAX_VERTEX * defaultVertexFormat._bytes; const MAX_INDICE = MAX_VERTEX * BYTE_PER_INDEX; const MAX_INDICE_BYTES = MAX_INDICE * 2; +const AUTO_PACK_ATLAS = true; + var RenderComponentWalker = function (device, renderScene) { this._renderScene = renderScene; this._device = device; @@ -259,6 +262,13 @@ RenderComponentWalker.prototype = { broken = false, iaData = false; + if (AUTO_PACK_ATLAS && assembler.checkPacker) { + assembler.checkPacker(comp); + } + if (comp._activateMaterial) { + comp._activateMaterial(); + } + // Update render data datas = assembler.updateRenderData(comp, batchData); diff --git a/cocos2d/core/renderer/utils/atlas/atlas-packer.js b/cocos2d/core/renderer/utils/atlas/atlas-packer.js new file mode 100644 index 0000000000..b6acc4171b --- /dev/null +++ b/cocos2d/core/renderer/utils/atlas/atlas-packer.js @@ -0,0 +1,35 @@ +const Atlas = require('./atlas'); + +let _atlases = []; +let _atlasIndex = -1; + +let _textureWidth = 2048; +let _textureHeight = 2048; + +let _maxFrameWidth = 512; +let _maxFrameHeight = 512; + +module.exports = { + insertSpriteFrame (spriteFrame) { + if (!spriteFrame || spriteFrame._oriInfo) return; + + let rect = spriteFrame._rect; + if (rect.width > _maxFrameWidth || rect.height > _maxFrameHeight) { + return; + } + + let atlas = _atlases[_atlasIndex]; + if (!atlas) { + atlas = new Atlas(_textureWidth, _textureHeight); + _atlases.push(atlas); + _atlasIndex++; + } + + if (!atlas.insertSpriteFrame(spriteFrame)) { + atlas = new Atlas(_textureWidth, _textureHeight); + _atlases.push(atlas); + _atlasIndex++; + atlas.insertSpriteFrame(spriteFrame); + } + } +}; diff --git a/cocos2d/core/renderer/utils/atlas/atlas.js b/cocos2d/core/renderer/utils/atlas/atlas.js new file mode 100644 index 0000000000..a8eb340ed6 --- /dev/null +++ b/cocos2d/core/renderer/utils/atlas/atlas.js @@ -0,0 +1,69 @@ +const space = 1; + +class Atlas { + constructor (width, height) { + let canvas = document.createElement("canvas"); + canvas.style.width = canvas.width = width; + canvas.style.height = canvas.height = height; + + // comment out this to show atlas + // document.body.appendChild(canvas) + + let ctx = canvas.getContext('2d'); + + let texture = new cc.Texture2D(); + texture.initWithElement(canvas); + texture.handleLoadedTexture(); + + this._texture = texture; + this._ctx = ctx; + + this._x = space; + this._y = space; + this._nexty = space; + + this._width = width; + this._height = height; + } + + insertSpriteFrame (spriteFrame) { + let rect = spriteFrame._rect; + let sx = rect.x, sy = rect.y, width = rect.width, height = rect.height; + + if ((this._x + width) > this._width) { + this._x = space; + this._y = this._nexty; + } + + if ((this._y + height) > this._nexty) { + this._nexty = this._y + height; + } + + if (this._nexty > this._height) { + return false; + } + + this._ctx.drawImage(spriteFrame._texture._image, + sx, sy, rect.width, rect.height, + this._x, this._y, rect.width, rect.height, + ); + + spriteFrame._oriInfo = { + x: sx, + y: sy + } + + rect.x = this._x; + rect.y = this._y; + + this._x += width; + + spriteFrame._texture = this._texture; + + this._texture.handleLoadedTexture(); + + return true; + } +} + +module.exports = Atlas; diff --git a/cocos2d/tilemap/CCTiledLayer.js b/cocos2d/tilemap/CCTiledLayer.js index 75f4378d4e..92e21fed3a 100644 --- a/cocos2d/tilemap/CCTiledLayer.js +++ b/cocos2d/tilemap/CCTiledLayer.js @@ -386,8 +386,9 @@ let TiledLayer = cc.Class({ * tiledLayer.setTexture(texture); */ setTexture (texture){ + if (this._texture === texture) return; this._texture = texture; - this._activateMaterial(); + this._material = null; }, /** From 1230fe6d4d7f00d01c4dcb4151e7a6c3c4909431 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sun, 15 Apr 2018 19:07:56 +0800 Subject: [PATCH 23/53] Support component direct assemblers --- .../core/renderer/assemblers/label/bmfont.js | 43 ++--- .../core/renderer/assemblers/label/index.js | 42 +---- cocos2d/core/renderer/assemblers/label/ttf.js | 54 ++++-- .../renderer/assemblers/sprite/bar-filled.js | 68 ++++---- .../core/renderer/assemblers/sprite/index.js | 23 +-- .../core/renderer/assemblers/sprite/mesh.js | 48 +++--- .../assemblers/sprite/radial-filled.js | 157 +++++++++-------- .../core/renderer/assemblers/sprite/simple.js | 22 +-- .../core/renderer/assemblers/sprite/sliced.js | 36 ++-- .../core/renderer/assemblers/sprite/tiled.js | 162 +++++++++--------- .../core/renderer/render-component-walker.js | 22 ++- 11 files changed, 336 insertions(+), 341 deletions(-) diff --git a/cocos2d/core/renderer/assemblers/label/bmfont.js b/cocos2d/core/renderer/assemblers/label/bmfont.js index 2feb40bf2f..b223b07810 100644 --- a/cocos2d/core/renderer/assemblers/label/bmfont.js +++ b/cocos2d/core/renderer/assemblers/label/bmfont.js @@ -28,13 +28,20 @@ const renderEngine = require('../../render-engine'); const js = require('../../../platform/js'); const bmfontUtls = require('../../utils/label/bmfont'); +const assembler = require('../assembler'); +const ttfAssembler = require('./ttf'); module.exports = js.addon({ createData (comp) { return comp.requestRenderData(); }, - fillVertexBuffer (comp, off, vbuf, uintbuf) { + updateRenderData: ttfAssembler.updateRenderData, + + fillBuffers (comp, batchData, vertexId, vbuf, uintbuf, ibuf) { + let vertexOffset = batchData.byteOffset / 4, + indiceOffset = batchData.indiceOffset; + let node = comp.node; let renderData = comp._renderData; let data = renderData._data; @@ -53,26 +60,22 @@ module.exports = js.addon({ let length = renderData.dataLength; for (let i = 0; i < length; i++) { vert = data[i]; - vbuf[off + 0] = vert.x * a + vert.y * c + tx; - vbuf[off + 1] = vert.x * b + vert.y * d + ty; - vbuf[off + 2] = z; - vbuf[off + 4] = vert.u; - vbuf[off + 5] = vert.v; - uintbuf[off + 3] = color; - off += 6; + vbuf[vertexOffset + 0] = vert.x * a + vert.y * c + tx; + vbuf[vertexOffset + 1] = vert.x * b + vert.y * d + ty; + vbuf[vertexOffset + 2] = z; + vbuf[vertexOffset + 4] = vert.u; + vbuf[vertexOffset + 5] = vert.v; + uintbuf[vertexOffset + 3] = color; + vertexOffset += 6; } - }, - - fillIndexBuffer (comp, offset, vertexId, ibuf) { - let renderData = comp._renderData; - let length = renderData.indiceCount; + length = renderData.indiceCount; for (let i = 0; i < length; i+=6) { - ibuf[offset++] = vertexId; - ibuf[offset++] = vertexId+1; - ibuf[offset++] = vertexId+2; - ibuf[offset++] = vertexId+1; - ibuf[offset++] = vertexId+3; - ibuf[offset++] = vertexId+2; + ibuf[indiceOffset++] = vertexId; + ibuf[indiceOffset++] = vertexId+1; + ibuf[indiceOffset++] = vertexId+2; + ibuf[indiceOffset++] = vertexId+1; + ibuf[indiceOffset++] = vertexId+3; + ibuf[indiceOffset++] = vertexId+2; vertexId += 4; } }, @@ -131,4 +134,4 @@ module.exports = js.addon({ data[dataOffset+3].x = x + rectWidth * scale; data[dataOffset+3].y = y; }, -}, bmfontUtls); +}, bmfontUtls, assembler); diff --git a/cocos2d/core/renderer/assemblers/label/index.js b/cocos2d/core/renderer/assemblers/label/index.js index 00639c4e26..00e5720047 100644 --- a/cocos2d/core/renderer/assemblers/label/index.js +++ b/cocos2d/core/renderer/assemblers/label/index.js @@ -23,14 +23,11 @@ THE SOFTWARE. ****************************************************************************/ -const js = require('../../../platform/js'); -const assembler = require('../assembler'); const Label = require('../../../components/CCLabel'); const ttfAssembler = require('./ttf'); const bmfontAssembler = require('./bmfont'); -var labelAssembler = js.addon({ - +var labelAssembler = { getAssembler (comp) { let assembler = ttfAssembler; @@ -41,40 +38,11 @@ var labelAssembler = js.addon({ return assembler; }, - updateRenderData (comp) { - this.datas.length = 0; - - if (comp.string === undefined || - comp.string === null || - comp.string === "" || - !comp._assembler) { - return this.datas; - } - - let renderData = comp._renderData; - - // let size = comp.node._contentSize; - // let anchor = comp.node._anchorPoint; - // renderData.updateSizeNPivot(size.width, size.height, anchor.x, anchor.y); - - comp._assembler.update(comp); - - renderData.material = comp.getMaterial(); - this.datas.push(renderData); - return this.datas; - }, - - fillBuffers (comp, batchData, vertexId, vbuf, uintbuf, ibuf) { - let assembler = comp._assembler; - if (!assembler) return; - - let vertexOffset = batchData.byteOffset / 4, - indiceOffset = batchData.indiceOffset; - - assembler.fillVertexBuffer(comp, vertexOffset, vbuf, uintbuf); - assembler.fillIndexBuffer(comp, indiceOffset, vertexId, ibuf); + // Skip invalid labels (without own _assembler) + updateRenderData (label) { + return label.__allocedDatas; } -}, assembler); +}; Label._assembler = labelAssembler; diff --git a/cocos2d/core/renderer/assemblers/label/ttf.js b/cocos2d/core/renderer/assemblers/label/ttf.js index c1679a813e..e682294565 100644 --- a/cocos2d/core/renderer/assemblers/label/ttf.js +++ b/cocos2d/core/renderer/assemblers/label/ttf.js @@ -28,6 +28,7 @@ const renderEngine = require('../../render-engine'); const js = require('../../../platform/js'); const ttfUtls = require('../../utils/label/ttf'); +const assembler = require('../assembler'); module.exports = js.addon({ createData (comp) { @@ -49,7 +50,26 @@ module.exports = js.addon({ return renderData; }, - fillVertexBuffer (comp, off, vbuf, uintbuf) { + updateRenderData (comp) { + let datas = this.datas; + datas.length = 0; + + if (!comp.string) { + return datas; + } + + let renderData = comp._renderData; + this.update(comp); + + renderData.material = comp.getMaterial(); + datas.push(renderData); + return datas; + }, + + fillBuffers (comp, batchData, vertexId, vbuf, uintbuf, ibuf) { + let vertexOffset = batchData.byteOffset / 4, + indiceOffset = batchData.indiceOffset; + let node = comp.node; let renderData = comp._renderData; let data = renderData._data; @@ -68,23 +88,21 @@ module.exports = js.addon({ let length = renderData.dataLength; for (let i = 0; i < length; i++) { vert = data[i]; - vbuf[off + 0] = vert.x * a + vert.y * c + tx; - vbuf[off + 1] = vert.x * b + vert.y * d + ty; - vbuf[off + 2] = z; - vbuf[off + 4] = vert.u; - vbuf[off + 5] = vert.v; - uintbuf[off + 3] = color; - off += 6; + vbuf[vertexOffset + 0] = vert.x * a + vert.y * c + tx; + vbuf[vertexOffset + 1] = vert.x * b + vert.y * d + ty; + vbuf[vertexOffset + 2] = z; + vbuf[vertexOffset + 4] = vert.u; + vbuf[vertexOffset + 5] = vert.v; + uintbuf[vertexOffset + 3] = color; + vertexOffset += 6; } - }, - - fillIndexBuffer (comp, offset, vertexId, ibuf) { - ibuf[offset + 0] = vertexId; - ibuf[offset + 1] = vertexId + 1; - ibuf[offset + 2] = vertexId + 2; - ibuf[offset + 3] = vertexId + 1; - ibuf[offset + 4] = vertexId + 3; - ibuf[offset + 5] = vertexId + 2; + + ibuf[indiceOffset + 0] = vertexId; + ibuf[indiceOffset + 1] = vertexId + 1; + ibuf[indiceOffset + 2] = vertexId + 2; + ibuf[indiceOffset + 3] = vertexId + 1; + ibuf[indiceOffset + 4] = vertexId + 3; + ibuf[indiceOffset + 5] = vertexId + 2; }, _updateVerts (comp) { @@ -106,4 +124,4 @@ module.exports = js.addon({ data[3].x = width - appx; data[3].y = height - appy; } -}, ttfUtls); +}, ttfUtls, assembler); diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index fbab6e14c7..71125eafbc 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -29,43 +29,47 @@ const FillType = Sprite.FillType; const simpleRenderUtil = require('./simple'); module.exports = { - update (sprite, batchData) { + useModel: false, + updateRenderData (sprite) { let renderData = sprite._renderData; - let uvDirty = renderData.uvDirty, - vertDirty = renderData.vertDirty; + if (renderData && sprite._material) { + let uvDirty = renderData.uvDirty, + vertDirty = renderData.vertDirty; - if (!uvDirty && !vertDirty) return; + if (!uvDirty && !vertDirty) return; - let fillStart = sprite._fillStart; - let fillRange = sprite._fillRange; + let fillStart = sprite._fillStart; + let fillRange = sprite._fillRange; - if (fillRange < 0) { - fillStart += fillRange; - fillRange = -fillRange; - } - - fillRange = fillStart + fillRange; - - fillStart = fillStart > 1.0 ? 1.0 : fillStart; - fillStart = fillStart < 0.0 ? 0.0 : fillStart; - - fillRange = fillRange > 1.0 ? 1.0 : fillRange; - fillRange = fillRange < 0.0 ? 0.0 : fillRange; - fillRange = fillRange - fillStart; - fillRange = fillRange < 0 ? 0 : fillRange; - - let fillEnd = fillStart + fillRange; - fillEnd = fillEnd > 1 ? 1 : fillEnd; - - if (uvDirty) { - this.updateUVs(sprite, fillStart, fillEnd); - } - if (vertDirty) { - this.updateVerts(sprite, fillStart, fillEnd); - } - if (vertDirty || batchData.worldMatUpdated) { - this.updateWorldVerts(sprite); + if (fillRange < 0) { + fillStart += fillRange; + fillRange = -fillRange; + } + + fillRange = fillStart + fillRange; + + fillStart = fillStart > 1.0 ? 1.0 : fillStart; + fillStart = fillStart < 0.0 ? 0.0 : fillStart; + + fillRange = fillRange > 1.0 ? 1.0 : fillRange; + fillRange = fillRange < 0.0 ? 0.0 : fillRange; + fillRange = fillRange - fillStart; + fillRange = fillRange < 0 ? 0 : fillRange; + + let fillEnd = fillStart + fillRange; + fillEnd = fillEnd > 1 ? 1 : fillEnd; + + if (uvDirty) { + this.updateUVs(sprite, fillStart, fillEnd); + } + if (vertDirty) { + this.updateVerts(sprite, fillStart, fillEnd); + } + if (vertDirty || batchData.worldMatUpdated) { + this.updateWorldVerts(sprite); + } } + return sprite.__allocedDatas; }, updateUVs (sprite, fillStart, fillEnd) { diff --git a/cocos2d/core/renderer/assemblers/sprite/index.js b/cocos2d/core/renderer/assemblers/sprite/index.js index 1ded075403..37d1bd1c6b 100644 --- a/cocos2d/core/renderer/assemblers/sprite/index.js +++ b/cocos2d/core/renderer/assemblers/sprite/index.js @@ -23,10 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -const js = require('../../../platform/js'); -const assembler = require('../assembler'); const Sprite = require('../../../components/CCSprite'); -const renderEngine = require('../../render-engine'); const SpriteType = Sprite.Type; const FillType = Sprite.FillType; @@ -38,9 +35,7 @@ const barFilledRenderUtil = require('./bar-filled'); const meshRenderUtil = require('./mesh'); // Inline all type switch to avoid jit deoptimization during inlined function change -let spriteAssembler = js.addon({ - useModel: false, - +let spriteAssembler = { getAssembler (sprite) { let util = simpleRenderUtil; @@ -67,19 +62,11 @@ let spriteAssembler = js.addon({ return util; }, - updateRenderData (sprite, batchData) { - let datas = sprite.__allocedDatas; - if (sprite._spriteFrame && sprite._material && sprite._renderData) { - sprite._assembler.update(sprite, batchData); - } - - return datas; - }, - - fillBuffers (sprite, batchData, vertexId, vbuf, uintbuf, ibuf) { - sprite._assembler.fillBuffers(sprite, batchData, vertexId, vbuf, uintbuf, ibuf); + // Skip invalid sprites (without own _assembler) + updateRenderData (sprite) { + return sprite.__allocedDatas; } -}, assembler); +}; Sprite._assembler = spriteAssembler; diff --git a/cocos2d/core/renderer/assemblers/sprite/mesh.js b/cocos2d/core/renderer/assemblers/sprite/mesh.js index 741a60d252..21af942fe2 100644 --- a/cocos2d/core/renderer/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/assemblers/sprite/mesh.js @@ -24,37 +24,41 @@ ****************************************************************************/ module.exports = { + useModel: false, + createData (sprite) { return sprite.requestRenderData(); }, - update (sprite, batchData) { + updateRenderData (sprite) { let renderData = sprite._renderData; let frame = sprite.spriteFrame; + if (renderData && frame && sprite._material) { + let vertices = frame.vertices; + if (vertices) { + if (renderData.vertexCount !== vertices.x.length) { + renderData.vertexCount = vertices.x.length; + renderData.indiceCount = vertices.triangles.length; + + // 1 for world vertices, 2 for local vertices + renderData.dataLength = renderData.vertexCount * 2; - let vertices = frame.vertices; - if (!vertices) return; + renderData.uvDirty = renderData.vertDirty = true; + } - if (renderData.vertexCount !== vertices.x.length) { - renderData.vertexCount = vertices.x.length; - renderData.indiceCount = vertices.triangles.length; - - // 1 for world vertices, 2 for local vertices - renderData.dataLength = renderData.vertexCount * 2; - - renderData.uvDirty = renderData.vertDirty = true; - } - - if (renderData.uvDirty) { - this.updateUVs(sprite); - } - let vertDirty = renderData.vertDirty; - if (vertDirty) { - this.updateVerts(sprite); - } - if (vertDirty || batchData.worldMatUpdated) { - this.updateWorldVerts(sprite); + if (renderData.uvDirty) { + this.updateUVs(sprite); + } + let vertDirty = renderData.vertDirty; + if (vertDirty) { + this.updateVerts(sprite); + } + if (vertDirty || batchData.worldMatUpdated) { + this.updateWorldVerts(sprite); + } + } } + return sprite.__allocedDatas; }, updateUVs (sprite) { diff --git a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js index d0dcfb74bd..51a893631f 100644 --- a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js @@ -28,6 +28,8 @@ const simpleRenderUtil = require('./simple'); const PI_2 = Math.PI * 2; module.exports = { + useModel: false, + _vertPos: [cc.v2(0, 0), cc.v2(0, 0), cc.v2(0, 0), cc.v2(0, 0)], _vertices: [0, 0, 0, 0], _uvs: [0, 0, 0, 0, 0, 0, 0, 0], @@ -40,100 +42,103 @@ module.exports = { return sprite.requestRenderData(); }, - update (sprite) { + updateRenderData (sprite) { let renderData = sprite._renderData; - if (!renderData.vertDirty && !renderData.uvDirty) return; - - let data = renderData._data; let spriteFrame = sprite._spriteFrame; + if (renderData && frame && sprite._material) { + if (renderData.vertDirty || renderData.uvDirty) { + let data = renderData._data; - let fillStart = sprite._fillStart; - let fillRange = sprite._fillRange; - if (fillRange < 0) { - fillStart += fillRange; - fillRange = -fillRange; - } + let fillStart = sprite._fillStart; + let fillRange = sprite._fillRange; + if (fillRange < 0) { + fillStart += fillRange; + fillRange = -fillRange; + } - //do round fill start [0,1), include 0, exclude 1 - while (fillStart >= 1.0) fillStart -= 1.0; - while (fillStart < 0.0) fillStart += 1.0; + //do round fill start [0,1), include 0, exclude 1 + while (fillStart >= 1.0) fillStart -= 1.0; + while (fillStart < 0.0) fillStart += 1.0; - fillStart *= PI_2; - fillRange *= PI_2; - let fillEnd = fillStart + fillRange; + fillStart *= PI_2; + fillRange *= PI_2; + let fillEnd = fillStart + fillRange; - //build vertices - this._calculateVertices(sprite); - //build uvs - this._calculateUVs(spriteFrame); + //build vertices + this._calculateVertices(sprite); + //build uvs + this._calculateUVs(spriteFrame); - let center = this._center; + let center = this._center; - let vertPos = this._vertPos, - vertices = this._vertices; + let vertPos = this._vertPos, + vertices = this._vertices; - let triangles = this._triangles; + let triangles = this._triangles; - this._calcInsectedPoints(vertices[0], vertices[2], vertices[1], vertices[3], center, fillStart, this._intersectPoint_1); - this._calcInsectedPoints(vertices[0], vertices[2], vertices[1], vertices[3], center, fillStart + fillRange, this._intersectPoint_2); + this._calcInsectedPoints(vertices[0], vertices[2], vertices[1], vertices[3], center, fillStart, this._intersectPoint_1); + this._calcInsectedPoints(vertices[0], vertices[2], vertices[1], vertices[3], center, fillStart + fillRange, this._intersectPoint_2); - let offset = 0; - for (let triangleIndex = 0; triangleIndex < 4; ++triangleIndex) { - let triangle = triangles[triangleIndex]; - if (!triangle) { - continue; - } - //all in - if (fillRange >= PI_2) { - renderData.dataLength = offset + 3; - this._generateTriangle(data, offset, center, vertPos[triangle[0]], vertPos[triangle[1]]); - offset += 3; - continue; - } - //test against - let startAngle = this._getVertAngle(center, vertPos[triangle[0]]); - let endAngle = this._getVertAngle(center, vertPos[triangle[1]]); - if(endAngle < startAngle) endAngle += PI_2; - startAngle -= PI_2; - endAngle -= PI_2; - //testing - for(let testIndex = 0; testIndex < 3; ++testIndex) { - if(startAngle >= fillEnd) { - //all out - } else if (startAngle >= fillStart) { - renderData.dataLength = offset + 3; - if(endAngle >= fillEnd) { - //startAngle to fillEnd - this._generateTriangle(data, offset, center, vertPos[triangle[0]], this._intersectPoint_2[triangleIndex]); - } else { - //startAngle to endAngle - this._generateTriangle(data, offset, center, vertPos[triangle[0]], vertPos[triangle[1]]); + let offset = 0; + for (let triangleIndex = 0; triangleIndex < 4; ++triangleIndex) { + let triangle = triangles[triangleIndex]; + if (!triangle) { + continue; } - offset += 3; - } else { - //startAngle < fillStart - if(endAngle <= fillStart) { - //all out - } else if(endAngle <= fillEnd) { + //all in + if (fillRange >= PI_2) { renderData.dataLength = offset + 3; - //fillStart to endAngle - this._generateTriangle(data, offset, center, this._intersectPoint_1[triangleIndex], vertPos[triangle[1]]); - offset += 3; - } else { - renderData.dataLength = offset + 3; - //fillStart to fillEnd - this._generateTriangle(data, offset, center, this._intersectPoint_1[triangleIndex], this._intersectPoint_2[triangleIndex]); + this._generateTriangle(data, offset, center, vertPos[triangle[0]], vertPos[triangle[1]]); offset += 3; + continue; + } + //test against + let startAngle = this._getVertAngle(center, vertPos[triangle[0]]); + let endAngle = this._getVertAngle(center, vertPos[triangle[1]]); + if(endAngle < startAngle) endAngle += PI_2; + startAngle -= PI_2; + endAngle -= PI_2; + //testing + for(let testIndex = 0; testIndex < 3; ++testIndex) { + if(startAngle >= fillEnd) { + //all out + } else if (startAngle >= fillStart) { + renderData.dataLength = offset + 3; + if(endAngle >= fillEnd) { + //startAngle to fillEnd + this._generateTriangle(data, offset, center, vertPos[triangle[0]], this._intersectPoint_2[triangleIndex]); + } else { + //startAngle to endAngle + this._generateTriangle(data, offset, center, vertPos[triangle[0]], vertPos[triangle[1]]); + } + offset += 3; + } else { + //startAngle < fillStart + if(endAngle <= fillStart) { + //all out + } else if(endAngle <= fillEnd) { + renderData.dataLength = offset + 3; + //fillStart to endAngle + this._generateTriangle(data, offset, center, this._intersectPoint_1[triangleIndex], vertPos[triangle[1]]); + offset += 3; + } else { + renderData.dataLength = offset + 3; + //fillStart to fillEnd + this._generateTriangle(data, offset, center, this._intersectPoint_1[triangleIndex], this._intersectPoint_2[triangleIndex]); + offset += 3; + } + } + //add 2 * PI + startAngle += PI_2; + endAngle += PI_2; } } - //add 2 * PI - startAngle += PI_2; - endAngle += PI_2; + + renderData.indiceCount = renderData.vertexCount = offset; + renderData.vertDirty = renderData.uvDirty = false; } } - - renderData.indiceCount = renderData.vertexCount = offset; - renderData.vertDirty = renderData.uvDirty = false; + return sprite.__allocedDatas; }, _getVertAngle: function(start, end) { diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index aac18873b8..00c14b4f6d 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -24,22 +24,22 @@ ****************************************************************************/ const js = require('../../../platform/js'); -const assembler = require('../assembler'); -module.exports = js.addon({ +module.exports = { useModel: false, - update (sprite, batchData) { + updateRenderData (sprite) { let renderData = sprite._renderData; - - if (renderData.uvDirty) { - this.updateUVs(sprite); - } + if (renderData && sprite._material) { + if (renderData.uvDirty) { + this.updateUVs(sprite); + } - let vertDirty = renderData.vertDirty; - if (vertDirty) { - this.updateVerts(sprite); + if (renderData.vertDirty) { + this.updateVerts(sprite); + } } + return sprite.__allocedDatas; }, fillBuffers (sprite, batchData, vertexId, vbuf, uintbuf, ibuf) { @@ -164,4 +164,4 @@ module.exports = js.addon({ renderData.vertDirty = false; } -}, assembler); +}; diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index ed68b1c5a9..79bc092c92 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -29,6 +29,8 @@ const FillType = Sprite.FillType; const simpleRenderUtil = require('./simple'); module.exports = { + useModel: false, + createData (sprite) { let renderData = sprite.requestRenderData(); // 0-4 for local verts @@ -39,6 +41,24 @@ module.exports = { renderData.indiceCount = 54; return renderData; }, + + updateRenderData (sprite) { + let renderData = sprite._renderData; + if (renderData && sprite._material) { + if (renderData.uvDirty) { + this.updateUVs(sprite); + } + + let vertDirty = renderData.vertDirty; + if (vertDirty) { + this.updateVerts(sprite); + } + if (vertDirty || batchData.worldMatUpdated) { + this.updateWorldVerts(sprite); + } + } + return sprite.__allocedDatas; + }, updateUVs (sprite) { let material = sprite.getMaterial(); @@ -172,20 +192,4 @@ module.exports = { } } }, - - update (sprite, batchData) { - let renderData = sprite._renderData; - - if (renderData.uvDirty) { - this.updateUVs(sprite); - } - - let vertDirty = renderData.vertDirty; - if (vertDirty) { - this.updateVerts(sprite); - } - if (vertDirty || batchData.worldMatUpdated) { - this.updateWorldVerts(sprite); - } - }, }; diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index 1774508e9c..21e3615e2c 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -24,100 +24,104 @@ ****************************************************************************/ module.exports = { + useModel: false, + createData (sprite) { return sprite.requestRenderData(); }, - update (sprite) { + updateRenderData (sprite) { let renderData = sprite._renderData; - if (!renderData.uvDirty && !renderData.vertDirty) return; - let material = sprite.getMaterial(); + if (renderData && material) { + if (renderData.uvDirty || renderData.vertDirty) { + let texture = material.effect.getProperty('texture'); + let texw = texture._width, + texh = texture._height; + let frame = sprite.spriteFrame; + let rect = frame._rect; - let texture = material.effect.getProperty('texture'); - let texw = texture._width, - texh = texture._height; - let frame = sprite.spriteFrame; - let rect = frame._rect; + let node = sprite.node, + contentWidth = Math.abs(node.width), + contentHeight = Math.abs(node.height), + appx = node.anchorX * contentWidth, + appy = node.anchorY * contentHeight; - let node = sprite.node, - contentWidth = Math.abs(node.width), - contentHeight = Math.abs(node.height), - appx = node.anchorX * contentWidth, - appy = node.anchorY * contentHeight; + let rectWidth = rect.width; + let rectHeight = rect.height; + let hRepeat = contentWidth / rectWidth; + let vRepeat = contentHeight / rectHeight; + let row = Math.ceil(vRepeat), + col = Math.ceil(hRepeat); - let rectWidth = rect.width; - let rectHeight = rect.height; - let hRepeat = contentWidth / rectWidth; - let vRepeat = contentHeight / rectHeight; - let row = Math.ceil(vRepeat), - col = Math.ceil(hRepeat); + let data = renderData._data; + renderData.dataLength = Math.max(8, row+1, col+1); - let data = renderData._data; - renderData.dataLength = Math.max(8, row+1, col+1); + let l, b, r, t; + if (!frame._rotated) { + l = (rect.x) / texw; + r = (rect.x + rectWidth) / texw; + b = (rect.y + rectHeight) / texh; + t = (rect.y) / texh; - let l, b, r, t; - if (!frame._rotated) { - l = (rect.x) / texw; - r = (rect.x + rectWidth) / texw; - b = (rect.y + rectHeight) / texh; - t = (rect.y) / texh; + data[0].u = l; + data[0].v = b; + data[1].u = r; + data[1].v = b; + data[2].u = l; + data[2].v = t; + data[3].u = r; + data[3].v = t; + + data[4].u = l; + data[4].v = b; + data[5].u = l + (r-l) * Math.min(1, hRepeat - col + 1); + data[5].v = b; + data[6].u = l; + data[6].v = b + (t-b) * Math.min(1, vRepeat - row + 1); + data[7].u = data[5].u; + data[7].v = data[6].v; + } else { + l = (rect.x) / texw; + r = (rect.x + rectHeight) / texw; + b = (rect.y + rectWidth) / texh; + t = (rect.y) / texh; - data[0].u = l; - data[0].v = b; - data[1].u = r; - data[1].v = b; - data[2].u = l; - data[2].v = t; - data[3].u = r; - data[3].v = t; - - data[4].u = l; - data[4].v = b; - data[5].u = l + (r-l) * Math.min(1, hRepeat - col + 1); - data[5].v = b; - data[6].u = l; - data[6].v = b + (t-b) * Math.min(1, vRepeat - row + 1); - data[7].u = data[5].u; - data[7].v = data[6].v; - } else { - l = (rect.x) / texw; - r = (rect.x + rectHeight) / texw; - b = (rect.y + rectWidth) / texh; - t = (rect.y) / texh; + data[0].u = l; + data[0].v = t; + data[1].u = l; + data[1].v = b; + data[2].u = r; + data[2].v = t; + data[3].u = r; + data[3].v = b; - data[0].u = l; - data[0].v = t; - data[1].u = l; - data[1].v = b; - data[2].u = r; - data[2].v = t; - data[3].u = r; - data[3].v = b; + data[4].u = l; + data[4].v = t; + data[5].u = l; + data[5].v = t + (b - t) * Math.min(1, vRepeat - col + 1); + data[6].u = l + (r - l) * Math.min(1, hRepeat - row + 1); + data[6].v = t; + data[7].u = data[5].u; + data[7].v = data[6].v; + } - data[4].u = l; - data[4].v = t; - data[5].u = l; - data[5].v = t + (b - t) * Math.min(1, vRepeat - col + 1); - data[6].u = l + (r - l) * Math.min(1, hRepeat - row + 1); - data[6].v = t; - data[7].u = data[5].u; - data[7].v = data[6].v; + for (let i = 0; i <= col; ++i) { + data[i].x = Math.min(rectWidth * i, contentWidth) - appx; + } + + for (let i = 0; i <= row; ++i) { + data[i].y = Math.min(rectHeight * i, contentHeight) - appy; + } + + // update data property + renderData.vertexCount = row * col * 4; + renderData.indiceCount = row * col * 6; + renderData.uvDirty = false; + renderData.vertDirty = false; + } } - - for (let i = 0; i <= col; ++i) { - data[i].x = Math.min(rectWidth * i, contentWidth) - appx; - } - - for (let i = 0; i <= row; ++i) { - data[i].y = Math.min(rectHeight * i, contentHeight) - appy; - } - - // update data property - renderData.vertexCount = row * col * 4; - renderData.indiceCount = row * col * 6; - renderData.uvDirty = false; - renderData.vertDirty = false; + return sprite.__allocedDatas; }, fillBuffers (sprite, batchData, vertexId, vbuf, uintbuf, ibuf) { diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index 3f076d4bae..cceda73dec 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -246,24 +246,17 @@ RenderComponentWalker.prototype = { this._renderScene.addModel(model); }, - _commitComp (comp, assembler) { - if (!assembler) { - return; - } - + _commitComp (comp, assembler, cullingMask) { let batchData = this._batchData, material = null, datas = null, data = null, - cullingMask = 1, broken = false, iaData = false; // Update render data datas = assembler.updateRenderData(comp, batchData); - cullingMask = comp.node._cullingMask; - for (let id = 0; id < datas.length; id ++) { data = datas[id]; material = data.material; @@ -331,8 +324,9 @@ RenderComponentWalker.prototype = { visit (scene) { this.reset(); + let batchData = this._batchData; let entry = this._findEntry(scene); - let comp, node, assembler, group; + let comp, node, assembler, group, cullingMask; for (; entry; entry = entry.next) { comp = entry.comp; node = comp.node; @@ -349,7 +343,7 @@ RenderComponentWalker.prototype = { group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; node._cullingMask = 1 << group; - assembler = comp.constructor._assembler; + assembler = comp._assembler || comp.constructor._assembler; } // Post handle else { @@ -358,15 +352,19 @@ RenderComponentWalker.prototype = { } assembler = comp.constructor._postAssembler; } + if (!assembler) { + continue; + } // Transform if (node._worldMatDirty) { node._updateWorldMatrix(); - this._batchData.worldMatUpdated = true; + batchData.worldMatUpdated = true; } // Commit component render data - this._commitComp(comp, assembler); + cullingMask = node._cullingMask; + this._commitComp(comp, assembler, cullingMask); this._batchData.worldMatUpdated = false; } From a6692d6ed194833acec1c29676e76eb92a6675cf Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sun, 15 Apr 2018 19:11:05 +0800 Subject: [PATCH 24/53] Remove assembler check --- cocos2d/core/renderer/render-component-walker.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index cceda73dec..8bf43a982b 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -352,9 +352,6 @@ RenderComponentWalker.prototype = { } assembler = comp.constructor._postAssembler; } - if (!assembler) { - continue; - } // Transform if (node._worldMatDirty) { From fec94231c25a6e3bdbb9135e69984c92089cd0a0 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Mon, 16 Apr 2018 14:43:23 +0800 Subject: [PATCH 25/53] refine dynamic atlas --- cocos2d/core/renderer/assemblers/sprite/index.js | 6 ------ cocos2d/core/renderer/assemblers/sprite/mesh.js | 6 +++++- cocos2d/core/renderer/assemblers/sprite/radial-filled.js | 4 +++- cocos2d/core/renderer/assemblers/sprite/simple.js | 5 +++++ cocos2d/core/renderer/assemblers/sprite/sliced.js | 2 ++ cocos2d/core/renderer/assemblers/sprite/tiled.js | 6 +++++- cocos2d/core/renderer/render-component-walker.js | 6 ++---- .../core/renderer/utils/{atlas => dynamic-atlas}/atlas.js | 0 .../{atlas/atlas-packer.js => dynamic-atlas/manager.js} | 7 +++++-- 9 files changed, 27 insertions(+), 15 deletions(-) rename cocos2d/core/renderer/utils/{atlas => dynamic-atlas}/atlas.js (100%) rename cocos2d/core/renderer/utils/{atlas/atlas-packer.js => dynamic-atlas/manager.js} (81%) diff --git a/cocos2d/core/renderer/assemblers/sprite/index.js b/cocos2d/core/renderer/assemblers/sprite/index.js index ffe71ee908..ec63e88804 100644 --- a/cocos2d/core/renderer/assemblers/sprite/index.js +++ b/cocos2d/core/renderer/assemblers/sprite/index.js @@ -24,7 +24,6 @@ ****************************************************************************/ const Sprite = require('../../../components/CCSprite'); -const atlasPakcer = require('../../utils/atlas/atlas-packer'); const SpriteType = Sprite.Type; const FillType = Sprite.FillType; @@ -39,11 +38,6 @@ const meshRenderUtil = require('./mesh'); // Inline all type switch to avoid jit deoptimization during inlined function change let spriteAssembler = { - - checkPacker (comp) { - atlasPakcer.insertSpriteFrame(comp.spriteFrame); - }, - getAssembler (sprite) { let util = simpleRenderUtil; diff --git a/cocos2d/core/renderer/assemblers/sprite/mesh.js b/cocos2d/core/renderer/assemblers/sprite/mesh.js index 21af942fe2..9650f56573 100644 --- a/cocos2d/core/renderer/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/assemblers/sprite/mesh.js @@ -23,6 +23,8 @@ THE SOFTWARE. ****************************************************************************/ +const simpleRenderUtil = require('./simple'); + module.exports = { useModel: false, @@ -168,5 +170,7 @@ module.exports = { for (let i = 0, l = triangles.length; i < l; i++) { ibuf[indiceOffset++] = vertexId + triangles[i]; } - } + }, + + packAtlas: simpleRenderUtil.packAtlas, }; \ No newline at end of file diff --git a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js index 51a893631f..c9f76c4121 100644 --- a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js @@ -344,5 +344,7 @@ module.exports = { for (let i = 0; i < count; i++) { ibuf[indiceOffset+i] = vertexId+i; } - } + }, + + packAtlas: simpleRenderUtil.packAtlas, }; diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index 00c14b4f6d..a9a8505131 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -24,9 +24,14 @@ ****************************************************************************/ const js = require('../../../platform/js'); +const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); module.exports = { useModel: false, + + packAtlas (comp) { + dynamicAtlasManager.insertSpriteFrame(comp.spriteFrame); + }, updateRenderData (sprite) { let renderData = sprite._renderData; diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index 79bc092c92..1a4b031168 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -192,4 +192,6 @@ module.exports = { } } }, + + packAtlas: simpleRenderUtil.packAtlas, }; diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index 21e3615e2c..74c6f8ae09 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -23,6 +23,8 @@ THE SOFTWARE. ****************************************************************************/ +const simpleRenderUtil = require('./simple'); + module.exports = { useModel: false, @@ -206,5 +208,7 @@ module.exports = { ibuf[indiceOffset++] = vertexId+2; vertexId += 4; } - } + }, + + packAtlas: simpleRenderUtil.packAtlas, }; \ No newline at end of file diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index 260706e2f6..ab62f353b2 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -42,8 +42,6 @@ const MAX_VERTEX_BYTES = MAX_VERTEX * defaultVertexFormat._bytes; const MAX_INDICE = MAX_VERTEX * BYTE_PER_INDEX; const MAX_INDICE_BYTES = MAX_INDICE * 2; -const AUTO_PACK_ATLAS = true; - var RenderComponentWalker = function (device, renderScene) { this._renderScene = renderScene; this._device = device; @@ -257,8 +255,8 @@ RenderComponentWalker.prototype = { broken = false, iaData = false; - if (AUTO_PACK_ATLAS && assembler.checkPacker) { - assembler.checkPacker(comp); + if (assembler.packAtlas) { + assembler.packAtlas(comp); } if (comp._activateMaterial) { comp._activateMaterial(); diff --git a/cocos2d/core/renderer/utils/atlas/atlas.js b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js similarity index 100% rename from cocos2d/core/renderer/utils/atlas/atlas.js rename to cocos2d/core/renderer/utils/dynamic-atlas/atlas.js diff --git a/cocos2d/core/renderer/utils/atlas/atlas-packer.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js similarity index 81% rename from cocos2d/core/renderer/utils/atlas/atlas-packer.js rename to cocos2d/core/renderer/utils/dynamic-atlas/manager.js index b6acc4171b..da5d5ca843 100644 --- a/cocos2d/core/renderer/utils/atlas/atlas-packer.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -9,9 +9,10 @@ let _textureHeight = 2048; let _maxFrameWidth = 512; let _maxFrameHeight = 512; -module.exports = { +let dynamicAtlasManager = { + enabled: true, insertSpriteFrame (spriteFrame) { - if (!spriteFrame || spriteFrame._oriInfo) return; + if (!this.enabled || !spriteFrame || spriteFrame._oriInfo) return; let rect = spriteFrame._rect; if (rect.width > _maxFrameWidth || rect.height > _maxFrameHeight) { @@ -33,3 +34,5 @@ module.exports = { } } }; + +module.exports = cc.dynamicAtlasManager = dynamicAtlasManager; \ No newline at end of file From 0d1d3f7b34a4a7e39cfbeba78b3c060a5ac34527 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Mon, 16 Apr 2018 14:50:36 +0800 Subject: [PATCH 26/53] minor fixed --- cocos2d/core/renderer/assemblers/sprite/bar-filled.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index 71125eafbc..cca358fe17 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -179,6 +179,7 @@ module.exports = { renderData.vertDirty = false; }, + packAtlas: simpleRenderUtil.packAtlas, updateWorldVerts: simpleRenderUtil.updateWorldVerts, createData: simpleRenderUtil.createData, fillBuffers: simpleRenderUtil.fillBuffers From e069e93239d5834c0f2e35393092c21b2cb78750 Mon Sep 17 00:00:00 2001 From: minggo Date: Fri, 13 Apr 2018 18:41:53 +0800 Subject: [PATCH 27/53] add functions for native --- cocos2d/core/CCNode.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 147c2f80fe..b7e2d7bf6a 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -53,6 +53,7 @@ const ONE_DEGREE = Math.PI / 180; var ActionManagerExist = !!cc.ActionManager; var emptyFunc = function () {}; var _mat4_temp = math.mat4.create(); +var _typedArray_temp = new Float32Array(16); var _vec3_temp = math.vec3.create(); var _quat_temp = math.quat.create(); var _parents = []; @@ -919,6 +920,7 @@ var Node = cc.Class({ this._matrix = mathPools.mat4.get(); this._worldMatrix = mathPools.mat4.get(); + this._= new Float32Array(16); this._localMatDirty = false; this._worldMatDirty = false; this.setLocalDirty(); @@ -1877,6 +1879,31 @@ var Node = cc.Class({ return out; }, + _getWorldRT4Native() { + this.getWorldRT(_mat4_temp); + this._mat4ToArray(_typedArray_temp, _mat4_temp); + return _typedArray_temp; + }, + + _mat4ToArray(typedArray, mat4) { + typedArray[0] = mat4.m00; + typedArray[1] = mat4.m01; + typedArray[2] = mat4.m02; + typedArray[3] = mat4.m03; + typedArray[4] = mat4.m04; + typedArray[5] = mat4.m05; + typedArray[6] = mat4.m06; + typedArray[7] = mat4.m07; + typedArray[8] = mat4.m08; + typedArray[9] = mat4.m09; + typedArray[10] = mat4.m10; + typedArray[11] = mat4.m11; + typedArray[12] = mat4.m12; + typedArray[13] = mat4.m13; + typedArray[14] = mat4.m14; + typedArray[15] = mat4.m15; + }, + /** * !#en Set rotation by lookAt target point, normally used by Camera Node * !#zh 通过观察目标来设置 rotation,一般用于 Camera Node 上 @@ -2042,6 +2069,12 @@ var Node = cc.Class({ return math.mat4.copy(out, this._worldMatrix); }, + _getWorldMatrix4Native() { + this._updateWorldMatrix(); + this._mat4ToArray(_typedArray_temp, this._worldMatrix); + return _typedArray_temp; + }, + /** * !#en Converts a Point to node (local) space coordinates. The result is in Vec2. * !#zh 将一个点转换到节点 (局部) 坐标系。结果以 Vec2 为单位。 From 335da463c58bc5424601ec81aa0ca17c45f54a28 Mon Sep 17 00:00:00 2001 From: minggo Date: Mon, 16 Apr 2018 14:57:45 +0800 Subject: [PATCH 28/53] optimize performance --- jsb/gfx.js | 2 +- jsb/model.js | 6 +++--- jsb/renderer.js | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/jsb/gfx.js b/jsb/gfx.js index 37fb392ecc..233006ef1b 100644 --- a/jsb/gfx.js +++ b/jsb/gfx.js @@ -49,7 +49,7 @@ _p._ctor = function(device, options) { _p = gfx.VertexBuffer.prototype; _p._ctor = function(device, format, usage, data, numVertices) { - this.init(device, format, usage, data, numVertices); + this.init(device, format._nativeObj, usage, data, numVertices); }; cc.defineGetterSetter(_p, "count", _p.getCount); diff --git a/jsb/model.js b/jsb/model.js index cbf2698da5..5423ea5034 100644 --- a/jsb/model.js +++ b/jsb/model.js @@ -50,9 +50,9 @@ class Model { this._effects.push(effect); // - let defs = Object.create(null); - effect.extractDefines(defs); - this._defines.push(defs); + // let defs = Object.create(null); + // effect.extractDefines(defs); + // this._defines.push(defs); } clearEffects() { diff --git a/jsb/renderer.js b/jsb/renderer.js index a640f35187..57cdcd17bc 100644 --- a/jsb/renderer.js +++ b/jsb/renderer.js @@ -93,6 +93,32 @@ cc.defineGetterSetter(_p, "_count", _p.getCount, _p.setCount); // Scene _p = renderer.Scene.prototype; +_p.addModel = function(model) { + // var args = []; + // args.push(model._dynamicIA); + // args.push(model._viewID); + // args.push(model._node); + + // var inputAssemberls = model._inputAssemblers; + // args.push(inputAssemberls.length); + // for (var i = 0, len = inputAssemberls.length; i < len; ++i) { + // args.push(inputAssemberls[i]) + // } + + // var effects = model._effects; + // args.push(effects.length); + // for (var i = 0, len = effects.length; i < len; ++i) { + // args.push(effects[i]._nativeObj); + // } + + // FIXME: should handle the situation that, the length input assemblers or effects is greater than 1 + // this.addModelNative.apply(this, args); + this.addModelNative(model._dynamicIA, + model._viewID, + model._node, + model._inputAssemblers[0], + model._effects[0]._nativeObj); +} _p.removeModel = function() {} From da2506bb6fd0fca79be30869d18583ae3241deaa Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 16 Apr 2018 16:26:25 +0800 Subject: [PATCH 29/53] Update render-engine --- cocos2d/core/renderer/render-engine.js | 2 +- cocos2d/core/renderer/render-engine.jsb.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/renderer/render-engine.js b/cocos2d/core/renderer/render-engine.js index bb9888eeab..f85a340933 100644 --- a/cocos2d/core/renderer/render-engine.js +++ b/cocos2d/core/renderer/render-engine.js @@ -15056,7 +15056,7 @@ var Model$2 = renderer.Model; var InputAssembler$2 = renderer.InputAssembler; // Add stage to renderer -renderer.addStage('transparent'); +renderer.config.addStage('transparent'); var renderEngine = { // core classes diff --git a/cocos2d/core/renderer/render-engine.jsb.js b/cocos2d/core/renderer/render-engine.jsb.js index cb499b03fe..0f0ab97c5d 100644 --- a/cocos2d/core/renderer/render-engine.jsb.js +++ b/cocos2d/core/renderer/render-engine.jsb.js @@ -10045,7 +10045,7 @@ var Model = renderer.Model; var InputAssembler = renderer.InputAssembler; // Add stage to renderer -renderer.addStage('transparent'); +renderer.config.addStage('transparent'); var renderEngine = { // core classes From e7a1d59dccad5d7d658dc002b684b63ccde80726 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 16 Apr 2018 16:31:35 +0800 Subject: [PATCH 30/53] Remove useless typeof check --- cocos2d/core/CCNode.js | 4 ++-- cocos2d/core/event/event-target.js | 4 ++-- cocos2d/core/node-activator.js | 6 +++--- cocos2d/core/platform/CCInputManager.js | 2 +- cocos2d/core/platform/CCScreen.js | 2 +- cocos2d/core/platform/deserialize.js | 6 +++--- cocos2d/core/platform/js.js | 6 +++--- cocos2d/core/utils/base-node.js | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 147c2f80fe..e36d7f0d4c 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1521,7 +1521,7 @@ var Node = cc.Class({ */ setPosition (newPosOrX, y) { var x; - if (typeof y === 'undefined') { + if (y === undefined) { x = newPosOrX.x; y = newPosOrX.y; } @@ -1592,7 +1592,7 @@ var Node = cc.Class({ * node.setScale(1, 1); */ setScale (scaleX, scaleY) { - if (typeof scaleX === 'object') { + if (scaleY === undefined) { scaleY = scaleX.y; scaleX = scaleX.x; } diff --git a/cocos2d/core/event/event-target.js b/cocos2d/core/event/event-target.js index 75934a501d..765bf9084a 100644 --- a/cocos2d/core/event/event-target.js +++ b/cocos2d/core/event/event-target.js @@ -239,7 +239,7 @@ proto.hasEventListener = function (type, checkCapture) { */ proto.on = function (type, callback, target, useCapture) { // Accept also patameters like: (type, callback, useCapture) - if (typeof target === 'boolean') { + if (useCapture === undefined) { useCapture = target; target = undefined; } @@ -296,7 +296,7 @@ proto.on = function (type, callback, target, useCapture) { */ proto.off = function (type, callback, target, useCapture) { // Accept also patameters like: (type, callback, useCapture) - if (typeof target === 'boolean') { + if (useCapture === undefined) { useCapture = target; target = undefined; } diff --git a/cocos2d/core/node-activator.js b/cocos2d/core/node-activator.js index 9f6cc82c48..b91a806fe8 100644 --- a/cocos2d/core/node-activator.js +++ b/cocos2d/core/node-activator.js @@ -250,7 +250,7 @@ var NodeActivator = cc.Class({ if (cc.engine._isPlaying || comp.constructor._executeInEditMode) { if (!(comp._objFlags & IsPreloadStarted)) { comp._objFlags |= IsPreloadStarted; - if (typeof comp.__preload === 'function') { + if (comp.__preload) { if (preloadInvoker) { preloadInvoker.add(comp); } @@ -285,7 +285,7 @@ var NodeActivator = cc.Class({ } : function (comp, preloadInvoker, onLoadInvoker, onEnableInvoker) { if (!(comp._objFlags & IsPreloadStarted)) { comp._objFlags |= IsPreloadStarted; - if (typeof comp.__preload === 'function') { + if (comp.__preload) { if (preloadInvoker) { preloadInvoker.add(comp); } @@ -337,7 +337,7 @@ var NodeActivator = cc.Class({ }, resetComp: CC_EDITOR && function (comp) { - if (typeof comp.resetInEditor === 'function') { + if (comp.resetInEditor) { callResetInTryCatch(comp); } } diff --git a/cocos2d/core/platform/CCInputManager.js b/cocos2d/core/platform/CCInputManager.js index ac322a4afa..28d8963eb7 100644 --- a/cocos2d/core/platform/CCInputManager.js +++ b/cocos2d/core/platform/CCInputManager.js @@ -232,7 +232,7 @@ var inputManager = { var docElem = document.documentElement; var leftOffset = window.pageXOffset - docElem.clientLeft; var topOffset = window.pageYOffset - docElem.clientTop; - if (typeof element.getBoundingClientRect === 'function') { + if (element.getBoundingClientRect) { var box = element.getBoundingClientRect(); return { left: box.left + leftOffset, diff --git a/cocos2d/core/platform/CCScreen.js b/cocos2d/core/platform/CCScreen.js index 0a440f4d88..c6121bc5a9 100644 --- a/cocos2d/core/platform/CCScreen.js +++ b/cocos2d/core/platform/CCScreen.js @@ -92,7 +92,7 @@ cc.screen = /** @lends cc.screen# */{ } } - this._supportsFullScreen = (typeof this._fn.requestFullscreen !== 'undefined'); + this._supportsFullScreen = (this._fn.requestFullscreen !== undefined); this._touchEvent = ('ontouchstart' in window) ? 'touchstart' : 'mousedown'; }, diff --git a/cocos2d/core/platform/deserialize.js b/cocos2d/core/platform/deserialize.js index ecceabc55f..4959be674e 100644 --- a/cocos2d/core/platform/deserialize.js +++ b/cocos2d/core/platform/deserialize.js @@ -296,7 +296,7 @@ var _Deserializer = (function () { // 和 _deserializeObject 不同的地方在于会判断 id 和 uuid prototype._deserializeObjField = function (obj, jsonObj, propName, target, _stillUseUrl) { var id = jsonObj.__id__; - if (typeof id === 'undefined') { + if (id === undefined) { var uuid = jsonObj.__uuid__; if (uuid) { //if (ENABLE_TARGET) { @@ -413,7 +413,7 @@ var _Deserializer = (function () { for (var i = 0; i < fastDefinedProps.length; i++) { var propName = fastDefinedProps[i]; var prop = serialized[propName]; - if (typeof prop !== 'undefined' && serialized.hasOwnProperty(propName)) { + if (prop !== undefined && serialized.hasOwnProperty(propName)) { if (typeof prop !== 'object') { instance[propName] = prop; } @@ -612,7 +612,7 @@ var _Deserializer = (function () { prop = d[propNameToRead]; - if (typeof prop !== 'undefined') { + if (prop !== undefined) { var stillUseUrl = attrs[propName + SAVE_URL_AS_ASSET]; // function undefined object(null) string boolean number var defaultValue = CCClass.getDefault(attrs[propName + DEFAULT]); diff --git a/cocos2d/core/platform/js.js b/cocos2d/core/platform/js.js index 2862913ec7..a1323e274c 100644 --- a/cocos2d/core/platform/js.js +++ b/cocos2d/core/platform/js.js @@ -269,11 +269,11 @@ var tmpGetSetDesc = { * @param {Object} obj * @param {String} prop * @param {Function} getter - * @param {Function} setter + * @param {Function} [setter=null] * @param {Boolean} [enumerable=false] */ js.getset = function (obj, prop, getter, setter, enumerable) { - if (typeof setter !== 'function') { + if (enumerable === undefined) { enumerable = setter; setter = undefined; } @@ -897,7 +897,7 @@ js.array = { * constructor(size: number) */ function Pool (cleanupFunc, size) { - if (typeof cleanupFunc === 'number') { + if (size === undefined) { size = cleanupFunc; cleanupFunc = null; } diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 97f6762cc0..503e290ce2 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -311,7 +311,7 @@ var BaseNode = cc.Class({ * @param {String} [name] */ ctor (name) { - this._name = typeof name !== 'undefined' ? name : 'New Node'; + this._name = name !== undefined ? name : 'New Node'; this._activeInHierarchy = false; // Support for ActionManager and EventManager From a91179b58aa6820949723a705d7f154c8e62db83 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Mon, 16 Apr 2018 19:46:21 +0800 Subject: [PATCH 31/53] optimize transform --- cocos2d/core/CCNode.js | 102 ++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 38 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 147c2f80fe..5766941d74 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -58,6 +58,14 @@ var _quat_temp = math.quat.create(); var _parents = []; var _globalOrderOfArrival = 1; +const POSITION_DIRTY_FLAG = 1 << 0; +const SCALE_DIRTY_FLAG = 1 << 1; +const ROTATION_DIRTY_FLAG = 1 << 2; +const SKEW_DIRTY_FLAG = 1 << 3; +// rotation transform dirty +const RT_DIRTY_FLAG = SCALE_DIRTY_FLAG || ROTATION_DIRTY_FLAG || SKEW_DIRTY_FLAG; +const ALL_DIRTY_FLAG = 0xffff; + /** * !#en The event type supported by Node * !#zh Node 支持的事件类型 @@ -432,7 +440,7 @@ var Node = cc.Class({ } localPosition.x = value; - this.setLocalDirty(); + this.setLocalDirty(POSITION_DIRTY_FLAG); // fast check event var cache = this._hasListenerCache; @@ -475,7 +483,7 @@ var Node = cc.Class({ } localPosition.y = value; - this.setLocalDirty(); + this.setLocalDirty(POSITION_DIRTY_FLAG); // fast check event var cache = this._hasListenerCache; @@ -505,7 +513,7 @@ var Node = cc.Class({ if (value !== localPosition.z) { if (!CC_EDITOR || isFinite(value)) { localPosition.z = value; - this.setLocalDirty(); + this.setLocalDirty(POSITION_DIRTY_FLAG); } else { cc.error(ERR_INVALID_NUMBER, 'new z'); @@ -535,7 +543,7 @@ var Node = cc.Class({ this._rotationX = this._rotationY = value; // Update quaternion from rotation math.quat.fromEuler(this._quat, 0, 0, -value); - this.setLocalDirty(); + this.setLocalDirty(ROTATION_DIRTY_FLAG); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -568,7 +576,7 @@ var Node = cc.Class({ else { math.quat.fromEuler(this._quat, value, this._rotationY, 0); } - this.setLocalDirty(); + this.setLocalDirty(ROTATION_DIRTY_FLAG); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -601,7 +609,7 @@ var Node = cc.Class({ else { math.quat.fromEuler(this._quat, this._rotationX, value, 0); } - this.setLocalDirty(); + this.setLocalDirty(ROTATION_DIRTY_FLAG); var cache = this._hasListenerCache; if (cache && cache[ROTATION_CHANGED]) { @@ -636,7 +644,7 @@ var Node = cc.Class({ set (value) { if (this._scale.x !== value) { this._scale.x = value; - this.setLocalDirty(); + this.setLocalDirty(SCALE_DIRTY_FLAG); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -662,7 +670,7 @@ var Node = cc.Class({ set (value) { if (this._scale.y !== value) { this._scale.y = value; - this.setLocalDirty(); + this.setLocalDirty(SCALE_DIRTY_FLAG); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -687,7 +695,7 @@ var Node = cc.Class({ }, set (value) { this._skewX = value; - this.setLocalDirty(); + this.setLocalDirty(SKEW_DIRTY_FLAG); } }, @@ -706,7 +714,7 @@ var Node = cc.Class({ }, set (value) { this._skewY = value; - this.setLocalDirty(); + this.setLocalDirty(SKEW_DIRTY_FLAG); } }, @@ -919,9 +927,9 @@ var Node = cc.Class({ this._matrix = mathPools.mat4.get(); this._worldMatrix = mathPools.mat4.get(); - this._localMatDirty = false; + this._localMatDirty = 0; this._worldMatDirty = false; - this.setLocalDirty(); + this.setLocalDirty(ALL_DIRTY_FLAG); this._cullingMask = 1 << this.groupIndex; }, @@ -1550,7 +1558,7 @@ var Node = cc.Class({ else { return cc.error(ERR_INVALID_NUMBER, 'y of new position'); } - this.setLocalDirty(); + this.setLocalDirty(POSITION_DIRTY_FLAG); // fast check event var cache = this._hasListenerCache; @@ -1602,7 +1610,7 @@ var Node = cc.Class({ if (this._scale.x !== scaleX || this._scale.y !== scaleY) { this._scale.x = scaleX; this._scale.y = scaleY; - this.setLocalDirty(); + this.setLocalDirty(SCALE_DIRTY_FLAG); var cache = this._hasListenerCache; if (cache && cache[SCALE_CHANGED]) { @@ -1740,7 +1748,7 @@ var Node = cc.Class({ locAnchorPoint.x = point; locAnchorPoint.y = y; } - this.setLocalDirty(); + this.setLocalDirty(POSITION_DIRTY_FLAG); this.emit(ANCHOR_CHANGED); }, @@ -1807,7 +1815,7 @@ var Node = cc.Class({ else { math.vec3.copy(this._position, pos); } - this.setLocalDirty(); + this.setLocalDirty(POSITION_DIRTY_FLAG); // fast check event var cache = this._hasListenerCache; @@ -1894,10 +1902,14 @@ var Node = cc.Class({ }, _updateLocalMatrix () { - if (this._localMatDirty) { - // Update transform - let t = this._matrix; - //math.mat4.fromRTS(t, this._quat, this._position, this._scale); + let dirtyFlag = this._localMatDirty; + if (!dirtyFlag) return; + + // Update transform + let t = this._matrix; + //math.mat4.fromRTS(t, this._quat, this._position, this._scale); + + if (dirtyFlag & RT_DIRTY_FLAG) { let hasRotation = this._rotationX || this._rotationY; let hasSkew = this._skewX || this._skewY; let sx = this._scale.x, sy = this._scale.y; @@ -1945,14 +1957,15 @@ var Node = cc.Class({ t.m04 = 0; t.m05 = sy; } - // position - t.m12 = this._position.x; - t.m13 = this._position.y; - - this._localMatDirty = false; - // Register dirty status of world matrix so that it can be recalculated - this._worldMatDirty = true; } + + // position + t.m12 = this._position.x; + t.m13 = this._position.y; + + this._localMatDirty = 0; + // Register dirty status of world matrix so that it can be recalculated + this._worldMatDirty = true; }, _calculWorldMatrix () { @@ -1962,16 +1975,29 @@ var Node = cc.Class({ } // Assume parent world matrix is correct - if (this._parent) { - let pt = this._parent._worldMatrix; - let wt = this._worldMatrix; + let parent = this._parent; + if (parent) { + let pt = parent._worldMatrix; let t = this._matrix; - wt.m00 = t.m00 * pt.m00 + t.m01 * pt.m04; - wt.m01 = t.m00 * pt.m01 + t.m01 * pt.m05; - wt.m04 = t.m04 * pt.m00 + t.m05 * pt.m04; - wt.m05 = t.m04 * pt.m01 + t.m05 * pt.m05; - wt.m12 = t.m12 * pt.m00 + t.m13 * pt.m04 + pt.m12; - wt.m13 = t.m12 * pt.m01 + t.m13 * pt.m05 + pt.m13; + let wt = this._worldMatrix; + let aa=t.m00, ab=t.m01, ac=t.m04, ad=t.m05, atx=t.m12, aty=t.m13; + let ba=pt.m00, bb=pt.m01, bc=pt.m04, bd=pt.m05, btx=pt.m12, bty=pt.m13; + if (bb !== 0 || bc !== 0) { + wt.m00 = aa * ba + ab * bc; + wt.m01 = aa * bb + ab * bd; + wt.m04 = ac * ba + ad * bc; + wt.m05 = ac * bb + ad * bd; + wt.m12 = ba * atx + bc * aty + btx; + wt.m13 = bb * atx + bd * aty + bty; + } + else { + wt.m00 = aa * ba; + wt.m01 = ab * bd; + wt.m04 = ac * ba; + wt.m05 = ad * bd; + wt.m12 = ba * atx + btx; + wt.m13 = bd * aty + bty; + } } else { math.mat4.copy(this._worldMatrix, this._matrix); @@ -1993,11 +2019,11 @@ var Node = cc.Class({ } }, - setLocalDirty () { + setLocalDirty (flag) { if (!this._localMatDirty) { - this._localMatDirty = true; this.setWorldDirty(); } + this._localMatDirty = this._localMatDirty | flag; }, setWorldDirty () { From 27e02b247e397afeb697c1a2df540d9dca914aad Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Tue, 17 Apr 2018 09:34:03 +0800 Subject: [PATCH 32/53] minor fix --- cocos2d/core/CCNode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 5766941d74..afdb8c95b7 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -63,7 +63,7 @@ const SCALE_DIRTY_FLAG = 1 << 1; const ROTATION_DIRTY_FLAG = 1 << 2; const SKEW_DIRTY_FLAG = 1 << 3; // rotation transform dirty -const RT_DIRTY_FLAG = SCALE_DIRTY_FLAG || ROTATION_DIRTY_FLAG || SKEW_DIRTY_FLAG; +const RT_DIRTY_FLAG = SCALE_DIRTY_FLAG | ROTATION_DIRTY_FLAG | SKEW_DIRTY_FLAG; const ALL_DIRTY_FLAG = 0xffff; /** From b315831f8f39fa2696d96fd6e2d9d86a24f9748a Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 17 Apr 2018 10:22:16 +0800 Subject: [PATCH 33/53] Fix renderer.config.addStage issue in web --- cocos2d/core/renderer/render-engine.js | 8 +++++++- cocos2d/core/renderer/render-engine.jsb.js | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/renderer/render-engine.js b/cocos2d/core/renderer/render-engine.js index f85a340933..65f5b7585e 100644 --- a/cocos2d/core/renderer/render-engine.js +++ b/cocos2d/core/renderer/render-engine.js @@ -15056,7 +15056,13 @@ var Model$2 = renderer.Model; var InputAssembler$2 = renderer.InputAssembler; // Add stage to renderer -renderer.config.addStage('transparent'); +if (renderer.config) { + // JSB adaptation + renderer.config.addStage('transparent'); +} +else { + renderer.addStage('transparent'); +} var renderEngine = { // core classes diff --git a/cocos2d/core/renderer/render-engine.jsb.js b/cocos2d/core/renderer/render-engine.jsb.js index 0f0ab97c5d..c9607022ec 100644 --- a/cocos2d/core/renderer/render-engine.jsb.js +++ b/cocos2d/core/renderer/render-engine.jsb.js @@ -10045,7 +10045,13 @@ var Model = renderer.Model; var InputAssembler = renderer.InputAssembler; // Add stage to renderer -renderer.config.addStage('transparent'); +if (renderer.config) { + // JSB adaptation + renderer.config.addStage('transparent'); +} +else { + renderer.addStage('transparent'); +} var renderEngine = { // core classes From f892d5e6770cb983771e75be019d501fe152dc26 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 17 Apr 2018 10:31:09 +0800 Subject: [PATCH 34/53] Fix event target type check issue --- cocos2d/core/event/event-target.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/event/event-target.js b/cocos2d/core/event/event-target.js index 765bf9084a..75934a501d 100644 --- a/cocos2d/core/event/event-target.js +++ b/cocos2d/core/event/event-target.js @@ -239,7 +239,7 @@ proto.hasEventListener = function (type, checkCapture) { */ proto.on = function (type, callback, target, useCapture) { // Accept also patameters like: (type, callback, useCapture) - if (useCapture === undefined) { + if (typeof target === 'boolean') { useCapture = target; target = undefined; } @@ -296,7 +296,7 @@ proto.on = function (type, callback, target, useCapture) { */ proto.off = function (type, callback, target, useCapture) { // Accept also patameters like: (type, callback, useCapture) - if (useCapture === undefined) { + if (typeof target === 'boolean') { useCapture = target; target = undefined; } From 27f2bd412ceb75df47716a93187eaf8508317401 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 17 Apr 2018 10:36:34 +0800 Subject: [PATCH 35/53] Fix js.getset --- cocos2d/core/platform/js.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/platform/js.js b/cocos2d/core/platform/js.js index a1323e274c..1eb448b5a6 100644 --- a/cocos2d/core/platform/js.js +++ b/cocos2d/core/platform/js.js @@ -273,7 +273,7 @@ var tmpGetSetDesc = { * @param {Boolean} [enumerable=false] */ js.getset = function (obj, prop, getter, setter, enumerable) { - if (enumerable === undefined) { + if (typeof setter !== 'function') { enumerable = setter; setter = undefined; } From e7685fe44e01eb810d558fd32755ee8283e49b88 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Tue, 17 Apr 2018 10:58:23 +0800 Subject: [PATCH 36/53] optimize dynamic atlas --- .../renderer/utils/dynamic-atlas/atlas.js | 4 ++ .../renderer/utils/dynamic-atlas/manager.js | 60 ++++++++++++++----- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js index a8eb340ed6..56e5791e11 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js @@ -64,6 +64,10 @@ class Atlas { return true; } + + destroy () { + this._texture.destroy(); + } } module.exports = Atlas; diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js index da5d5ca843..18b132dfa9 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -3,35 +3,67 @@ const Atlas = require('./atlas'); let _atlases = []; let _atlasIndex = -1; -let _textureWidth = 2048; -let _textureHeight = 2048; +let _maxAtlasCount = 5; +let _textureSize = 2048; +let _maxFrameSize = 512; + +function newAtlas () { + let atlas = new Atlas(_textureSize, _textureSize); + _atlases.push(atlas); + _atlasIndex++; + return atlas; +} -let _maxFrameWidth = 512; -let _maxFrameHeight = 512; let dynamicAtlasManager = { enabled: true, - insertSpriteFrame (spriteFrame) { - if (!this.enabled || !spriteFrame || spriteFrame._oriInfo) return; + get maxAtlasCount () { + return _maxAtlasCount; + }, + set maxAtlasCount (value) { + _maxAtlasCount = value; + }, + + get textureSize () { + return _textureSize; + }, + set textureSize (value) { + _textureSize = value; + }, + + get maxFrameSize () { + return _maxFrameSize; + }, + set maxFrameSize (value) { + _maxFrameSize = value; + }, + + insertSpriteFrame (spriteFrame) { + if (!this.enabled || _atlasIndex === _maxAtlasCount || + !spriteFrame || spriteFrame._oriInfo) return; + let rect = spriteFrame._rect; - if (rect.width > _maxFrameWidth || rect.height > _maxFrameHeight) { + if (rect.width > _maxFrameSize || rect.height > _maxFrameSize) { return; } let atlas = _atlases[_atlasIndex]; if (!atlas) { - atlas = new Atlas(_textureWidth, _textureHeight); - _atlases.push(atlas); - _atlasIndex++; + atlas = newAtlas(); } - if (!atlas.insertSpriteFrame(spriteFrame)) { - atlas = new Atlas(_textureWidth, _textureHeight); - _atlases.push(atlas); - _atlasIndex++; + if (!atlas.insertSpriteFrame(spriteFrame) && _atlasIndex !== _maxAtlasCount) { + atlas = newAtlas(); atlas.insertSpriteFrame(spriteFrame); } + }, + + releaseAll () { + for (let i = 0, l = _atlases.length; i < l; i++) { + _atlases[i].destroy(); + } + _atlases.length = 0; } }; From 0da76270e3a9c14a1f701d0694a88c8dad736e70 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Tue, 17 Apr 2018 11:00:05 +0800 Subject: [PATCH 37/53] fixed indentation --- cocos2d/core/CCNode.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index afdb8c95b7..a84d7692e8 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1984,19 +1984,19 @@ var Node = cc.Class({ let ba=pt.m00, bb=pt.m01, bc=pt.m04, bd=pt.m05, btx=pt.m12, bty=pt.m13; if (bb !== 0 || bc !== 0) { wt.m00 = aa * ba + ab * bc; - wt.m01 = aa * bb + ab * bd; - wt.m04 = ac * ba + ad * bc; - wt.m05 = ac * bb + ad * bd; - wt.m12 = ba * atx + bc * aty + btx; - wt.m13 = bb * atx + bd * aty + bty; + wt.m01 = aa * bb + ab * bd; + wt.m04 = ac * ba + ad * bc; + wt.m05 = ac * bb + ad * bd; + wt.m12 = ba * atx + bc * aty + btx; + wt.m13 = bb * atx + bd * aty + bty; } else { wt.m00 = aa * ba; - wt.m01 = ab * bd; - wt.m04 = ac * ba; - wt.m05 = ad * bd; - wt.m12 = ba * atx + btx; - wt.m13 = bd * aty + bty; + wt.m01 = ab * bd; + wt.m04 = ac * ba; + wt.m05 = ad * bd; + wt.m12 = ba * atx + btx; + wt.m13 = bd * aty + bty; } } else { From a9790f608a2b842d2a9754fd27a2b71b364dfdfa Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 17 Apr 2018 14:54:01 +0800 Subject: [PATCH 38/53] Fix scale setting issue --- cocos2d/core/CCNode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 4f894e1390..c1db785026 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -1600,7 +1600,7 @@ var Node = cc.Class({ * node.setScale(1, 1); */ setScale (scaleX, scaleY) { - if (scaleY === undefined) { + if (scaleX && typeof scaleX !== 'number') { scaleY = scaleX.y; scaleX = scaleX.x; } From 01e6fcf943209cabb4c2398b51ebe6c064fd73f7 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 17 Apr 2018 18:31:19 +0800 Subject: [PATCH 39/53] Reduce performance.now invocation --- cocos2d/core/utils/profiler/CCProfiler.js | 24 ++++++++++++--------- cocos2d/core/utils/profiler/counter.js | 12 +++++------ cocos2d/core/utils/profiler/perf-counter.js | 18 ++++++++-------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/cocos2d/core/utils/profiler/CCProfiler.js b/cocos2d/core/utils/profiler/CCProfiler.js index 88487ea843..df367e65bb 100644 --- a/cocos2d/core/utils/profiler/CCProfiler.js +++ b/cocos2d/core/utils/profiler/CCProfiler.js @@ -121,8 +121,9 @@ function generateStats () { mode: { desc: cc.game.renderType === cc.game.RENDER_TYPE_WEBGL ? 'WebGL' : 'Canvas', min: 1 } }; + let now = performance.now(); for (let id in _stats) { - _stats[id]._counter = new PerfCounter(id, _stats[id]); + _stats[id]._counter = new PerfCounter(id, _stats[id], now); } } @@ -163,18 +164,20 @@ function generateNode () { function beforeUpdate () { generateNode(); - _stats['frame']._counter.start(); - _stats['logic']._counter.start(); + let now = cc.director._lastUpdate; + _stats['frame']._counter.start(now); + _stats['logic']._counter.start(now); } function afterUpdate () { + let now = performance.now(); if (cc.director.isPaused()) { - _stats['frame']._counter.start(); + _stats['frame']._counter.start(now); } else { - _stats['logic']._counter.end(); + _stats['logic']._counter.end(now); } - _stats['render']._counter.start(); + _stats['render']._counter.start(now); } function updateLabel (stat) { @@ -185,16 +188,17 @@ function updateLabel (stat) { } function afterDraw () { - _stats['render']._counter.end(); + let now = performance.now(); + _stats['render']._counter.end(now); _stats['draws']._counter.value = cc.renderer.drawCalls; - _stats['frame']._counter.end(); - _stats['fps']._counter.frame(); + _stats['frame']._counter.end(now); + _stats['fps']._counter.frame(now); let left = ''; let right = ''; for (let id in _stats) { let stat = _stats[id]; - stat._counter.sample(); + stat._counter.sample(now); left += stat.desc + '\n'; right += stat._counter.human() + '\n'; diff --git a/cocos2d/core/utils/profiler/counter.js b/cocos2d/core/utils/profiler/counter.js index 681e91c900..551619947f 100644 --- a/cocos2d/core/utils/profiler/counter.js +++ b/cocos2d/core/utils/profiler/counter.js @@ -1,5 +1,5 @@ class Counter { - constructor(id, opts) { + constructor(id, opts, now) { this._id = id; this._opts = opts || {}; @@ -8,15 +8,15 @@ class Counter { this._averageValue = 0; this._accumValue = 0; this._accumSamples = 0; - this._accumStart = window.performance.now(); + this._accumStart = now; } - _average(v) { + _average(v, now) { if (this._opts.average) { this._accumValue += v; ++this._accumSamples; - let t = performance.now(); + let t = now; if (t - this._accumStart >= this._opts.average) { this._averageValue = this._accumValue / this._accumSamples; this._accumValue = 0; @@ -31,8 +31,8 @@ class Counter { this._value = v; } - sample() { - this._average(this._value); + sample(now) { + this._average(this._value, now); } human() { diff --git a/cocos2d/core/utils/profiler/perf-counter.js b/cocos2d/core/utils/profiler/perf-counter.js index 8f8864b0aa..778810ec0a 100644 --- a/cocos2d/core/utils/profiler/perf-counter.js +++ b/cocos2d/core/utils/profiler/perf-counter.js @@ -1,25 +1,25 @@ const Counter = require('./counter'); class PerfCounter extends Counter { - constructor(id, opts) { - super(id, opts); + constructor(id, opts, now) { + super(id, opts, now); // DISABLE // this._idstart = `${id}_start`; // this._idend = `${id}_end`; - this._time = window.performance.now(); + this._time = now; } - start() { - this._time = window.performance.now(); + start(now) { + this._time = now; // DISABLE: long time running will cause performance drop down // window.performance.mark(this._idstart); } - end() { - this._value = window.performance.now() - this._time; + end(now) { + this._value = now - this._time; // DISABLE: long time running will cause performance drop down // window.performance.mark(this._idend); @@ -33,8 +33,8 @@ class PerfCounter extends Counter { this.start(); } - frame() { - let t = window.performance.now(); + frame(now) { + let t = now; let e = t - this._time; this._total++; let avg = this._opts.average || 1000; From d07dbc103f2401d08fd0ef5e7b27660da21ab0ee Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Tue, 17 Apr 2018 18:48:30 +0800 Subject: [PATCH 40/53] optimize dynamic atlas --- cocos2d/core/assets/CCRenderTexture.js | 20 +++ cocos2d/core/assets/CCSpriteFrame.js | 3 + cocos2d/core/components/CCLabel.js | 2 + cocos2d/core/components/CCMotionStreak.js | 1 + cocos2d/core/graphics/graphics.js | 1 + .../renderer/assemblers/sprite/bar-filled.js | 5 +- .../core/renderer/assemblers/sprite/index.js | 1 + .../core/renderer/assemblers/sprite/mesh.js | 9 +- .../assemblers/sprite/radial-filled.js | 7 +- .../core/renderer/assemblers/sprite/simple.js | 7 +- .../core/renderer/assemblers/sprite/sliced.js | 10 +- .../core/renderer/assemblers/sprite/tiled.js | 7 +- .../core/renderer/render-component-walker.js | 9 +- .../renderer/utils/dynamic-atlas/atlas.js | 108 ++++++++----- .../renderer/utils/dynamic-atlas/manager.js | 143 +++++++++++++++++- cocos2d/tilemap/CCTiledLayer.js | 3 +- 16 files changed, 269 insertions(+), 67 deletions(-) diff --git a/cocos2d/core/assets/CCRenderTexture.js b/cocos2d/core/assets/CCRenderTexture.js index 0d623bcba4..28e444b955 100644 --- a/cocos2d/core/assets/CCRenderTexture.js +++ b/cocos2d/core/assets/CCRenderTexture.js @@ -56,6 +56,26 @@ let RenderTexture = cc.Class({ this.emit("load"); }, + /** + * !#en Draw a texture to the specified position + * !#zh 将指定的图片渲染到指定的位置上 + * @param {Texture2D} texture + * @param {Number} x + * @param {Number} y + */ + drawTextureAt (texture, x, y) { + if (!texture._image) return; + + this._texture.updateSubImage({ + x, y, + image: texture._image, + width: texture.width, + height: texture.height, + level: 0, + flipY: false + }) + }, + /** * !#en * Get pixels from render texture, the pixels data stores in a RGBA Uint8Array. diff --git a/cocos2d/core/assets/CCSpriteFrame.js b/cocos2d/core/assets/CCSpriteFrame.js index 55d44c41cb..859ff57e15 100644 --- a/cocos2d/core/assets/CCSpriteFrame.js +++ b/cocos2d/core/assets/CCSpriteFrame.js @@ -158,6 +158,9 @@ var SpriteFrame = cc.Class(/** @lends cc.SpriteFrame# */{ this._texture = null; this._textureFilename = ''; + // store original info before packed to dynamic atlas + this._oriInfo = null; + if (CC_EDITOR) { // Atlas asset uuid this._atlasUuid = ''; diff --git a/cocos2d/core/components/CCLabel.js b/cocos2d/core/components/CCLabel.js index 8199e2a152..9ce192ad96 100644 --- a/cocos2d/core/components/CCLabel.js +++ b/cocos2d/core/components/CCLabel.js @@ -383,6 +383,7 @@ var Label = cc.Class({ this._fontAtlas = null; this._material = null; this._updateAssembler(); + this._activateMaterial(); this._updateRenderData(); }, type: cc.Font, @@ -469,6 +470,7 @@ var Label = cc.Class({ this._super(); this._updateAssembler(); + this._activateMaterial(); }, onDestroy () { diff --git a/cocos2d/core/components/CCMotionStreak.js b/cocos2d/core/components/CCMotionStreak.js index 282c4d0960..0ca7fc0faa 100644 --- a/cocos2d/core/components/CCMotionStreak.js +++ b/cocos2d/core/components/CCMotionStreak.js @@ -159,6 +159,7 @@ var MotionStreak = cc.Class({ set: function (value) { this._texture = value; this._material = null; + this._activateMaterial(); }, type: cc.Texture2D, animatable: false, diff --git a/cocos2d/core/graphics/graphics.js b/cocos2d/core/graphics/graphics.js index 91aae49813..f4c893e19b 100644 --- a/cocos2d/core/graphics/graphics.js +++ b/cocos2d/core/graphics/graphics.js @@ -176,6 +176,7 @@ let Graphics = cc.Class({ onEnable () { this._super(); + this._activateMaterial(); }, onDestroy () { diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index cca358fe17..1cece9e57e 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -27,10 +27,14 @@ const Sprite = require('../../../components/CCSprite'); const FillType = Sprite.FillType; const simpleRenderUtil = require('./simple'); +const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); module.exports = { useModel: false, updateRenderData (sprite) { + dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); + sprite._activateMaterial(); + let renderData = sprite._renderData; if (renderData && sprite._material) { let uvDirty = renderData.uvDirty, @@ -179,7 +183,6 @@ module.exports = { renderData.vertDirty = false; }, - packAtlas: simpleRenderUtil.packAtlas, updateWorldVerts: simpleRenderUtil.updateWorldVerts, createData: simpleRenderUtil.createData, fillBuffers: simpleRenderUtil.fillBuffers diff --git a/cocos2d/core/renderer/assemblers/sprite/index.js b/cocos2d/core/renderer/assemblers/sprite/index.js index ec63e88804..454c399a3f 100644 --- a/cocos2d/core/renderer/assemblers/sprite/index.js +++ b/cocos2d/core/renderer/assemblers/sprite/index.js @@ -24,6 +24,7 @@ ****************************************************************************/ const Sprite = require('../../../components/CCSprite'); +const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); const SpriteType = Sprite.Type; const FillType = Sprite.FillType; diff --git a/cocos2d/core/renderer/assemblers/sprite/mesh.js b/cocos2d/core/renderer/assemblers/sprite/mesh.js index 9650f56573..ddc3cd6820 100644 --- a/cocos2d/core/renderer/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/assemblers/sprite/mesh.js @@ -23,9 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -const simpleRenderUtil = require('./simple'); +const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); -module.exports = { + module.exports = { useModel: false, createData (sprite) { @@ -33,6 +33,9 @@ module.exports = { }, updateRenderData (sprite) { + dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); + sprite._activateMaterial(); + let renderData = sprite._renderData; let frame = sprite.spriteFrame; if (renderData && frame && sprite._material) { @@ -171,6 +174,4 @@ module.exports = { ibuf[indiceOffset++] = vertexId + triangles[i]; } }, - - packAtlas: simpleRenderUtil.packAtlas, }; \ No newline at end of file diff --git a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js index c9f76c4121..a3bc030d1d 100644 --- a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -const simpleRenderUtil = require('./simple'); +const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); const PI_2 = Math.PI * 2; @@ -43,6 +43,9 @@ module.exports = { }, updateRenderData (sprite) { + dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); + sprite._activateMaterial(); + let renderData = sprite._renderData; let spriteFrame = sprite._spriteFrame; if (renderData && frame && sprite._material) { @@ -345,6 +348,4 @@ module.exports = { ibuf[indiceOffset+i] = vertexId+i; } }, - - packAtlas: simpleRenderUtil.packAtlas, }; diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index a9a8505131..f7e79bd6ec 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -29,11 +29,10 @@ const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); module.exports = { useModel: false, - packAtlas (comp) { - dynamicAtlasManager.insertSpriteFrame(comp.spriteFrame); - }, - updateRenderData (sprite) { + dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); + sprite._activateMaterial(); + let renderData = sprite._renderData; if (renderData && sprite._material) { if (renderData.uvDirty) { diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index 1a4b031168..7c55c30bf1 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -24,10 +24,9 @@ ****************************************************************************/ const Sprite = require('../../../components/CCSprite'); +const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); const FillType = Sprite.FillType; -const simpleRenderUtil = require('./simple'); - module.exports = { useModel: false, @@ -42,7 +41,10 @@ module.exports = { return renderData; }, - updateRenderData (sprite) { + updateRenderData (sprite, batchData) { + dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); + sprite._activateMaterial(); + let renderData = sprite._renderData; if (renderData && sprite._material) { if (renderData.uvDirty) { @@ -192,6 +194,4 @@ module.exports = { } } }, - - packAtlas: simpleRenderUtil.packAtlas, }; diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index 74c6f8ae09..247daeeda3 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -const simpleRenderUtil = require('./simple'); +const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); module.exports = { useModel: false, @@ -33,6 +33,9 @@ module.exports = { }, updateRenderData (sprite) { + dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); + sprite._activateMaterial(); + let renderData = sprite._renderData; let material = sprite.getMaterial(); if (renderData && material) { @@ -209,6 +212,4 @@ module.exports = { vertexId += 4; } }, - - packAtlas: simpleRenderUtil.packAtlas, }; \ No newline at end of file diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index ab62f353b2..d5b8c09be4 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -28,6 +28,7 @@ const renderEngine = require('./render-engine'); const defaultVertexFormat = require('./vertex-format'); const StencilManager = require('./stencil-manager'); const hierarchyChain = require('./utils/hierarchy-chain'); +const atlasManager = require('./utils/dynamic-atlas/manager'); const gfx = renderEngine.gfx; const RecyclePool = renderEngine.RecyclePool; @@ -255,13 +256,6 @@ RenderComponentWalker.prototype = { broken = false, iaData = false; - if (assembler.packAtlas) { - assembler.packAtlas(comp); - } - if (comp._activateMaterial) { - comp._activateMaterial(); - } - // Update render data datas = assembler.updateRenderData(comp, batchData); @@ -373,6 +367,7 @@ RenderComponentWalker.prototype = { this._batchData.worldMatUpdated = false; } + atlasManager.update(); this._flush(); this._uploadData(); } diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js index 56e5791e11..7e52877e6d 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js @@ -2,21 +2,11 @@ const space = 1; class Atlas { constructor (width, height) { - let canvas = document.createElement("canvas"); - canvas.style.width = canvas.width = width; - canvas.style.height = canvas.height = height; - - // comment out this to show atlas - // document.body.appendChild(canvas) - - let ctx = canvas.getContext('2d'); - - let texture = new cc.Texture2D(); - texture.initWithElement(canvas); + let texture = new cc.RenderTexture(); + texture.initWithSize(width, height); texture.handleLoadedTexture(); - + this._texture = texture; - this._ctx = ctx; this._x = space; this._y = space; @@ -24,48 +14,94 @@ class Atlas { this._width = width; this._height = height; + + this._innerTextureInfos = {}; + this._innerSpriteFrames = []; } insertSpriteFrame (spriteFrame) { - let rect = spriteFrame._rect; - let sx = rect.x, sy = rect.y, width = rect.width, height = rect.height; + let rect = spriteFrame._rect, + texture = spriteFrame._texture, + info = this._innerTextureInfos[texture.__instanceId]; - if ((this._x + width) > this._width) { - this._x = space; - this._y = this._nexty; + let sx = rect.x, sy = rect.y; + + if (info) { + rect.x += info.x; + rect.y += info.y; } + else { + let width = texture.width, height = texture.height; - if ((this._y + height) > this._nexty) { - this._nexty = this._y + height; + if ((this._x + width) > this._width) { + this._x = space; + this._y = this._nexty; + } + + if ((this._y + height) > this._nexty) { + this._nexty = this._y + height; + } + + if (this._nexty > this._height) { + return false; + } + + this._texture.drawTextureAt(texture, this._x, this._y); + + this._innerTextureInfos[texture.__instanceId] = { + x: this._x, + y: this._y, + texture: texture + }; + + rect.x += this._x; + rect.y += this._y; + + this._x += width; + + this._dirty = true; + this._texture.handleLoadedTexture(); } - if (this._nexty > this._height) { - return false; - } - - this._ctx.drawImage(spriteFrame._texture._image, - sx, sy, rect.width, rect.height, - this._x, this._y, rect.width, rect.height, - ); - spriteFrame._oriInfo = { x: sx, - y: sy + y: sy, + texture: spriteFrame._texture } - rect.x = this._x; - rect.y = this._y; - - this._x += width; - spriteFrame._texture = this._texture; - this._texture.handleLoadedTexture(); + this._innerSpriteFrames.push(spriteFrame); return true; } + update () { + if (!this._dirty) return; + this._texture.handleLoadedTexture(); + this._dirty = false; + } + + reset () { + this._x = space; + this._y = space; + this._nexty = space; + + let frames = this._innerSpriteFrames; + for (let i = 0, l = frames.length; i < l; i++) { + let frame = frames[i]; + let oriInfo = frame._oriInfo; + frame._rect.x = oriInfo.x; + frame._rect.y = oriInfo.y; + frame._texture = oriInfo.texture; + frame._oriInfo = null; + } + this._innerSpriteFrames.length = 0; + this._innerTextureInfos = {}; + } + destroy () { + this.reset(); this._texture.destroy(); } } diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js index 18b132dfa9..808c2339fa 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -7,6 +7,10 @@ let _maxAtlasCount = 5; let _textureSize = 2048; let _maxFrameSize = 512; +let _enabled = false; + +let _debugNode = null; + function newAtlas () { let atlas = new Atlas(_textureSize, _textureSize); _atlases.push(atlas); @@ -15,9 +19,37 @@ function newAtlas () { } +/** + * !#en Manager the dynamic atlas. + * !#zh 管理动态图集。 + * @class DynamicAtlasManager + */ let dynamicAtlasManager = { - enabled: true, + + /** + * !#en Enabled or Disabled dynamic atlas. + * !#zh 开启或者关闭动态图集。 + * @property enabled + * @type {Boolean} + */ + get enabled () { + return _enabled; + }, + set enabled (value) { + if (_enabled === value) return; + if (value) { + this.reset(); + } + _enabled = value; + }, + + /** + * !#en The maximum number of atlas that can be created. + * !#zh 可以创建的最大图集数量。 + * @property maxAtlasCount + * @type {Number} + */ get maxAtlasCount () { return _maxAtlasCount; }, @@ -25,6 +57,12 @@ let dynamicAtlasManager = { _maxAtlasCount = value; }, + /** + * !#en The size of the atlas that was created + * !#zh 创建的图集的宽高 + * @property textureSize + * @type {Number} + */ get textureSize () { return _textureSize; }, @@ -32,6 +70,12 @@ let dynamicAtlasManager = { _textureSize = value; }, + /** + * !#en The maximum size of the picture that can be added to the atlas. + * !#zh 可以添加进图集的图片的最大尺寸。 + * @property maxFrameSize + * @type {Number} + */ get maxFrameSize () { return _maxFrameSize; }, @@ -39,7 +83,14 @@ let dynamicAtlasManager = { _maxFrameSize = value; }, + /** + * !#en Append a sprite frame into the dynamic atlas. + * !#zh 添加碎图进入动态图集。 + * @method insertSpriteFrame + * @param {SpriteFrame} spriteFrame + */ insertSpriteFrame (spriteFrame) { + if (CC_EDITOR) return; if (!this.enabled || _atlasIndex === _maxAtlasCount || !spriteFrame || spriteFrame._oriInfo) return; @@ -59,12 +110,100 @@ let dynamicAtlasManager = { } }, + /** + * !#en Resets all dynamic atlas, and the existing ones are not destroyed, but are reused. + * !#zh 重置所有动态图集,已有的动态图集并不会被销毁,而是会被复用。 + * @method reset + */ + reset () { + for (let i = 0; i <= _atlasIndex; i++) { + _atlases[i].reset(); + } + _atlasIndex = -1; + }, + + /** + * !#en Releases all dynamic atlas, which are destroyed. + * !#zh 释放所有动态图集,这些图集会被销毁掉。 + * @method releaseAll + */ releaseAll () { for (let i = 0, l = _atlases.length; i < l; i++) { _atlases[i].destroy(); } _atlases.length = 0; - } + _atlasIndex = -1; + }, + + /** + * !#en Displays all the dynamic atlas in the current scene, which you can use to view the current atlas state. + * !#zh 在当前场景中显示所有动态图集,可以用来查看当前的合图状态。 + * @method showDebug + * @param {Boolean} show + */ + showDebug: CC_DEV && function (show) { + if (show) { + if (!_debugNode) { + let width = cc.visibleRect.width; + let height = cc.visibleRect.height; + + _debugNode = new cc.Node('DYNAMIC_ATLAS_DEBUG_NODE'); + _debugNode.width = width; + _debugNode.height = height; + _debugNode.x = width/2; + _debugNode.y = height/2; + _debugNode._zIndex = cc.macro.MAX_ZINDEX; + _debugNode.parent = cc.director.getScene(); + + let scroll = _debugNode.addComponent(cc.ScrollView); + + let content = new cc.Node('CONTENT'); + let layout = content.addComponent(cc.Layout); + layout.type = cc.Layout.Type.VERTICAL; + layout.resizeMode = cc.Layout.ResizeMode.CONTAINER; + content.parent = _debugNode; + + for (let i = 0; i <= _atlasIndex; i++) { + let node = new cc.Node('ATLAS'); + + let texture = _atlases[i]._texture; + let spriteFrame = new cc.SpriteFrame(); + spriteFrame.setTexture(_atlases[i]._texture); + + let sprite = node.addComponent(cc.Sprite) + sprite.spriteFrame = spriteFrame; + sprite.sizeMode = cc.Sprite.SizeMode.CUSTOM; + + node.width = height; + node.height = height; + + node.parent = content; + } + } + } + else { + if (_debugNode) { + _debugNode.parent = null; + _debugNode = null; + } + } + }, + + update () { + if (!this.enabled) return; + + for (let i = 0; i <= _atlasIndex; i++) { + _atlases[i].update(); + } + }, }; +/** + * @module cc + */ + +/** + * @property dynamicAtlasManager + * @type DynamicAtlasManager + */ module.exports = cc.dynamicAtlasManager = dynamicAtlasManager; \ No newline at end of file diff --git a/cocos2d/tilemap/CCTiledLayer.js b/cocos2d/tilemap/CCTiledLayer.js index 92e21fed3a..75f4378d4e 100644 --- a/cocos2d/tilemap/CCTiledLayer.js +++ b/cocos2d/tilemap/CCTiledLayer.js @@ -386,9 +386,8 @@ let TiledLayer = cc.Class({ * tiledLayer.setTexture(texture); */ setTexture (texture){ - if (this._texture === texture) return; this._texture = texture; - this._material = null; + this._activateMaterial(); }, /** From 441d88f8747d772971a1768fc07d719847945de2 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Tue, 17 Apr 2018 18:50:35 +0800 Subject: [PATCH 41/53] minor fixed --- cocos2d/core/components/CCMotionStreak.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos2d/core/components/CCMotionStreak.js b/cocos2d/core/components/CCMotionStreak.js index 0ca7fc0faa..24623e2b80 100644 --- a/cocos2d/core/components/CCMotionStreak.js +++ b/cocos2d/core/components/CCMotionStreak.js @@ -210,6 +210,7 @@ var MotionStreak = cc.Class({ onEnable: function () { this._super(); + this._activateMaterial(); this.reset(); }, From b39a949aa3869f9f3c7e1de56e5696280f0bbb62 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Tue, 17 Apr 2018 21:32:13 +0800 Subject: [PATCH 42/53] minor fixed --- cocos2d/core/renderer/utils/dynamic-atlas/manager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js index 808c2339fa..37b7f8eacc 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -94,8 +94,8 @@ let dynamicAtlasManager = { if (!this.enabled || _atlasIndex === _maxAtlasCount || !spriteFrame || spriteFrame._oriInfo) return; - let rect = spriteFrame._rect; - if (rect.width > _maxFrameSize || rect.height > _maxFrameSize) { + let texture = spriteFrame._texture; + if (texture.width > _maxFrameSize || texture.height > _maxFrameSize) { return; } From abc4b0b5daf245191219baada6d3bad5d02f414e Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Wed, 18 Apr 2018 11:36:31 +0800 Subject: [PATCH 43/53] optimize dynamic atlas --- cocos2d/core/assets/CCSpriteFrame.js | 2 +- .../renderer/assemblers/sprite/bar-filled.js | 14 +++++++++++--- cocos2d/core/renderer/assemblers/sprite/mesh.js | 15 +++++++++++---- .../renderer/assemblers/sprite/radial-filled.js | 15 +++++++++++---- .../core/renderer/assemblers/sprite/simple.js | 14 +++++++++++--- .../core/renderer/assemblers/sprite/sliced.js | 14 +++++++++++--- .../core/renderer/assemblers/sprite/tiled.js | 17 ++++++++++++----- .../core/renderer/utils/dynamic-atlas/atlas.js | 11 +++++------ .../renderer/utils/dynamic-atlas/manager.js | 4 ++-- 9 files changed, 75 insertions(+), 31 deletions(-) diff --git a/cocos2d/core/assets/CCSpriteFrame.js b/cocos2d/core/assets/CCSpriteFrame.js index 859ff57e15..259f329e5b 100644 --- a/cocos2d/core/assets/CCSpriteFrame.js +++ b/cocos2d/core/assets/CCSpriteFrame.js @@ -159,7 +159,7 @@ var SpriteFrame = cc.Class(/** @lends cc.SpriteFrame# */{ this._textureFilename = ''; // store original info before packed to dynamic atlas - this._oriInfo = null; + this._original = null; if (CC_EDITOR) { // Atlas asset uuid diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index 1cece9e57e..a81e46ed51 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -32,11 +32,19 @@ const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); module.exports = { useModel: false, updateRenderData (sprite) { - dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); - sprite._activateMaterial(); + let frame = sprite.spriteFrame; + + // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + if (!sprite._material && frame) { + // 尽可能避免函数调用的开销 + if (!frame._original) { + dynamicAtlasManager.insertSpriteFrame(frame); + } + sprite._activateMaterial(); + } let renderData = sprite._renderData; - if (renderData && sprite._material) { + if (renderData && frame) { let uvDirty = renderData.uvDirty, vertDirty = renderData.vertDirty; diff --git a/cocos2d/core/renderer/assemblers/sprite/mesh.js b/cocos2d/core/renderer/assemblers/sprite/mesh.js index ddc3cd6820..6444bec59f 100644 --- a/cocos2d/core/renderer/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/assemblers/sprite/mesh.js @@ -33,12 +33,19 @@ const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); }, updateRenderData (sprite) { - dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); - sprite._activateMaterial(); + let frame = sprite.spriteFrame; + + // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + if (!sprite._material && frame) { + // 尽可能避免函数调用的开销 + if (!frame._original) { + dynamicAtlasManager.insertSpriteFrame(frame); + } + sprite._activateMaterial(); + } let renderData = sprite._renderData; - let frame = sprite.spriteFrame; - if (renderData && frame && sprite._material) { + if (renderData && frame) { let vertices = frame.vertices; if (vertices) { if (renderData.vertexCount !== vertices.x.length) { diff --git a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js index a3bc030d1d..8221a17b8f 100644 --- a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js @@ -43,12 +43,19 @@ module.exports = { }, updateRenderData (sprite) { - dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); - sprite._activateMaterial(); + let frame = sprite.spriteFrame; + + // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + if (!sprite._material && frame) { + // 尽可能避免函数调用的开销 + if (!frame._original) { + dynamicAtlasManager.insertSpriteFrame(frame); + } + sprite._activateMaterial(); + } let renderData = sprite._renderData; - let spriteFrame = sprite._spriteFrame; - if (renderData && frame && sprite._material) { + if (renderData && frame) { if (renderData.vertDirty || renderData.uvDirty) { let data = renderData._data; diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index f7e79bd6ec..59e50650d2 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -30,11 +30,19 @@ module.exports = { useModel: false, updateRenderData (sprite) { - dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); - sprite._activateMaterial(); + let frame = sprite.spriteFrame; + + // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + if (!sprite._material && frame) { + // 尽可能避免函数调用的开销 + if (!frame._original) { + dynamicAtlasManager.insertSpriteFrame(frame); + } + sprite._activateMaterial(); + } let renderData = sprite._renderData; - if (renderData && sprite._material) { + if (renderData && frame) { if (renderData.uvDirty) { this.updateUVs(sprite); } diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index 7c55c30bf1..21186d1698 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -42,11 +42,19 @@ module.exports = { }, updateRenderData (sprite, batchData) { - dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); - sprite._activateMaterial(); + let frame = sprite.spriteFrame; + + // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + if (!sprite._material && frame) { + // 尽可能避免函数调用的开销 + if (!frame._original) { + dynamicAtlasManager.insertSpriteFrame(frame); + } + sprite._activateMaterial(); + } let renderData = sprite._renderData; - if (renderData && sprite._material) { + if (renderData) { if (renderData.uvDirty) { this.updateUVs(sprite); } diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index 247daeeda3..33518f4e40 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -33,14 +33,21 @@ module.exports = { }, updateRenderData (sprite) { - dynamicAtlasManager.insertSpriteFrame(sprite.spriteFrame); - sprite._activateMaterial(); + let frame = sprite.spriteFrame; + + // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + if (!sprite._material && frame) { + // 尽可能避免函数调用的开销 + if (!frame._original) { + dynamicAtlasManager.insertSpriteFrame(frame); + } + sprite._activateMaterial(); + } let renderData = sprite._renderData; - let material = sprite.getMaterial(); - if (renderData && material) { + if (renderData) { if (renderData.uvDirty || renderData.vertDirty) { - let texture = material.effect.getProperty('texture'); + let texture = frame._texture; let texw = texture._width, texh = texture._height; let frame = sprite.spriteFrame; diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js index 7e52877e6d..ae4d04de6c 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js @@ -4,7 +4,7 @@ class Atlas { constructor (width, height) { let texture = new cc.RenderTexture(); texture.initWithSize(width, height); - texture.handleLoadedTexture(); + texture.update(); this._texture = texture; @@ -60,10 +60,9 @@ class Atlas { this._x += width; this._dirty = true; - this._texture.handleLoadedTexture(); } - spriteFrame._oriInfo = { + spriteFrame._original = { x: sx, y: sy, texture: spriteFrame._texture @@ -78,7 +77,7 @@ class Atlas { update () { if (!this._dirty) return; - this._texture.handleLoadedTexture(); + this._texture.update(); this._dirty = false; } @@ -90,11 +89,11 @@ class Atlas { let frames = this._innerSpriteFrames; for (let i = 0, l = frames.length; i < l; i++) { let frame = frames[i]; - let oriInfo = frame._oriInfo; + let oriInfo = frame._original; frame._rect.x = oriInfo.x; frame._rect.y = oriInfo.y; frame._texture = oriInfo.texture; - frame._oriInfo = null; + frame._original = null; } this._innerSpriteFrames.length = 0; this._innerTextureInfos = {}; diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js index 37b7f8eacc..6363a06638 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -5,7 +5,7 @@ let _atlasIndex = -1; let _maxAtlasCount = 5; let _textureSize = 2048; -let _maxFrameSize = 512; +let _maxFrameSize = 256; let _enabled = false; @@ -92,7 +92,7 @@ let dynamicAtlasManager = { insertSpriteFrame (spriteFrame) { if (CC_EDITOR) return; if (!this.enabled || _atlasIndex === _maxAtlasCount || - !spriteFrame || spriteFrame._oriInfo) return; + !spriteFrame || spriteFrame._original) return; let texture = spriteFrame._texture; if (texture.width > _maxFrameSize || texture.height > _maxFrameSize) { From 2ed79ae029c9e9811b66893147d4e7f948342793 Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Wed, 18 Apr 2018 11:53:22 +0800 Subject: [PATCH 44/53] minor fixed --- cocos2d/core/components/CCSprite.js | 1 + cocos2d/core/renderer/utils/dynamic-atlas/manager.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index 3158b33506..38d76565e9 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -464,6 +464,7 @@ var Sprite = cc.Class({ * @param state {Sprite.State} NORMAL or GRAY State. */ setState: function (state) { + if (this._state === state) return; this._state = state; this._material = null; }, diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js index 6363a06638..9cefdb9fab 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -163,6 +163,8 @@ let dynamicAtlasManager = { layout.resizeMode = cc.Layout.ResizeMode.CONTAINER; content.parent = _debugNode; + scroll.content = content; + for (let i = 0; i <= _atlasIndex; i++) { let node = new cc.Node('ATLAS'); From d6f15a3e77ff183fc54d676153a7b14cb859aaca Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 17 Apr 2018 21:20:06 +0800 Subject: [PATCH 45/53] Support build native with native renderer option --- cocos2d/core/renderer/index.js | 2 +- gulp/tasks/engine.js | 16 ++++++++++------ gulp/util/utils.js | 2 +- jsb/index.js | 7 +++++-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/cocos2d/core/renderer/index.js b/cocos2d/core/renderer/index.js index 0252800d8d..da436ae34d 100644 --- a/cocos2d/core/renderer/index.js +++ b/cocos2d/core/renderer/index.js @@ -66,7 +66,7 @@ module.exports = { this.Texture2D = renderEngine.Texture2D; this.canvas = canvas; - if (CC_JSB) { + if (CC_JSB && CC_NATIVERENDERER) { // native codes will create an instance of Device, so just use the global instance. this.device = window.device; } diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index dbf5345cbe..1ffc28caab 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -213,9 +213,11 @@ exports.buildJsb = function (sourceFile, outputFile, excludes, opt_macroFlags, c var outFile = Path.basename(outputFile); var outDir = Path.dirname(outputFile); - var bundler = createBundler(sourceFile, { - aliasifyConfig: aliasifyConfig - }); + var opts = {}; + if (opt_macroFlags.nativeRenderer) { + opts.aliasifyConfig = aliasifyConfig; + } + var bundler = createBundler(sourceFile, opts); excludes = excludes.concat(jsbSkipModules); excludes.forEach(function (module) { bundler.ignore(require.resolve(module)); @@ -245,9 +247,11 @@ exports.buildJsbMin = function (sourceFile, outputFile, excludes, opt_macroFlags var outFile = Path.basename(outputFile); var outDir = Path.dirname(outputFile); - var bundler = createBundler(sourceFile, { - aliasifyConfig: aliasifyConfig - }); + var opts = {}; + if (opt_macroFlags.nativeRenderer) { + opts.aliasifyConfig = aliasifyConfig; + } + var bundler = createBundler(sourceFile, opts); excludes = excludes.concat(jsbSkipModules); excludes.forEach(function (module) { bundler.ignore(require.resolve(module)); diff --git a/gulp/util/utils.js b/gulp/util/utils.js index 45774f5c61..cbbfef7622 100644 --- a/gulp/util/utils.js +++ b/gulp/util/utils.js @@ -1,6 +1,6 @@ const PLATFORM_MACROS = ['CC_EDITOR', 'CC_PREVIEW', 'CC_BUILD', 'CC_TEST']; -const FLAGS = ['jsb', 'wechatgame', 'qqplay', 'debug']; +const FLAGS = ['jsb', 'wechatgame', 'qqplay', 'debug', 'nativeRenderer']; // generate macros for uglify's global_defs // available platforms: 'editor' | 'preview' | 'build' | 'test' diff --git a/jsb/index.js b/jsb/index.js index b1c7f029ed..61e8012370 100644 --- a/jsb/index.js +++ b/jsb/index.js @@ -22,8 +22,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -require('./gfx'); -require('./renderer'); + +if (CC_NATIVERENDERER) { + require('./gfx'); + require('./renderer'); +} require('../index') require('./jsb-audio') require('./jsb-loader') From 58c87a8d58726c18af6e694e1813da465947c84a Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Wed, 18 Apr 2018 15:49:44 +0800 Subject: [PATCH 46/53] fixed issues --- cocos2d/core/assets/CCTexture2D.js | 3 - .../renderer/assemblers/sprite/bar-filled.js | 56 +++++++++++++++++-- .../assemblers/sprite/radial-filled.js | 2 +- .../core/renderer/assemblers/sprite/simple.js | 2 - .../core/renderer/assemblers/sprite/sliced.js | 24 +++++--- .../core/renderer/assemblers/sprite/tiled.js | 11 +--- .../renderer/utils/dynamic-atlas/atlas.js | 3 + .../renderer/utils/dynamic-atlas/manager.js | 9 ++- 8 files changed, 81 insertions(+), 29 deletions(-) diff --git a/cocos2d/core/assets/CCTexture2D.js b/cocos2d/core/assets/CCTexture2D.js index ab17030026..fb45d17a63 100644 --- a/cocos2d/core/assets/CCTexture2D.js +++ b/cocos2d/core/assets/CCTexture2D.js @@ -362,9 +362,6 @@ var Texture2D = cc.Class({ this._image = options.images[0]; } else if (options.image !== undefined) { - // Release previous gl texture if existed - this._texture.destroy(); - this._image = options.image; if (!options.images) { _images.length = 0; diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index a81e46ed51..b520defdff 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -26,7 +26,6 @@ const Sprite = require('../../../components/CCSprite'); const FillType = Sprite.FillType; -const simpleRenderUtil = require('./simple'); const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); module.exports = { @@ -191,7 +190,56 @@ module.exports = { renderData.vertDirty = false; }, - updateWorldVerts: simpleRenderUtil.updateWorldVerts, - createData: simpleRenderUtil.createData, - fillBuffers: simpleRenderUtil.fillBuffers + createData (sprite) { + let renderData = sprite.requestRenderData(); + // 0-4 for world verts + // 5-8 for local verts + renderData.dataLength = 8; + renderData.vertexCount = 4; + renderData.indiceCount = 6; + return renderData; + }, + + updateWorldVerts (sprite) { + let node = sprite.node, + data = sprite._renderData._data; + + let matrix = node._worldMatrix, + a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, + tx = matrix.m12, ty = matrix.m13; + + for (let i = 0; i < 4; i++) { + let local = data[i+4]; + let world = data[i]; + world.x = local.x * a + local.y * c + tx; + world.y = local.x * b + local.y * d + ty; + } + }, + + fillBuffers (sprite, batchData, vertexId, vbuf, uintbuf, ibuf) { + let vertexOffset = batchData.byteOffset / 4, + indiceOffset = batchData.indiceOffset; + + let data = sprite._renderData._data; + let node = sprite.node; + let z = node._position.z; + let color = node._color._val; + + for (let i = 0; i < 4; i++) { + let vert = data[i]; + vbuf[vertexOffset ++] = vert.x; + vbuf[vertexOffset ++] = vert.y; + vbuf[vertexOffset ++] = z; + uintbuf[vertexOffset ++] = color; + vbuf[vertexOffset ++] = vert.u; + vbuf[vertexOffset ++] = vert.v; + } + + ibuf[indiceOffset ++] = vertexId; + ibuf[indiceOffset ++] = vertexId + 1; + ibuf[indiceOffset ++] = vertexId + 2; + ibuf[indiceOffset ++] = vertexId + 1; + ibuf[indiceOffset ++] = vertexId + 3; + ibuf[indiceOffset ++] = vertexId + 2; + } }; diff --git a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js index 8221a17b8f..aba4b47f93 100644 --- a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js @@ -77,7 +77,7 @@ module.exports = { //build vertices this._calculateVertices(sprite); //build uvs - this._calculateUVs(spriteFrame); + this._calculateUVs(frame); let center = this._center; diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index 59e50650d2..a1c6751d53 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -86,8 +86,6 @@ module.exports = { createData (sprite) { let renderData = sprite.requestRenderData(); - // 0-4 for world verts - // 5-8 for local verts renderData.dataLength = 4; renderData.vertexCount = 4; renderData.indiceCount = 6; diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index 21186d1698..5909d70a19 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -54,7 +54,7 @@ module.exports = { } let renderData = sprite._renderData; - if (renderData) { + if (renderData && frame) { if (renderData.uvDirty) { this.updateUVs(sprite); } @@ -109,6 +109,17 @@ module.exports = { data[1].v = (topHeight + centerHeight + rect.y) / atlasHeight; data[0].v = (rect.y + rect.height) / atlasHeight; } + + for (let row = 0; row < 4; ++row) { + let rowD = data[row]; + for (let col = 0; col < 4; ++col) { + let colD = data[col]; + let world = data[4 + row*4 + col]; + world.u = colD.u; + world.v = rowD.v; + } + } + renderData.uvDirty = false; }, @@ -167,7 +178,7 @@ module.exports = { uintbuf[vertexOffset + 3] = color; vertexOffset += 6; } - + for (let r = 0; r < 3; ++r) { for (let c = 0; c < 3; ++c) { let start = vertexId + r*4 + c; @@ -183,11 +194,10 @@ module.exports = { updateWorldVerts (sprite) { let node = sprite.node, - renderData = sprite._renderData, - data = renderData._data; + data = sprite._renderData._data; - let matrix = node._worldMatrix; - let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, + let matrix = node._worldMatrix, + a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, tx = matrix.m12, ty = matrix.m13; for (let row = 0; row < 4; ++row) { @@ -197,8 +207,6 @@ module.exports = { let world = data[4 + row*4 + col]; world.x = colD.x*a + rowD.y*c + tx; world.y = colD.x*b + rowD.y*d + ty; - world.u = colD.u; - world.v = rowD.v; } } }, diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index 33518f4e40..186afdf70f 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -45,12 +45,11 @@ module.exports = { } let renderData = sprite._renderData; - if (renderData) { + if (renderData && frame) { if (renderData.uvDirty || renderData.vertDirty) { let texture = frame._texture; let texw = texture._width, texh = texture._height; - let frame = sprite.spriteFrame; let rect = frame._rect; let node = sprite.node, @@ -156,12 +155,8 @@ module.exports = { col = Math.ceil(hRepeat); let matrix = node._worldMatrix; - let a = matrix.m00, - b = matrix.m01, - c = matrix.m04, - d = matrix.m05, - tx = matrix.m12, - ty = matrix.m13; + let a = matrix.m00, b = matrix.m01, c = matrix.m04, d = matrix.m05, + tx = matrix.m12, ty = matrix.m13; let x, x1, y, y1, lastx, lasty; for (let yindex = 0, ylength = row; yindex < ylength; ++yindex) { diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js index ae4d04de6c..e2bf17eae4 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/atlas.js @@ -89,6 +89,9 @@ class Atlas { let frames = this._innerSpriteFrames; for (let i = 0, l = frames.length; i < l; i++) { let frame = frames[i]; + if (!frame.isValid) { + continue; + } let oriInfo = frame._original; frame._rect.x = oriInfo.x; frame._rect.y = oriInfo.y; diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js index 9cefdb9fab..55f4869cfb 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -162,6 +162,9 @@ let dynamicAtlasManager = { layout.type = cc.Layout.Type.VERTICAL; layout.resizeMode = cc.Layout.ResizeMode.CONTAINER; content.parent = _debugNode; + content.width = _textureSize; + content.anchorY = 1; + content.x = _textureSize; scroll.content = content; @@ -174,10 +177,10 @@ let dynamicAtlasManager = { let sprite = node.addComponent(cc.Sprite) sprite.spriteFrame = spriteFrame; - sprite.sizeMode = cc.Sprite.SizeMode.CUSTOM; + // sprite.sizeMode = cc.Sprite.SizeMode.CUSTOM; - node.width = height; - node.height = height; + // node.width = height; + // node.height = height; node.parent = content; } From 8f5f927a9517573ab7456cfe6823c57ad4ccaf00 Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 18 Apr 2018 17:01:46 +0800 Subject: [PATCH 47/53] optimize performance --- jsb/config.js | 39 +++++++++++++++++++ jsb/effect.js | 1 + jsb/gfx.js | 2 + jsb/input-assembler.js | 26 +++++++++++++ jsb/renderer.js | 86 +++++++++++++++++++++--------------------- 5 files changed, 110 insertions(+), 44 deletions(-) create mode 100644 jsb/config.js create mode 100644 jsb/input-assembler.js diff --git a/jsb/config.js b/jsb/config.js new file mode 100644 index 0000000000..92ec7d144d --- /dev/null +++ b/jsb/config.js @@ -0,0 +1,39 @@ +let _stageOffset = 0; +let _name2stageID = {}; + +var config = { + addStage: function (name) { + // already added + if (_name2stageID[name] !== undefined) { + return; + } + + let stageID = 1 << _stageOffset; + _name2stageID[name] = stageID; + + _stageOffset += 1; + + renderer.addStage(name); + }, + + stageID: function (name) { + let id = _name2stageID[name]; + if (id === undefined) { + return -1; + } + return id; + }, + + stageIDs: function (nameList) { + let key = 0; + for (let i = 0; i < nameList.length; ++i) { + let id = _name2stageID[nameList[i]]; + if (id !== undefined) { + key |= id; + } + } + return key; + } +}; + +module.exports = config; \ No newline at end of file diff --git a/jsb/effect.js b/jsb/effect.js index 0f75a9051e..9a57d898e3 100644 --- a/jsb/effect.js +++ b/jsb/effect.js @@ -17,6 +17,7 @@ class Effect { } this._nativeObj = new renderer.EffectNative(techniqueObjs, properties, defines); + this._nativePtr = this._nativeObj.self(); // TODO: check if params is valid for current technique??? } diff --git a/jsb/gfx.js b/jsb/gfx.js index 233006ef1b..320c1a8652 100644 --- a/jsb/gfx.js +++ b/jsb/gfx.js @@ -50,12 +50,14 @@ _p._ctor = function(device, options) { _p = gfx.VertexBuffer.prototype; _p._ctor = function(device, format, usage, data, numVertices) { this.init(device, format._nativeObj, usage, data, numVertices); + this._nativePtr = this.self(); }; cc.defineGetterSetter(_p, "count", _p.getCount); _p = gfx.IndexBuffer.prototype; _p._ctor = function(device, format, usage, data, numIndices) { this.init(device, format, usage, data, numIndices); + this._nativePtr = this.self(); }; cc.defineGetterSetter(_p, "count", _p.getCount); diff --git a/jsb/input-assembler.js b/jsb/input-assembler.js new file mode 100644 index 0000000000..865178062e --- /dev/null +++ b/jsb/input-assembler.js @@ -0,0 +1,26 @@ +class InputAssembler { + constructor(vb, ib, pt = gfx.PT_TRIANGLES) { + this._vertexBuffer = vb; + this._indexBuffer = ib; + this._primitiveType = pt; + this._start = 0; + this._count = -1; + + // TODO: instancing data + // this._stream = 0; + } + + getPrimitiveCount () { + if (this._count !== -1) { + return this._count; + } + + if (this._indexBuffer) { + return this._indexBuffer.count; + } + + return this._vertexBuffer.count; + } +} + +module.exports = InputAssembler; \ No newline at end of file diff --git a/jsb/renderer.js b/jsb/renderer.js index 57cdcd17bc..adcc6beccf 100644 --- a/jsb/renderer.js +++ b/jsb/renderer.js @@ -58,20 +58,46 @@ renderer.PARAM_TEXTURE_CUBE = 14; renderer.CLEAR_COLOR = 1; renderer.CLEAR_DEPTH = 2; renderer.CLEAR_STENCIL = 4; - -//renderer.addStage = renderer.Config.addStage; - -renderer.config = { - addStage: renderer.addStage, - // stageIDs: renderer.stageIDs, - stageIDs: renderer.stageIDs, - stageID: renderer.stageID -}; +renderer.InputAssembler = require('./input-assembler'); +renderer.config = require('./config'); renderer.Effect = require('./Effect'); renderer.Technique = require('./Technique'); renderer.Pass = require('./Pass'); renderer.Model = require('./Model'); +var models = []; +var sizeOfModel = 23; +// length + 500 modles(8 for each model) +var modlesData = new Float64Array(1 + 500*sizeOfModel); +var fillModelData = function() { + if (models.length > 500) + modlesData = new FloatArray64(1 + models.length*sizeOfModel); + + modlesData[0] = models.length; + var index = 1; + var model; + var worldMatrix; + var ia; + for (var i = 0, len = models.length; i < len; ++i) { + model = models[i]; + modlesData[index++] = model._dynamicIA; + modlesData[index++] = model._viewID; + worldMatrix = model._node._getWorldRT4Native(); + modlesData.set(worldMatrix, index); + index += 16; + + // ia + ia = model._inputAssemblers[0]; + modlesData[index++] = ia._vertexBuffer._nativePtr; + modlesData[index++] = ia._indexBuffer._nativePtr; + modlesData[index++] = ia._start; + modlesData[index++] = ia._count; + + // effect + modlesData[index++] = model._effects[0]._nativePtr; + } +} + // ForwardRenderer adapter var _p; @@ -79,45 +105,17 @@ _p = renderer.ForwardRenderer.prototype; _p._ctor = function(device, builtin) { this.init(device, builtin.programTemplates, builtin.defaultTexture, canvas.width, canvas.height); }; +_p.render = function(scene) { + fillModelData(); + this.renderNative(scene, modlesData); -// InputAssembler adapter -_p = renderer.InputAssembler.prototype; -_p._ctor = function(vb, ib, pt = gfx.PT_TRIANGLES) { - this.init(vb, ib, pt); -}; -cc.defineGetterSetter(_p, "_vertexBuffer", _p.getVertexBuffer, _p.setVertexBuffer); -cc.defineGetterSetter(_p, "_indexBuffer", _p.getIndexBuffer, _p.setIndexBuffer); -cc.defineGetterSetter(_p, "_primitiveType", _p.getPrimitiveType, _p.setPrimitiveType); -cc.defineGetterSetter(_p, "_start", _p.getStart, _p.setStart); -cc.defineGetterSetter(_p, "_count", _p.getCount, _p.setCount); + models.length = 0; +} -// Scene +// Scene _p = renderer.Scene.prototype; _p.addModel = function(model) { - // var args = []; - // args.push(model._dynamicIA); - // args.push(model._viewID); - // args.push(model._node); - - // var inputAssemberls = model._inputAssemblers; - // args.push(inputAssemberls.length); - // for (var i = 0, len = inputAssemberls.length; i < len; ++i) { - // args.push(inputAssemberls[i]) - // } - - // var effects = model._effects; - // args.push(effects.length); - // for (var i = 0, len = effects.length; i < len; ++i) { - // args.push(effects[i]._nativeObj); - // } - - // FIXME: should handle the situation that, the length input assemblers or effects is greater than 1 - // this.addModelNative.apply(this, args); - this.addModelNative(model._dynamicIA, - model._viewID, - model._node, - model._inputAssemblers[0], - model._effects[0]._nativeObj); + models.push(model); } _p.removeModel = function() {} From 685e1cc487d02ee3625428ae566125d3cd2743e5 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 19 Apr 2018 10:29:37 +0800 Subject: [PATCH 48/53] Update comment to english --- cocos2d/core/renderer/assemblers/sprite/bar-filled.js | 5 +++-- cocos2d/core/renderer/assemblers/sprite/mesh.js | 5 +++-- cocos2d/core/renderer/assemblers/sprite/radial-filled.js | 5 +++-- cocos2d/core/renderer/assemblers/sprite/simple.js | 7 ++++--- cocos2d/core/renderer/assemblers/sprite/sliced.js | 5 +++-- cocos2d/core/renderer/assemblers/sprite/tiled.js | 5 +++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js index b520defdff..b7d63a3116 100644 --- a/cocos2d/core/renderer/assemblers/sprite/bar-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/bar-filled.js @@ -33,9 +33,10 @@ module.exports = { updateRenderData (sprite) { let frame = sprite.spriteFrame; - // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + // TODO: Material API design and export from editor could affect the material activation process + // need to update the logic here if (!sprite._material && frame) { - // 尽可能避免函数调用的开销 + // Avoid as much function call as possible if (!frame._original) { dynamicAtlasManager.insertSpriteFrame(frame); } diff --git a/cocos2d/core/renderer/assemblers/sprite/mesh.js b/cocos2d/core/renderer/assemblers/sprite/mesh.js index 6444bec59f..c85f31e0a0 100644 --- a/cocos2d/core/renderer/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/assemblers/sprite/mesh.js @@ -35,9 +35,10 @@ const dynamicAtlasManager = require('../../utils/dynamic-atlas/manager'); updateRenderData (sprite) { let frame = sprite.spriteFrame; - // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + // TODO: Material API design and export from editor could affect the material activation process + // need to update the logic here if (!sprite._material && frame) { - // 尽可能避免函数调用的开销 + // Avoid as much function call as possible if (!frame._original) { dynamicAtlasManager.insertSpriteFrame(frame); } diff --git a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js index aba4b47f93..3c112f2ebf 100644 --- a/cocos2d/core/renderer/assemblers/sprite/radial-filled.js +++ b/cocos2d/core/renderer/assemblers/sprite/radial-filled.js @@ -45,9 +45,10 @@ module.exports = { updateRenderData (sprite) { let frame = sprite.spriteFrame; - // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + // TODO: Material API design and export from editor could affect the material activation process + // need to update the logic here if (!sprite._material && frame) { - // 尽可能避免函数调用的开销 + // Avoid as much function call as possible if (!frame._original) { dynamicAtlasManager.insertSpriteFrame(frame); } diff --git a/cocos2d/core/renderer/assemblers/sprite/simple.js b/cocos2d/core/renderer/assemblers/sprite/simple.js index a1c6751d53..ee126f1cea 100644 --- a/cocos2d/core/renderer/assemblers/sprite/simple.js +++ b/cocos2d/core/renderer/assemblers/sprite/simple.js @@ -30,11 +30,12 @@ module.exports = { useModel: false, updateRenderData (sprite) { - let frame = sprite.spriteFrame; + let frame = sprite._spriteFrame; - // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + // TODO: Material API design and export from editor could affect the material activation process + // need to update the logic here if (!sprite._material && frame) { - // 尽可能避免函数调用的开销 + // Avoid as much function call as possible if (!frame._original) { dynamicAtlasManager.insertSpriteFrame(frame); } diff --git a/cocos2d/core/renderer/assemblers/sprite/sliced.js b/cocos2d/core/renderer/assemblers/sprite/sliced.js index 5909d70a19..6b804fbcf7 100644 --- a/cocos2d/core/renderer/assemblers/sprite/sliced.js +++ b/cocos2d/core/renderer/assemblers/sprite/sliced.js @@ -44,9 +44,10 @@ module.exports = { updateRenderData (sprite, batchData) { let frame = sprite.spriteFrame; - // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + // TODO: Material API design and export from editor could affect the material activation process + // need to update the logic here if (!sprite._material && frame) { - // 尽可能避免函数调用的开销 + // Avoid as much function call as possible if (!frame._original) { dynamicAtlasManager.insertSpriteFrame(frame); } diff --git a/cocos2d/core/renderer/assemblers/sprite/tiled.js b/cocos2d/core/renderer/assemblers/sprite/tiled.js index 186afdf70f..0b7fd5c1e1 100644 --- a/cocos2d/core/renderer/assemblers/sprite/tiled.js +++ b/cocos2d/core/renderer/assemblers/sprite/tiled.js @@ -35,9 +35,10 @@ module.exports = { updateRenderData (sprite) { let frame = sprite.spriteFrame; - // 避免用户使用自定义 material 的情况下覆盖用户设置,不过这里还应该加一个 TODO,未来设计 material 的序列化和用户接口时,应该会有改动 + // TODO: Material API design and export from editor could affect the material activation process + // need to update the logic here if (!sprite._material && frame) { - // 尽可能避免函数调用的开销 + // Avoid as much function call as possible if (!frame._original) { dynamicAtlasManager.insertSpriteFrame(frame); } From d87e146585340615c25e91234cf81109d63efa5d Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 19 Apr 2018 10:30:07 +0800 Subject: [PATCH 49/53] Enable dynamic atlas --- cocos2d/core/renderer/utils/dynamic-atlas/manager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js index 55f4869cfb..a2a3fc7158 100644 --- a/cocos2d/core/renderer/utils/dynamic-atlas/manager.js +++ b/cocos2d/core/renderer/utils/dynamic-atlas/manager.js @@ -5,9 +5,9 @@ let _atlasIndex = -1; let _maxAtlasCount = 5; let _textureSize = 2048; -let _maxFrameSize = 256; +let _maxFrameSize = 512; -let _enabled = false; +let _enabled = true; let _debugNode = null; @@ -91,7 +91,7 @@ let dynamicAtlasManager = { */ insertSpriteFrame (spriteFrame) { if (CC_EDITOR) return; - if (!this.enabled || _atlasIndex === _maxAtlasCount || + if (!_enabled || _atlasIndex === _maxAtlasCount || !spriteFrame || spriteFrame._original) return; let texture = spriteFrame._texture; From d2ad2ffcde78b16fa6d61dda16167a50f1df5c51 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 19 Apr 2018 10:35:43 +0800 Subject: [PATCH 50/53] Fix opt_macroFlags is null issue in gulp task --- gulp/tasks/engine.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js index 1ffc28caab..17e46fc088 100644 --- a/gulp/tasks/engine.js +++ b/gulp/tasks/engine.js @@ -214,7 +214,7 @@ exports.buildJsb = function (sourceFile, outputFile, excludes, opt_macroFlags, c var outDir = Path.dirname(outputFile); var opts = {}; - if (opt_macroFlags.nativeRenderer) { + if (opt_macroFlags && opt_macroFlags.nativeRenderer) { opts.aliasifyConfig = aliasifyConfig; } var bundler = createBundler(sourceFile, opts); @@ -248,7 +248,7 @@ exports.buildJsbMin = function (sourceFile, outputFile, excludes, opt_macroFlags var outDir = Path.dirname(outputFile); var opts = {}; - if (opt_macroFlags.nativeRenderer) { + if (opt_macroFlags && opt_macroFlags.nativeRenderer) { opts.aliasifyConfig = aliasifyConfig; } var bundler = createBundler(sourceFile, opts); From e08fcfa5a72b22cffe946cb586e22efbc6357aaf Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 19 Apr 2018 11:17:01 +0800 Subject: [PATCH 51/53] Improve jsb renderer implementation --- cocos2d/core/CCNode.js | 32 --------------------- jsb/renderer.js | 8 ++++-- jsb/utils.js | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 35 deletions(-) create mode 100644 jsb/utils.js diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index f582a7e2ef..c1db785026 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -53,7 +53,6 @@ const ONE_DEGREE = Math.PI / 180; var ActionManagerExist = !!cc.ActionManager; var emptyFunc = function () {}; var _mat4_temp = math.mat4.create(); -var _typedArray_temp = new Float32Array(16); var _vec3_temp = math.vec3.create(); var _quat_temp = math.quat.create(); var _parents = []; @@ -1886,31 +1885,6 @@ var Node = cc.Class({ return out; }, - _getWorldRT4Native() { - this.getWorldRT(_mat4_temp); - this._mat4ToArray(_typedArray_temp, _mat4_temp); - return _typedArray_temp; - }, - - _mat4ToArray(typedArray, mat4) { - typedArray[0] = mat4.m00; - typedArray[1] = mat4.m01; - typedArray[2] = mat4.m02; - typedArray[3] = mat4.m03; - typedArray[4] = mat4.m04; - typedArray[5] = mat4.m05; - typedArray[6] = mat4.m06; - typedArray[7] = mat4.m07; - typedArray[8] = mat4.m08; - typedArray[9] = mat4.m09; - typedArray[10] = mat4.m10; - typedArray[11] = mat4.m11; - typedArray[12] = mat4.m12; - typedArray[13] = mat4.m13; - typedArray[14] = mat4.m14; - typedArray[15] = mat4.m15; - }, - /** * !#en Set rotation by lookAt target point, normally used by Camera Node * !#zh 通过观察目标来设置 rotation,一般用于 Camera Node 上 @@ -2094,12 +2068,6 @@ var Node = cc.Class({ return math.mat4.copy(out, this._worldMatrix); }, - _getWorldMatrix4Native() { - this._updateWorldMatrix(); - this._mat4ToArray(_typedArray_temp, this._worldMatrix); - return _typedArray_temp; - }, - /** * !#en Converts a Point to node (local) space coordinates. The result is in Vec2. * !#zh 将一个点转换到节点 (局部) 坐标系。结果以 Vec2 为单位。 diff --git a/jsb/renderer.js b/jsb/renderer.js index adcc6beccf..a0a566ce13 100644 --- a/jsb/renderer.js +++ b/jsb/renderer.js @@ -22,7 +22,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ - + +const utils = require('./utils'); + // projection renderer.PROJ_PERSPECTIVE = 0; renderer.PROJ_ORTHO = 1; @@ -82,7 +84,7 @@ var fillModelData = function() { model = models[i]; modlesData[index++] = model._dynamicIA; modlesData[index++] = model._viewID; - worldMatrix = model._node._getWorldRT4Native(); + worldMatrix = utils.getWorldRTInAB(model._node); modlesData.set(worldMatrix, index); index += 16; @@ -103,7 +105,7 @@ var _p; _p = renderer.ForwardRenderer.prototype; _p._ctor = function(device, builtin) { - this.init(device, builtin.programTemplates, builtin.defaultTexture, canvas.width, canvas.height); + this.init(device, builtin.programTemplates, builtin.defaultTexture, canvas.width, canvas.height); }; _p.render = function(scene) { fillModelData(); diff --git a/jsb/utils.js b/jsb/utils.js new file mode 100644 index 0000000000..f1a4407a64 --- /dev/null +++ b/jsb/utils.js @@ -0,0 +1,65 @@ +/**************************************************************************** + Copyright (c) 2013-2016 Chukong Technologies Inc. + Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ +'use strict'; + +let _typedArray_temp = new Float32Array(16); +var _mat4_temp = cc.vmath.mat4.create(); + +function _mat4ToArray(typedArray, mat4) { + typedArray[0] = mat4.m00; + typedArray[1] = mat4.m01; + typedArray[2] = mat4.m02; + typedArray[3] = mat4.m03; + typedArray[4] = mat4.m04; + typedArray[5] = mat4.m05; + typedArray[6] = mat4.m06; + typedArray[7] = mat4.m07; + typedArray[8] = mat4.m08; + typedArray[9] = mat4.m09; + typedArray[10] = mat4.m10; + typedArray[11] = mat4.m11; + typedArray[12] = mat4.m12; + typedArray[13] = mat4.m13; + typedArray[14] = mat4.m14; + typedArray[15] = mat4.m15; +} + +function getWorldRTInAB (node) { + node.getWorldRT(_mat4_temp); + _mat4ToArray(_typedArray_temp, _mat4_temp); + return _typedArray_temp; +} + +function getWorldMatrixInAB (node) { + node._updateWorldMatrix(); + _mat4ToArray(_typedArray_temp, node._worldMatrix); + return _typedArray_temp; +} + +module.exports = { + getWorldRTInAB, + getWorldMatrixInAB +} \ No newline at end of file From ec80e1143ebccfaafc14cfb6b9e823700e48feab Mon Sep 17 00:00:00 2001 From: James Chen Date: Thu, 19 Apr 2018 14:11:49 +0800 Subject: [PATCH 52/53] Updates jsb scripts. --- jsb/builtin/glOptMode.js | 1473 ++++++++++++++++++ jsb/builtin/index.js | 75 +- jsb/builtin/jsb-adapter/Element.js | 2 +- jsb/builtin/jsb-adapter/Event.js | 4 +- jsb/builtin/jsb-adapter/EventTarget.js | 19 +- jsb/builtin/jsb-adapter/FileReader.js | 3 +- jsb/builtin/jsb-adapter/HTMLCanvasElement.js | 19 +- jsb/builtin/jsb-adapter/HTMLImageElement.js | 9 +- jsb/builtin/jsb-adapter/HTMLVideoElement.js | 34 + jsb/builtin/jsb-adapter/document.js | 31 +- jsb/builtin/jsb-adapter/location.js | 10 +- jsb/builtin/jsb-adapter/navigator.js | 2 +- jsb/builtin/jsb-adapter/window.js | 14 +- jsb/builtin/jsb_opengl.js | 403 +---- jsb/builtin/jsb_opengl_constants.js | 8 +- 15 files changed, 1629 insertions(+), 477 deletions(-) create mode 100644 jsb/builtin/glOptMode.js create mode 100644 jsb/builtin/jsb-adapter/HTMLVideoElement.js diff --git a/jsb/builtin/glOptMode.js b/jsb/builtin/glOptMode.js new file mode 100644 index 0000000000..23dcf8cea1 --- /dev/null +++ b/jsb/builtin/glOptMode.js @@ -0,0 +1,1473 @@ +var GL_COMMAND_ACTIVE_TEXTURE = 0; +var GL_COMMAND_ATTACH_SHADER = 1; +var GL_COMMAND_BIND_ATTRIB_LOCATION = 2; +var GL_COMMAND_BIND_BUFFER = 3; +var GL_COMMAND_BIND_FRAME_BUFFER = 4; +var GL_COMMAND_BIND_RENDER_BUFFER = 5; +var GL_COMMAND_BIND_TEXTURE = 6; +var GL_COMMAND_BLEND_COLOR = 7; +var GL_COMMAND_BLEND_EQUATION = 8; +var GL_COMMAND_BLEND_EQUATION_SEPARATE = 9; +var GL_COMMAND_BLEND_FUNC = 10; +var GL_COMMAND_BLEND_FUNC_SEPARATE = 11; +var GL_COMMAND_BUFFER_DATA = 12; +var GL_COMMAND_BUFFER_SUB_DATA = 13; +var GL_COMMAND_CLEAR = 14; +var GL_COMMAND_CLEAR_COLOR = 15; +var GL_COMMAND_CLEAR_DEPTH = 16; +var GL_COMMAND_CLEAR_STENCIL = 17; +var GL_COMMAND_COLOR_MASK = 18; +var GL_COMMAND_COMMIT = 19; +var GL_COMMAND_COMPILE_SHADER = 20; +var GL_COMMAND_COMPRESSED_TEX_IMAGE_2D = 21; +var GL_COMMAND_COMPRESSED_TEX_SUB_IMAGE_2D = 22; +var GL_COMMAND_COPY_TEX_IMAGE_2D = 23; +var GL_COMMAND_COPY_TEX_SUB_IMAGE_2D = 24; +var GL_COMMAND_CULL_FACE = 25; +var GL_COMMAND_DELETE_BUFFER = 26; +var GL_COMMAND_DELETE_FRAME_BUFFER = 27; +var GL_COMMAND_DELETE_PROGRAM = 28; +var GL_COMMAND_DELETE_RENDER_BUFFER = 29; +var GL_COMMAND_DELETE_SHADER = 30; +var GL_COMMAND_DELETE_TEXTURE = 31; +var GL_COMMAND_DEPTH_FUNC = 32; +var GL_COMMAND_DEPTH_MASK = 33; +var GL_COMMAND_DEPTH_RANGE = 34; +var GL_COMMAND_DETACH_SHADER = 35; +var GL_COMMAND_DISABLE = 36; +var GL_COMMAND_DISABLE_VERTEX_ATTRIB_ARRAY = 37; +var GL_COMMAND_DRAW_ARRAYS = 38; +var GL_COMMAND_DRAW_ELEMENTS = 39; +var GL_COMMAND_ENABLE = 40; +var GL_COMMAND_ENABLE_VERTEX_ATTRIB_ARRAY = 41; +var GL_COMMAND_FINISH = 42; +var GL_COMMAND_FLUSH = 43; +var GL_COMMAND_FRAME_BUFFER_RENDER_BUFFER = 44; +var GL_COMMAND_FRAME_BUFFER_TEXTURE_2D = 45; +var GL_COMMAND_FRONT_FACE = 46; +var GL_COMMAND_GENERATE_MIPMAP = 47; +var GL_COMMAND_HINT = 48; +var GL_COMMAND_LINE_WIDTH = 49; +var GL_COMMAND_LINK_PROGRAM = 50; +var GL_COMMAND_PIXEL_STOREI = 51; +var GL_COMMAND_POLYGON_OFFSET = 52; +var GL_COMMAND_RENDER_BUFFER_STORAGE = 53; +var GL_COMMAND_SAMPLE_COVERAGE = 54; +var GL_COMMAND_SCISSOR = 55; +var GL_COMMAND_SHADER_SOURCE = 56; +var GL_COMMAND_STENCIL_FUNC = 57; +var GL_COMMAND_STENCIL_FUNC_SEPARATE = 58; +var GL_COMMAND_STENCIL_MASK = 59; +var GL_COMMAND_STENCIL_MASK_SEPARATE = 60; +var GL_COMMAND_STENCIL_OP = 61; +var GL_COMMAND_STENCIL_OP_SEPARATE = 62; +var GL_COMMAND_TEX_IMAGE_2D = 63; +var GL_COMMAND_TEX_PARAMETER_F = 64; +var GL_COMMAND_TEX_PARAMETER_I = 65; +var GL_COMMAND_TEX_SUB_IMAGE_2D = 66; +var GL_COMMAND_UNIFORM_1F = 67; +var GL_COMMAND_UNIFORM_1FV = 68; +var GL_COMMAND_UNIFORM_1I = 69; +var GL_COMMAND_UNIFORM_1IV = 70; +var GL_COMMAND_UNIFORM_2F = 71; +var GL_COMMAND_UNIFORM_2FV = 72; +var GL_COMMAND_UNIFORM_2I = 73; +var GL_COMMAND_UNIFORM_2IV = 74; +var GL_COMMAND_UNIFORM_3F = 75; +var GL_COMMAND_UNIFORM_3FV = 76; +var GL_COMMAND_UNIFORM_3I = 77; +var GL_COMMAND_UNIFORM_3IV = 78; +var GL_COMMAND_UNIFORM_4F = 79; +var GL_COMMAND_UNIFORM_4FV = 80; +var GL_COMMAND_UNIFORM_4I = 81; +var GL_COMMAND_UNIFORM_4IV = 82; +var GL_COMMAND_UNIFORM_MATRIX_2FV = 83; +var GL_COMMAND_UNIFORM_MATRIX_3FV = 84; +var GL_COMMAND_UNIFORM_MATRIX_4FV = 85; +var GL_COMMAND_USE_PROGRAM = 86; +var GL_COMMAND_VALIDATE_PROGRAM = 87; +var GL_COMMAND_VERTEX_ATTRIB_1F = 88; +var GL_COMMAND_VERTEX_ATTRIB_2F = 89; +var GL_COMMAND_VERTEX_ATTRIB_3F = 90; +var GL_COMMAND_VERTEX_ATTRIB_4F = 91; +var GL_COMMAND_VERTEX_ATTRIB_1FV = 92; +var GL_COMMAND_VERTEX_ATTRIB_2FV = 93; +var GL_COMMAND_VERTEX_ATTRIB_3FV = 94; +var GL_COMMAND_VERTEX_ATTRIB_4FV = 95; +var GL_COMMAND_VERTEX_ATTRIB_POINTER = 96; +var GL_COMMAND_VIEW_PORT = 97; + +const gl = __gl; + +// _gl save the orignal gl functions. +var _gl = {}; +for (var k in gl) { + _gl[k] = gl[k]; +} + +var total_size = 100000; +var next_index = 0; +var buffer_data; + +// Batch GL commands is enabled by default. +function batchGLCommandsToNative() { + if (gl._flushCommands) { + if (isSupportTypeArray()) { + console.log('Enable batch GL commands optimization!'); + attachMethodOpt(); + buffer_data = new Float32Array(total_size); + } + else { + console.log(`Disable batch GL commands, TypedArray Native API isn't supported!`); + } + } + else { + console.log(`Disable batch GL commands, _flushCommands isn't binded!`); + } +} + +function disableBatchGLCommandsToNative() { + // Reset __gl variable to the default one. + flushCommands(); + for (var k in _gl) { + __gl[k] = _gl[k]; + } + console.log('Disable batch GL commands optimization!'); +} + +function flushCommands() { + if (next_index > 0) { + gl._flushCommands(next_index, buffer_data); + next_index = 0; + } +} + +function activeTextureOpt(texture) { + if (next_index + 2 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_ACTIVE_TEXTURE; + buffer_data[next_index + 1] = texture; + next_index += 2; +} + +function attachShaderOpt(program, shader) { + if (next_index + 3 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_ATTACH_SHADER; + buffer_data[next_index + 1] = program ? program._id : 0; + buffer_data[next_index + 2] = shader ? shader._id : 0; + next_index += 3; +} + +function bindAttribLocationOpt(program, index, name) { + flushCommands(); + _gl.bindAttribLocation(program, index, name); +} + +function bindBufferOpt(target, buffer) { + if (next_index + 3 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BIND_BUFFER; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = buffer ? buffer._id : 0; + next_index += 3; +} + +function bindFramebufferOpt(target, framebuffer) { + if (next_index + 3 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BIND_FRAME_BUFFER; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = framebuffer ? framebuffer._id : 0; + next_index += 3; +} + +function bindRenderbufferOpt(target, renderbuffer) { + if (next_index + 3 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BIND_RENDER_BUFFER; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = renderbuffer ? renderbuffer._id : 0; + next_index += 3; +} + +function bindTextureOpt(target, texture) { + if (next_index + 3 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BIND_TEXTURE; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = texture ? texture._id : 0; + next_index += 3; +} + +function blendColorOpt(red, green, blue, alpha) { + if (next_index + 5 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BLEND_COLOR; + buffer_data[next_index + 1] = red; + buffer_data[next_index + 2] = green; + buffer_data[next_index + 3] = blue; + buffer_data[next_index + 4] = alpha; + next_index += 5; +} + +function blendEquationOpt(mode) { + if (next_index + 2 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BLEND_EQUATION; + buffer_data[next_index + 1] = mode; + next_index += 2; +} + +function blendEquationSeparateOpt(modeRGB, modeAlpha) { + if (next_index + 3 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BLEND_EQUATION_SEPARATE; + buffer_data[next_index + 1] = modeRGB; + buffer_data[next_index + 2] = modeAlpha; + next_index += 3; +} + +function blendFuncOpt(sfactor, dfactor) { + if (next_index + 3 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BLEND_FUNC; + buffer_data[next_index + 1] = sfactor; + buffer_data[next_index + 2] = dfactor; + next_index += 3; +} + +function blendFuncSeparateOpt(srcRGB, dstRGB, srcAlpha, dstAlpha) { + if (next_index + 5 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_BLEND_FUNC_SEPARATE; + buffer_data[next_index + 1] = srcRGB; + buffer_data[next_index + 2] = dstRGB; + buffer_data[next_index + 3] = srcAlpha; + buffer_data[next_index + 4] = dstAlpha; + next_index += 5; +} + +function bufferDataOpt(target, data, usage) { + flushCommands(); + _gl.bufferData(target, data, usage); +} + +function bufferSubDataOpt(target, offset, data) { + flushCommands(); + _gl.bufferSubData(target, offset, data); +} + +function checkFramebufferStatusOpt(target) { + flushCommands(); + return _gl.checkFramebufferStatus(target); +} + +function clearOpt(mask) { + if (next_index + 2 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_CLEAR; + buffer_data[next_index + 1] = mask; + next_index += 2; +} + +function clearColorOpt(red, green, blue, alpha) { + if (next_index + 5 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_CLEAR_COLOR; + buffer_data[next_index + 1] = red; + buffer_data[next_index + 2] = green; + buffer_data[next_index + 3] = blue; + buffer_data[next_index + 4] = alpha; + next_index += 5; +} + +function clearDepthOpt(depth) { + if (next_index + 2 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_CLEAR_DEPTH; + buffer_data[next_index + 1] = depth; + next_index += 2; +} + +function clearStencilOpt(s) { + if (next_index + 2 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_CLEAR_STENCIL; + buffer_data[next_index + 1] = s; + next_index += 2; +} + +function colorMaskOpt(red, green, blue, alpha) { + if (next_index + 5 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_COLOR_MASK; + buffer_data[next_index + 1] = red ? 1 : 0; + buffer_data[next_index + 2] = green ? 1 : 0; + buffer_data[next_index + 3] = blue ? 1 : 0; + buffer_data[next_index + 4] = alpha ? 1 : 0; + next_index += 5; +} + +function compileShaderOpt(shader) { + if (next_index + 2 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_COMPILE_SHADER; + buffer_data[next_index + 1] = shader ? shader._id : 0; + next_index += 2; +} + +function compressedTexImage2DOpt(target, level, internalformat, width, height, border, data) { + flushCommands(); + _gl.compressedTexImage2D(target, level, internalformat, width, height, border, data); +} + +function compressedTexSubImage2DOpt(target, level, xoffset, yoffset, width, height, format, data) { + flushCommands(); + _gl.compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, data); +} + +function copyTexImage2DOpt(target, level, internalformat, x, y, width, height, border) { + if (next_index + 9 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_COPY_TEX_IMAGE_2D; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = level; + buffer_data[next_index + 3] = internalformat; + buffer_data[next_index + 4] = x; + buffer_data[next_index + 5] = y; + buffer_data[next_index + 6] = width; + buffer_data[next_index + 7] = height; + buffer_data[next_index + 8] = border; + next_index += 9; +} + +function copyTexSubImage2DOpt(target, level, xoffset, yoffset, x, y, width, height) { + if (next_index + 9 > total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_COPY_TEX_SUB_IMAGE_2D; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = level; + buffer_data[next_index + 3] = xoffset; + buffer_data[next_index + 4] = yoffset; + buffer_data[next_index + 5] = x; + buffer_data[next_index + 6] = y; + buffer_data[next_index + 7] = width; + buffer_data[next_index + 8] = height; + next_index += 9; +} + +function createBufferOpt() { + flushCommands(); + return _gl.createBuffer(); +} + +function createFramebufferOpt() { + flushCommands(); + return _gl.createFramebuffer(); +} + +function createProgramOpt() { + flushCommands(); + return _gl.createProgram(); +} + +function createRenderbufferOpt() { + flushCommands(); + return _gl.createRenderbuffer(); +} + +function createShaderOpt(type) { + flushCommands(); + return _gl.createShader(type); +} + +function createTextureOpt() { + flushCommands(); + return _gl.createTexture(); +} + +function cullFaceOpt(mode) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_CULL_FACE; + buffer_data[next_index + 1] = mode; + next_index += 2; +} + +function deleteBufferOpt(buffer) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DELETE_BUFFER; + buffer_data[next_index + 1] = buffer ? buffer._id : 0; + next_index += 2; +} + +function deleteFramebufferOpt(framebuffer) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DELETE_FRAME_BUFFER; + buffer_data[next_index + 1] = framebuffer ? framebuffer._id : 0; + next_index += 2; +} + +function deleteProgramOpt(program) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DELETE_PROGRAM; + buffer_data[next_index + 1] = program ? program._id : 0; + next_index += 2; +} + +function deleteRenderbufferOpt(renderbuffer) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DELETE_RENDER_BUFFER; + buffer_data[next_index + 1] = renderbuffer ? renderbuffer._id : 0; + next_index += 2; +} + +function deleteShaderOpt(shader) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DELETE_SHADER; + buffer_data[next_index + 1] = shader ? shader._id : 0; + next_index += 2; +} + +function deleteTextureOpt(texture) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DELETE_TEXTURE; + buffer_data[next_index + 1] = texture ? texture._id : 0; + next_index += 2; +} + +function depthFuncOpt(func) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DEPTH_FUNC; + buffer_data[next_index + 1] = func; + next_index += 2; +} + +function depthMaskOpt(flag) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DEPTH_MASK; + buffer_data[next_index + 1] = flag ? 1 : 0; + next_index += 2; +} + +function depthRangeOpt(zNear, zFar) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DEPTH_RANGE; + buffer_data[next_index + 1] = zNear; + buffer_data[next_index + 1] = zFar; + next_index += 3; +} + +function detachShaderOpt(program, shader) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DETACH_SHADER; + buffer_data[next_index + 1] = program ? program._id : 0; + buffer_data[next_index + 1] = shader ? shader._id : 0; + next_index += 3; +} + +function disableOpt(cap) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DISABLE; + buffer_data[next_index + 1] = cap; + next_index += 2; +} + +function disableVertexAttribArrayOpt(index) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DISABLE_VERTEX_ATTRIB_ARRAY; + buffer_data[next_index + 1] = index; + next_index += 2; +} + +function drawArraysOpt(mode, first, count) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DRAW_ARRAYS; + buffer_data[next_index + 1] = mode; + buffer_data[next_index + 2] = first; + buffer_data[next_index + 3] = count; + next_index += 4; +} + +function drawElementsOpt(mode, count, type, offset) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_DRAW_ELEMENTS; + buffer_data[next_index + 1] = mode; + buffer_data[next_index + 2] = count; + buffer_data[next_index + 3] = type; + buffer_data[next_index + 4] = offset ? offset : 0; + next_index += 5; +} + +function enableOpt(cap) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_ENABLE; + buffer_data[next_index + 1] = cap; + next_index += 2; +} + +function enableVertexAttribArrayOpt(index) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_ENABLE_VERTEX_ATTRIB_ARRAY; + buffer_data[next_index + 1] = index; + next_index += 2; +} + +function finishOpt() { + if (next_index + 1 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_FINISH; + next_index += 1; +} + +function flushOpt() { + if (next_index + 1 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_FLUSH; + next_index += 1; +} + +function framebufferRenderbufferOpt(target, attachment, renderbuffertarget, renderbuffer) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_FRAME_BUFFER_RENDER_BUFFER; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = attachment; + buffer_data[next_index + 3] = renderbuffertarget; + buffer_data[next_index + 4] = renderbuffer ? renderbuffer._id : 0; + next_index += 5; +} + +function framebufferTexture2DOpt(target, attachment, textarget, texture, level) { + if (next_index + 6 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_FRAME_BUFFER_TEXTURE_2D; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = attachment; + buffer_data[next_index + 3] = textarget; + buffer_data[next_index + 4] = texture ? texture._id : 0; + buffer_data[next_index + 5] = level; + next_index += 6; +} + +function frontFaceOpt(mode) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_FRONT_FACE; + buffer_data[next_index + 1] = mode; + next_index += 2; +} + +function generateMipmapOpt(target) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_GENERATE_MIPMAP; + buffer_data[next_index + 1] = target; + next_index += 2; +} + +function getActiveAttribOpt(program, index) { + flushCommands(); + return _gl.getActiveAttrib(program, index); +} + +function getActiveUniformOpt(program, index) { + flushCommands(); + return _gl.getActiveUniform(program, index); +} + +function getAttachedShadersOpt(program) { + flushCommands(); + return _gl.getAttachedShaders(program); +} + +function getAttribLocationOpt(program, name) { + flushCommands(); + return _gl.getAttribLocation(program, name); +} + +function getBufferParameterOpt(target, pname) { + flushCommands(); + return _gl.getBufferParameter(target, pname); +} + +function getParameterOpt(pname) { + flushCommands(); + return _gl.getParameter(pname); +} + +function getErrorOpt() { + flushCommands(); + return _gl.getError(); +} + +function getFramebufferAttachmentParameterOpt(target, attachment, pname) { + flushCommands(); + return _gl.getFramebufferAttachmentParameter(target, attachment, pname); +} + +function getProgramParameterOpt(program, pname) { + flushCommands(); + return _gl.getProgramParameter(program, pname); +} + +function getProgramInfoLogOpt(program) { + flushCommands(); + return _gl.getProgramInfoLog(program); +} + +function getRenderbufferParameterOpt(target, pname) { + flushCommands(); + return _gl.getRenderbufferParameter(target, pname); +} + +function getShaderParameterOpt(shader, pname) { + flushCommands(); + return _gl.getShaderParameter(shader, pname); +} + +function getShaderPrecisionFormatOpt(shadertype, precisiontype) { + flushCommands(); + return _gl.getShaderPrecisionFormat(shadertype, precisiontype); +} + +function getShaderInfoLogOpt(shader) { + flushCommands(); + return _gl.getShaderInfoLog(shader); +} + +function getShaderSourceOpt(shader) { + flushCommands(); + return _gl.getShaderSource(shader); +} + +function getTexParameterOpt(target, pname) { + flushCommands(); + return _gl.getTexParameter(target, pname); +} + +function getUniformOpt(program, location) { + flushCommands(); + return _gl.getUniform(program, location); +} + +function getUniformLocationOpt(program, name) { + flushCommands(); + return _gl.getUniformLocation(program, name); +} + +function getVertexAttribOpt(index, pname) { + flushCommands(); + return _gl.getVertexAttrib(index, pname); +} + +function getVertexAttribOffsetOpt(index, pname) { + flushCommands(); + return _gl.getVertexAttribOffset(index, pname); +} + +function hintOpt(target, mode) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_HINT; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = mode; + next_index += 3; +} + +function isBufferOpt(buffer) { + flushCommands(); + return _gl.isBuffer(buffer); +} + +function isEnabledOpt(cap) { + flushCommands(); + return _gl.isEnabled(cap); +} + +function isFramebufferOpt(framebuffer) { + flushCommands(); + return _gl.isFramebuffer(framebuffer); +} + +function isProgramOpt(program) { + flushCommands(); + return _gl.isProgram(program); +} + +function isRenderbufferOpt(renderbuffer) { + flushCommands(); + return _gl.isRenderbuffer(renderbuffer); +} + +function isShaderOpt(shader) { + flushCommands(); + return _gl.isShader(shader); +} + +function isTextureOpt(texture) { + flushCommands(); + return _gl.isTexture(texture); +} + +function lineWidthOpt(width) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_LINE_WIDTH; + buffer_data[next_index + 1] = width; + next_index += 2; +} + +function linkProgramOpt(program) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_LINK_PROGRAM; + buffer_data[next_index + 1] = program ? program._id : 0; + next_index += 2; +} + +function pixelStoreiOpt(pname, param) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_PIXEL_STOREI; + buffer_data[next_index + 1] = pname; + buffer_data[next_index + 2] = param; + next_index += 3; +} + +function polygonOffsetOpt(factor, units) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_POLYGON_OFFSET; + buffer_data[next_index + 1] = factor; + buffer_data[next_index + 2] = units; + next_index += 3; +} + +function readPixelsOpt(x, y, width, height, format, type, pixels) { + flushCommands(); + _gl.readPixels(x, y, width, height, format, type, pixels); +} + +function renderbufferStorageOpt(target, internalFormat, width, height) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_RENDER_BUFFER_STORAGE; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = internalFormat; + buffer_data[next_index + 3] = width; + buffer_data[next_index + 4] = height; + next_index += 5; +} + +function sampleCoverageOpt(value, invert) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_SAMPLE_COVERAGE; + buffer_data[next_index + 1] = value; + buffer_data[next_index + 2] = invert ? 1 : 0; + next_index += 3; +} + +function scissorOpt(x, y, width, height) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_SCISSOR; + buffer_data[next_index + 1] = x; + buffer_data[next_index + 2] = y; + buffer_data[next_index + 3] = width; + buffer_data[next_index + 4] = height; + next_index += 5; +} + +function shaderSourceOpt(shader, source) { + flushCommands(); + _gl.shaderSource(shader, source); +} + +function stencilFuncOpt(func, ref, mask) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_STENCIL_FUNC; + buffer_data[next_index + 1] = func; + buffer_data[next_index + 2] = ref; + buffer_data[next_index + 3] = mask; + next_index += 4; +} + +function stencilFuncSeparateOpt(face, func, ref, mask) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_STENCIL_FUNC_SEPARATE; + buffer_data[next_index + 1] = face; + buffer_data[next_index + 2] = func; + buffer_data[next_index + 3] = ref; + buffer_data[next_index + 4] = mask; + next_index += 5; +} + +function stencilMaskOpt(mask) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_STENCIL_MASK; + buffer_data[next_index + 1] = mask; + next_index += 2; +} + +function stencilMaskSeparateOpt(face, mask) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_STENCIL_MASK_SEPARATE; + buffer_data[next_index + 1] = face; + buffer_data[next_index + 2] = mask; + next_index += 3; +} + +function stencilOpOpt(fail, zfail, zpass) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_STENCIL_OP; + buffer_data[next_index + 1] = fail; + buffer_data[next_index + 2] = zfail; + buffer_data[next_index + 3] = zpass; + next_index += 4; +} + +function stencilOpSeparateOpt(face, fail, zfail, zpass) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_STENCIL_OP_SEPARATE; + buffer_data[next_index + 1] = face; + buffer_data[next_index + 2] = fail; + buffer_data[next_index + 3] = zfail; + buffer_data[next_index + 4] = zpass; + next_index += 5; +} + +function texImage2DOpt() { + flushCommands(); + var argCount = arguments.length; + if (argCount === 6) { + _gl.texImage2D(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]); + } + else if (argCount === 9) { + _gl.texImage2D(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7], arguments[8]); + } + else { + console.log(`texImage2DOpt: Wrong number of arguments, expected 6 or 9 but got ${argCount}`); + } +} + +function texParameterfOpt(target, pname, param) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_TEX_PARAMETER_F; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = pname; + buffer_data[next_index + 3] = param; + next_index += 4; +} + +function texParameteriOpt(target, pname, param) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_TEX_PARAMETER_I; + buffer_data[next_index + 1] = target; + buffer_data[next_index + 2] = pname; + buffer_data[next_index + 3] = param; + next_index += 4; +} + +function texSubImage2DOpt(target, level, xoffset, yoffset, width, height, format, type, pixels) { + flushCommands(); + var argCount = arguments.length; + if (argCount === 7) { + _gl.texSubImage2D(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6]); + } + else if (argCount === 9) { + _gl.texSubImage2D(arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7], arguments[8]); + } + else { + console.log(`texSubImage2DOpt: Wrong number of arguments, expected 7 or 9 but got ${argCount}`); + } +} + +function uniform1fOpt(location, x) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_1F; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + next_index += 3; +} + +function uniform2fOpt(location, x, y) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_2F; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + next_index += 4; +} + +function uniform3fOpt(location, x, y, z) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_3F; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + buffer_data[next_index + 4] = z; + next_index += 5; +} + +function uniform4fOpt(location, x, y, z, w) { + if (next_index + 6 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_4F; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + buffer_data[next_index + 4] = z; + buffer_data[next_index + 5] = w; + next_index += 6; +} + +function uniform1iOpt(location, x) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_1I; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + next_index += 3; +} + +function uniform2iOpt(location, x, y) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_2I; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + next_index += 4; +} + +function uniform3iOpt(location, x, y, z) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_3I; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + buffer_data[next_index + 4] = z; + next_index += 5; +} + +function uniform4iOpt(location, x, y, z, w) { + if (next_index + 6 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_4I; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + buffer_data[next_index + 4] = z; + buffer_data[next_index + 5] = w; + next_index += 6; +} + +function uniform1fvOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_1FV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniform2fvOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_2FV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniform3fvOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_3FV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniform4fvOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_4FV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniform1ivOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_1IV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniform2ivOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_2IV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniform3ivOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_3IV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniform4ivOpt(location, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_4IV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function uniformMatrix2fvOpt(location, transpose, value) { + if (next_index + 4 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_MATRIX_2FV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = transpose; + buffer_data[next_index + 3] = value.length; + buffer_data.set(value, next_index + 4); + next_index += 4 + value.length; +} + +function uniformMatrix3fvOpt(location, transpose, value) { + if (next_index + 4 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_MATRIX_3FV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = transpose; + buffer_data[next_index + 3] = value.length; + buffer_data.set(value, next_index + 4); + next_index += 4 + value.length; +} + +function uniformMatrix4fvOpt(location, transpose, value) { + if (next_index + 4 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_UNIFORM_MATRIX_4FV; + buffer_data[next_index + 1] = location; + buffer_data[next_index + 2] = transpose; + buffer_data[next_index + 3] = value.length; + buffer_data.set(value, next_index + 4); + next_index += 4 + value.length; +} + +function useProgramOpt(program) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_USE_PROGRAM; + buffer_data[next_index + 1] = program ? program._id : 0; + next_index += 2; +} + +function validateProgramOpt(program) { + if (next_index + 2 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VALIDATE_PROGRAM; + buffer_data[next_index + 1] = program ? program._id : 0; + next_index += 2; +} + +function vertexAttrib1fOpt(index, x) { + if (next_index + 3 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_1F; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = x; + next_index += 3; +} + +function vertexAttrib2fOpt(index, x, y) { + if (next_index + 4 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_2F; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + next_index += 4; +} + +function vertexAttrib3fOpt(index, x, y, z) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_3F; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + buffer_data[next_index + 4] = z; + next_index += 5; +} + +function vertexAttrib4fOpt(index, x, y, z, w) { + if (next_index + 6 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_4F; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = x; + buffer_data[next_index + 3] = y; + buffer_data[next_index + 4] = z; + buffer_data[next_index + 5] = w; + next_index += 6; +} + +function vertexAttrib1fvOpt(index, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_1FV; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function vertexAttrib2fvOpt(index, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_2FV; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function vertexAttrib3fvOpt(index, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_3FV; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function vertexAttrib4fvOpt(index, value) { + if (next_index + 3 + value.length >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_4FV; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = value.length; + buffer_data.set(value, next_index + 3); + next_index += 3 + value.length; +} + +function vertexAttribPointerOpt(index, size, type, normalized, stride, offset) { + if (next_index + 7 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VERTEX_ATTRIB_POINTER; + buffer_data[next_index + 1] = index; + buffer_data[next_index + 2] = size; + buffer_data[next_index + 3] = type; + buffer_data[next_index + 4] = normalized ? 1 : 0; + buffer_data[next_index + 5] = stride; + buffer_data[next_index + 6] = offset; + next_index += 7; +} + +function viewportOpt(x, y, width, height) { + if (next_index + 5 >= total_size) { + flushCommands(); + } + buffer_data[next_index] = GL_COMMAND_VIEW_PORT; + buffer_data[next_index + 1] = x; + buffer_data[next_index + 2] = y; + buffer_data[next_index + 3] = width; + buffer_data[next_index + 4] = height; + next_index += 5; +} + +function isSupportTypeArray() { + //FIXME: + // if (GameStatusInfo.platform == 'android') { + return true; + // } + // var info = BK.Director.queryDeviceInfo(); + // var vers = info.version.split('.'); + // if (info.platform == 'ios' && Number(vers[0]) >= 10) { + // return true; + // } + // return false; +} + +function attachMethodOpt() { + gl.activeTexture = activeTextureOpt; + gl.attachShader = attachShaderOpt; + gl.bindAttribLocation = bindAttribLocationOpt; + gl.bindBuffer = bindBufferOpt; + gl.bindFramebuffer = bindFramebufferOpt; + gl.bindRenderbuffer = bindRenderbufferOpt; + gl.bindTexture = bindTextureOpt; + gl.blendColor = blendColorOpt; + gl.blendEquation = blendEquationOpt; + gl.blendEquationSeparate = blendEquationSeparateOpt; + gl.blendFunc = blendFuncOpt; + gl.blendFuncSeparate = blendFuncSeparateOpt; + gl.bufferData = bufferDataOpt; + gl.bufferSubData = bufferSubDataOpt; + gl.checkFramebufferStatus = checkFramebufferStatusOpt; + gl.clear = clearOpt; + gl.clearColor = clearColorOpt; + gl.clearDepth = clearDepthOpt; + gl.clearStencil = clearStencilOpt; + gl.colorMask = colorMaskOpt; + gl.compileShader = compileShaderOpt; + gl.compressedTexImage2D = compressedTexImage2DOpt; + gl.compressedTexSubImage2D = compressedTexSubImage2DOpt; + gl.copyTexImage2D = copyTexImage2DOpt; + gl.copyTexSubImage2D = copyTexSubImage2DOpt; + gl.createBuffer = createBufferOpt; + gl.createFramebuffer = createFramebufferOpt; + gl.createProgram = createProgramOpt; + gl.createRenderbuffer = createRenderbufferOpt; + gl.createShader = createShaderOpt; + gl.createTexture = createTextureOpt; + gl.cullFace = cullFaceOpt; + gl.deleteBuffer = deleteBufferOpt; + gl.deleteFramebuffer = deleteFramebufferOpt; + gl.deleteProgram = deleteProgramOpt; + gl.deleteRenderbuffer = deleteRenderbufferOpt; + gl.deleteShader = deleteShaderOpt; + gl.deleteTexture = deleteTextureOpt; + gl.depthFunc = depthFuncOpt; + gl.depthMask = depthMaskOpt; + gl.depthRange = depthRangeOpt; + gl.detachShader = detachShaderOpt; + gl.disable = disableOpt; + gl.disableVertexAttribArray = disableVertexAttribArrayOpt; + gl.drawArrays = drawArraysOpt; + gl.drawElements = drawElementsOpt; + gl.enable = enableOpt; + gl.enableVertexAttribArray = enableVertexAttribArrayOpt; + gl.finish = finishOpt; + gl.flush = flushOpt; + gl.framebufferRenderbuffer = framebufferRenderbufferOpt; + gl.framebufferTexture2D = framebufferTexture2DOpt; + gl.frontFace = frontFaceOpt; + gl.generateMipmap = generateMipmapOpt; + gl.getActiveAttrib = getActiveAttribOpt; + gl.getActiveUniform = getActiveUniformOpt; + gl.getAttachedShaders = getAttachedShadersOpt; + gl.getAttribLocation = getAttribLocationOpt; + gl.getBufferParameter = getBufferParameterOpt; + gl.getParameter = getParameterOpt; + gl.getError = getErrorOpt; + gl.getFramebufferAttachmentParameter = getFramebufferAttachmentParameterOpt; + gl.getProgramParameter = getProgramParameterOpt; + gl.getProgramInfoLog = getProgramInfoLogOpt; + gl.getRenderbufferParameter = getRenderbufferParameterOpt; + gl.getShaderParameter = getShaderParameterOpt; + gl.getShaderPrecisionFormat = getShaderPrecisionFormatOpt; + gl.getShaderInfoLog = getShaderInfoLogOpt; + gl.getShaderSource = getShaderSourceOpt; + gl.getTexParameter = getTexParameterOpt; + gl.getUniform = getUniformOpt; + gl.getUniformLocation = getUniformLocationOpt; + gl.getVertexAttrib = getVertexAttribOpt; + gl.getVertexAttribOffset = getVertexAttribOffsetOpt; + gl.hint = hintOpt; + gl.isBuffer = isBufferOpt; + gl.isEnabled = isEnabledOpt; + gl.isFramebuffer = isFramebufferOpt; + gl.isProgram = isProgramOpt; + gl.isRenderbuffer = isRenderbufferOpt; + gl.isShader = isShaderOpt; + gl.isTexture = isTextureOpt; + gl.lineWidth = lineWidthOpt; + gl.linkProgram = linkProgramOpt; + gl.pixelStorei = pixelStoreiOpt; + gl.polygonOffset = polygonOffsetOpt; + gl.readPixels = readPixelsOpt; + gl.renderbufferStorage = renderbufferStorageOpt; + gl.sampleCoverage = sampleCoverageOpt; + gl.scissor = scissorOpt; + gl.shaderSource = shaderSourceOpt; + gl.stencilFunc = stencilFuncOpt; + gl.stencilFuncSeparate = stencilFuncSeparateOpt; + gl.stencilMask = stencilMaskOpt; + gl.stencilMaskSeparate = stencilMaskSeparateOpt; + gl.stencilOp = stencilOpOpt; + gl.stencilOpSeparate = stencilOpSeparateOpt; + gl.texImage2D = texImage2DOpt; + gl.texParameterf = texParameterfOpt; + gl.texParameteri = texParameteriOpt; + gl.texSubImage2D = texSubImage2DOpt; + gl.uniform1f = uniform1fOpt; + gl.uniform2f = uniform2fOpt; + gl.uniform3f = uniform3fOpt; + gl.uniform4f = uniform4fOpt; + gl.uniform1i = uniform1iOpt; + gl.uniform2i = uniform2iOpt; + gl.uniform3i = uniform3iOpt; + gl.uniform4i = uniform4iOpt; + gl.uniform1fv = uniform1fvOpt; + gl.uniform2fv = uniform2fvOpt; + gl.uniform3fv = uniform3fvOpt; + gl.uniform4fv = uniform4fvOpt; + gl.uniform1iv = uniform1ivOpt; + gl.uniform2iv = uniform2ivOpt; + gl.uniform3iv = uniform3ivOpt; + gl.uniform4iv = uniform4ivOpt; + gl.uniformMatrix2fv = uniformMatrix2fvOpt; + gl.uniformMatrix3fv = uniformMatrix3fvOpt; + gl.uniformMatrix4fv = uniformMatrix4fvOpt; + gl.useProgram = useProgramOpt; + gl.validateProgram = validateProgramOpt; + gl.vertexAttrib1f = vertexAttrib1fOpt; + gl.vertexAttrib2f = vertexAttrib2fOpt; + gl.vertexAttrib3f = vertexAttrib3fOpt; + gl.vertexAttrib4f = vertexAttrib4fOpt; + gl.vertexAttrib1fv = vertexAttrib1fvOpt; + gl.vertexAttrib2fv = vertexAttrib2fvOpt; + gl.vertexAttrib3fv = vertexAttrib3fvOpt; + gl.vertexAttrib4fv = vertexAttrib4fvOpt; + gl.vertexAttribPointer = vertexAttribPointerOpt; + gl.viewport = viewportOpt; +} + +batchGLCommandsToNative(); + +module.exports = { + disableBatchGLCommandsToNative: disableBatchGLCommandsToNative, + flushCommands: flushCommands +} \ No newline at end of file diff --git a/jsb/builtin/index.js b/jsb/builtin/index.js index b8da5248bc..7453dd8df0 100644 --- a/jsb/builtin/index.js +++ b/jsb/builtin/index.js @@ -24,10 +24,11 @@ ****************************************************************************/ window.CC_JSB = true; -window.CC_WECHATGAME = true; +window.CC_WECHATGAME = true; //FIXME: remove CC_WECHATGAME // Simulate wechat game API: +//FIXME: remove wx window.wx = { getSystemInfoSync() { return { @@ -48,30 +49,61 @@ window.wx = { } } -let oldRequestFrameCallback = null; -let requestAnimationFrameID = 0; -let requestAnimationFrameCallbacks = {}; +window.CanvasRenderingContext2D = cc.CanvasRenderingContext2D; +delete cc.CanvasRenderingContext2D; + +const { btoa, atob } = require('./base64/base64.min'); +window.btoa = btoa; +window.atob = atob; +const { Blob, URL } = require('./Blob'); +window.Blob = Blob; +window.URL = URL; +window.DOMParser = require('./xmldom/dom-parser').DOMParser; + +require('./jsb_prepare'); +require('./jsb_opengl'); +require('./jsb-adapter'); +require('./jsb_audioengine'); + +let _oldRequestFrameCallback = null; +let _requestAnimationFrameID = 0; +let _requestAnimationFrameCallbacks = {}; +let _firstTick = true; window.requestAnimationFrame = function(cb) { - let id = ++requestAnimationFrameID; - requestAnimationFrameCallbacks[id] = cb; + let id = ++_requestAnimationFrameID; + _requestAnimationFrameCallbacks[id] = cb; return id; }; window.cancelAnimationFrame = function(id) { - delete requestAnimationFrameCallbacks[id]; + delete _requestAnimationFrameCallbacks[id]; +}; + +const {disableBatchGLCommandsToNative, flushCommands} = require('./glOptMode'); +window.optConfig = { + disableBatchGLCommandsToNative: disableBatchGLCommandsToNative }; function tick(nowMilliSeconds) { - fireTimeout(nowMilliSeconds); - - for (let id in requestAnimationFrameCallbacks) { - oldRequestFrameCallback = requestAnimationFrameCallbacks[id]; - if (oldRequestFrameCallback) { - delete requestAnimationFrameCallbacks[id]; - oldRequestFrameCallback(nowMilliSeconds); + if (_firstTick) { + _firstTick = false; + if (window.onload) { + var event = new Event('load'); + event._target = window; + window.onload(event); } } + fireTimeout(nowMilliSeconds); + + for (let id in _requestAnimationFrameCallbacks) { + _oldRequestFrameCallback = _requestAnimationFrameCallbacks[id]; + if (_oldRequestFrameCallback) { + delete _requestAnimationFrameCallbacks[id]; + _oldRequestFrameCallback(nowMilliSeconds); + } + } + flushCommands(); } let _timeoutIDIndex = 0; @@ -159,23 +191,8 @@ jsb.fileUtils = cc.fileUtils; delete cc.FileUtils; delete cc.fileUtils; -window.CanvasRenderingContext2D = cc.CanvasRenderingContext2D; -delete cc.CanvasRenderingContext2D; - jsb.urlRegExp = new RegExp("^(?:https?|ftp)://\\S*$", "i"); -require('./jsb_prepare'); -require('./jsb_opengl'); -const { btoa, atob } = require('./base64/base64.min'); -window.btoa = btoa; -window.atob = atob; -const { Blob, URL } = require('./Blob'); -window.Blob = Blob; -window.URL = URL; -window.DOMParser = require('./xmldom/dom-parser').DOMParser; -require('./jsb-adapter'); -require('./jsb_audioengine'); - /** * @type {Object} * @name jsb.reflection diff --git a/jsb/builtin/jsb-adapter/Element.js b/jsb/builtin/jsb-adapter/Element.js index 794eb2fc9d..6c4b19b10d 100755 --- a/jsb/builtin/jsb-adapter/Element.js +++ b/jsb/builtin/jsb-adapter/Element.js @@ -44,7 +44,7 @@ class Element extends Node { } getBoundingClientRect() { - return new DOMRect(); + return new DOMRect(0, 0, window.innerWidth, window.innerHeight); } // attrName is a string that names the attribute to be removed from element. diff --git a/jsb/builtin/jsb-adapter/Event.js b/jsb/builtin/jsb-adapter/Event.js index 54e47e2473..cc15b98e66 100644 --- a/jsb/builtin/jsb-adapter/Event.js +++ b/jsb/builtin/jsb-adapter/Event.js @@ -37,7 +37,7 @@ class Event { constructor(type, eventInit) { this._type = type - this._eventTarget = null + this._target = null this._eventPhase = 2 this._currentTarget = null this._canceled = false @@ -59,7 +59,7 @@ class Event { * @type {EventTarget} */ get target() { - return this._eventTarget + return this._target } /** diff --git a/jsb/builtin/jsb-adapter/EventTarget.js b/jsb/builtin/jsb-adapter/EventTarget.js index f4895ca5a7..84ac5929c4 100644 --- a/jsb/builtin/jsb-adapter/EventTarget.js +++ b/jsb/builtin/jsb-adapter/EventTarget.js @@ -152,15 +152,29 @@ EventTarget.prototype = { throw new TypeError("\"event.type\" should be a string.") } + const eventName = event.type + var onFunc = this['on' + eventName]; + if (onFunc && typeof onFunc === 'function') { + event._target = event._currentTarget = this; + onFunc.call(this, event); + event._target = event._currentTarget = null + event._eventPhase = 0 + event._passiveListener = null + + if (event.defaultPrevented) + return false; + } + // If listeners aren't registered, terminate. const listeners = this._listeners - const eventName = event.type + let node = listeners.get(eventName) if (!node) { return true } event._target = event._currentTarget = this; + // This doesn't process capturing phase and bubbling phase. // This isn't participating in a tree. let prev = null @@ -186,9 +200,6 @@ EventTarget.prototype = { if (typeof node.listener === "function") { node.listener.call(this, event) } - else if (node.listenerType !== ATTRIBUTE && typeof node.listener.handleEvent === "function") { - node.listener.handleEvent(event) - } // Break if `event.stopImmediatePropagation` was called. if (event._stopped) { diff --git a/jsb/builtin/jsb-adapter/FileReader.js b/jsb/builtin/jsb-adapter/FileReader.js index dabc8b7f44..ba99710ac1 100755 --- a/jsb/builtin/jsb-adapter/FileReader.js +++ b/jsb/builtin/jsb-adapter/FileReader.js @@ -42,7 +42,8 @@ class FileReader extends EventTarget { // Starts reading the contents of the specified Blob, once finished, the result attribute contains a data: URL representing the file's data. readAsDataURL(blob) { this.result = 'data:image/png;base64,' + window.btoa(blob); - this.onload(); + var event = new Event('load'); + this.dispatchEvent(event); } // Starts reading the contents of the specified Blob, once finished, the result attribute contains the contents of the file as a text string. diff --git a/jsb/builtin/jsb-adapter/HTMLCanvasElement.js b/jsb/builtin/jsb-adapter/HTMLCanvasElement.js index 4d38c2b827..4f1c040159 100644 --- a/jsb/builtin/jsb-adapter/HTMLCanvasElement.js +++ b/jsb/builtin/jsb-adapter/HTMLCanvasElement.js @@ -218,8 +218,8 @@ class HTMLCanvasElement extends HTMLElement { this.top = 0; this.left = 0; - this._width = width ? width : window.innerWidth; - this._height = height ? height : window.innerHeight; + this._width = width ? Math.ceil(width) : 1; + this._height = height ? Math.ceil(height) : 1; this._context2D = null; this._data = null; } @@ -227,15 +227,14 @@ class HTMLCanvasElement extends HTMLElement { //TODO: implement opts. getContext(name, opts) { var self = this; - console.log(`==> Canvas getContext(${name})`); + // console.log(`==> Canvas getContext(${name})`); if (name === 'webgl' || name === 'experimental-webgl') { - return window.gl; + return window.__gl; } else if (name === '2d') { if (!this._context2D) { this._context2D = new CanvasRenderingContext2D(this._width, this._height); this._context2D._canvas = this; - this._context2D.setCanvasBufferUpdatedCallback(function(data) { - console.log('setCanvasBufferUpdatedCallback: dataLen: ' + data.length); + this._context2D._setCanvasBufferUpdatedCallback(function(data) { self._data = new ImageData(data, self._width, self._height); }); } @@ -251,7 +250,8 @@ class HTMLCanvasElement extends HTMLElement { } set width(width) { - console.log(`==> HTMLCanvasElement.width = ${width}`); + width = Math.ceil(width); + // console.log(`==> HTMLCanvasElement.width = ${width}`); if (this._width !== width) { this._width = width; if (this._context2D) { @@ -265,7 +265,8 @@ class HTMLCanvasElement extends HTMLElement { } set height(height) { - console.log(`==> HTMLCanvasElement.height = ${height}`); + height = Math.ceil(height); + // console.log(`==> HTMLCanvasElement.height = ${height}`); if (this._height !== height) { this._height = height; if (this._context2D) { @@ -340,7 +341,7 @@ function touchEventHandlerFactory(type) { const touchEvent = new TouchEvent(type) touchEvent.touches = touches; - // touchEvent.targetTouches = Array.prototype.slice.call(event.touches) + touchEvent.targetTouches = Array.prototype.slice.call(touchEvent.touches) touchEvent.changedTouches = touches;//event.changedTouches // touchEvent.timeStamp = event.timeStamp diff --git a/jsb/builtin/jsb-adapter/HTMLImageElement.js b/jsb/builtin/jsb-adapter/HTMLImageElement.js index c04f3fb6e2..a6fef85f98 100755 --- a/jsb/builtin/jsb-adapter/HTMLImageElement.js +++ b/jsb/builtin/jsb-adapter/HTMLImageElement.js @@ -25,6 +25,7 @@ const HTMLElement = require('./HTMLElement'); const Event = require('./Event'); +const gl = window.__gl; class HTMLImageElement extends HTMLElement { constructor(width, height) { @@ -32,7 +33,6 @@ class HTMLImageElement extends HTMLElement { this.width = width; this.height = height; this._data = null; - this.onload = null; this._src = null; this.complete = false; this._glFormat = this._glInternalFormat = gl.RGBA; @@ -67,11 +67,8 @@ class HTMLImageElement extends HTMLElement { this.complete = true; - this.dispatchEvent(new Event('load')); - - if (this.onload) { - this.onload(); - } + var event = new Event('load'); + this.dispatchEvent(event); }); } diff --git a/jsb/builtin/jsb-adapter/HTMLVideoElement.js b/jsb/builtin/jsb-adapter/HTMLVideoElement.js new file mode 100644 index 0000000000..fd511e49a8 --- /dev/null +++ b/jsb/builtin/jsb-adapter/HTMLVideoElement.js @@ -0,0 +1,34 @@ +/**************************************************************************** + Copyright (c) 2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos.com + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated engine source code (the "Software"), a limited, + worldwide, royalty-free, non-assignable, revocable and non-exclusive license + to use Cocos Creator solely to develop games on your target platforms. You shall + not use Cocos Creator software for developing other software or tools that's + used for developing games. You are not granted to publish, distribute, + sublicense, and/or sell copies of Cocos Creator. + + The software or tools in this License Agreement are licensed, not sold. + Xiamen Yaji Software Co., Ltd. reserves all rights not expressly granted to you. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +let HTMLMediaElement = require('./HTMLMediaElement'); + +class HTMLVideoElement extends HTMLMediaElement { + constructor() { + super('video') + } +} + +module.exports = HTMLVideoElement; diff --git a/jsb/builtin/jsb-adapter/document.js b/jsb/builtin/jsb-adapter/document.js index 917907eaee..6c6d3faf90 100755 --- a/jsb/builtin/jsb-adapter/document.js +++ b/jsb/builtin/jsb-adapter/document.js @@ -23,12 +23,13 @@ THE SOFTWARE. ****************************************************************************/ -let HTMLElement = require('./HTMLElement'); -let Image = require('./Image'); -let Audio = require('./Audio'); -let HTMLCanvasElement = require('./HTMLCanvasElement'); -let Node = require('./Node'); -let FontFaceSet = require('./FontFaceSet') +const HTMLElement = require('./HTMLElement'); +const Image = require('./Image'); +const Audio = require('./Audio'); +const HTMLCanvasElement = require('./HTMLCanvasElement'); +const HTMLVideoElement = require('./HTMLVideoElement'); +const Node = require('./Node'); +const FontFaceSet = require('./FontFaceSet') class Document extends Node { @@ -61,21 +62,17 @@ class Document extends Node { } else if (tagName === 'img') { return new Image() } else if (tagName === 'video') { - return { - canPlayType: () => { - return false; - } - }; + return new HTMLVideoElement(); } return new HTMLElement(tagName) } getElementById(id) { - if (id === window.canvas.id) { + if (id === window.canvas.id || id === 'canvas') { return window.canvas } - return null + return new HTMLElement(id); } getElementsByTagName(tagName) { @@ -86,7 +83,7 @@ class Document extends Node { } else if (tagName === 'canvas') { return [window.canvas] } - return [] + return [new HTMLElement(tagName)] } getElementsByName(tagName) { @@ -97,7 +94,7 @@ class Document extends Node { } else if (tagName === 'canvas') { return [window.canvas] } - return [] + return [new HTMLElement(tagName)] } querySelector(query) { @@ -110,7 +107,7 @@ class Document extends Node { } else if (query === `#${window.canvas.id}`) { return window.canvas } - return null + return new HTMLElement(query); } querySelectorAll(query) { @@ -121,7 +118,7 @@ class Document extends Node { } else if (query === 'canvas') { return [window.canvas] } - return [] + return [new HTMLElement(query)]; } createTextNode() { diff --git a/jsb/builtin/jsb-adapter/location.js b/jsb/builtin/jsb-adapter/location.js index 1c67c7c269..d262037ef2 100755 --- a/jsb/builtin/jsb-adapter/location.js +++ b/jsb/builtin/jsb-adapter/location.js @@ -24,10 +24,12 @@ ****************************************************************************/ const location = { - href: 'game.js', - hash: '', - reload() { - } + href: 'game.js', + pathname: 'game.js', + search: '', + hash: '', + reload() { + } } module.exports = location; diff --git a/jsb/builtin/jsb-adapter/navigator.js b/jsb/builtin/jsb-adapter/navigator.js index 1179322c62..0b5a70a490 100755 --- a/jsb/builtin/jsb-adapter/navigator.js +++ b/jsb/builtin/jsb-adapter/navigator.js @@ -31,7 +31,7 @@ const navigator = { platform: 'wx', //cjh added wx language: 'zh-cn', appVersion: '5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1', - userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E8301 MicroMessenger/6.6.0 MiniGame NetType/WIFI Language/zh_CN', + userAgent: 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Mobile/14E8301 NetType/WIFI Language/zh_CN', onLine: true, // TODO 用 wx.getNetworkStateChange 和 wx.onNetworkStateChange 来返回真实的状态 // TODO 用 wx.getLocation 来封装 geolocation diff --git a/jsb/builtin/jsb-adapter/window.js b/jsb/builtin/jsb-adapter/window.js index 84e266c4e1..1ee0a594e2 100755 --- a/jsb/builtin/jsb-adapter/window.js +++ b/jsb/builtin/jsb-adapter/window.js @@ -41,9 +41,9 @@ function inject () { window.HTMLImageElement = require('./HTMLImageElement'); window.HTMLMediaElement = require('./HTMLMediaElement'); window.HTMLAudioElement = require('./HTMLAudioElement'); + window.HTMLVideoElement = require('./HTMLVideoElement'); window.canvas = new HTMLCanvasElement(); - window.gl.canvas = window.canvas; - window.WebGLRenderingContext = window.gl; + window.__gl.canvas = window.canvas; window.navigator = require('./navigator'); window.Image = require('./Image'); window.Audio = require('./Audio'); @@ -74,15 +74,15 @@ function inject () { window.addEventListener = function(eventName, listener, options) { window.canvas.addEventListener(eventName, listener, options); - } + }; window.removeEventListener = function(eventName, listener, options) { window.canvas.removeEventListener(eventName, listener, options); - } + }; window.dispatchEvent = function(event) { window.canvas.dispatchEvent(event); - } + }; window.getComputedStyle = function(element) { return { @@ -91,7 +91,9 @@ function inject () { top: '0px', height: '0px' }; - } + }; + + window.focus = function() {}; window._isInjected = true; } diff --git a/jsb/builtin/jsb_opengl.js b/jsb/builtin/jsb_opengl.js index 222cba9147..394c01d3dc 100644 --- a/jsb/builtin/jsb_opengl.js +++ b/jsb/builtin/jsb_opengl.js @@ -28,391 +28,12 @@ */ require('./jsb_opengl_constants'); -window.gl = window.gl || {}; + +const gl = __gl; gl.drawingBufferWidth = window.innerWidth; gl.drawingBufferHeight = window.innerHeight; -// -// Create functions -// -gl.createTexture = function() { - // Returns a "WebGLTexture" object - var ret = gl._createTexture(); - return { texture_id:ret }; -}; - -gl.createBuffer = function() { - // Returns a "WebGLBuffer" object - var ret = gl._createBuffer(); - return { buffer_id:ret }; -}; - -gl.createRenderbuffer = function() { - // Returns a "WebGLRenderBuffer" object - var ret = gl._createRenderbuffer(); - return { renderbuffer_id:ret}; -}; - -gl.createFramebuffer = function() { - // Returns a "WebGLFramebuffer" object - var ret = gl._createFramebuffer(); - return {framebuffer_id:ret}; -}; - -gl.createProgram = function() { - // Returns a "WebGLProgram" object - var ret = gl._createProgram(); - return {program_id:ret}; -}; - -gl.createShader = function(shaderType) { - // Returns a "WebGLShader" object - var ret = gl._createShader(shaderType); - return {shader_id:ret}; -}; - -// -// Delete Functions -// -gl.deleteTexture = function(texture) { - var texture_id = texture.texture_id; - // Accept numbers too. eg: gl.deleteTexture(0) - if (typeof texture === 'number') - texture_id = texture; - - gl._deleteTexture(texture_id); -}; - -gl.deleteBuffer = function(buffer) { - var buffer_id = buffer.buffer_id; - // Accept numbers too. eg: gl.deleteBuffer(0) - if( typeof buffer === 'number' ) - buffer_id = buffer; - - gl._deleteBuffer(buffer_id); -}; - -gl.deleteRenderbuffer = function(buffer) { - var buffer_id = buffer.renderbuffer_id; - // Accept numbers too. eg: gl.deleteRenderbuffer(0) - if (typeof buffer === 'number') - buffer_id = buffer; - - gl._deleteRenderbuffer(renderbuffer_id); -}; - -gl.deleteFramebuffer = function(buffer) { - var buffer_id; - if (buffer) - buffer_id = buffer.framebuffer_id; - else - buffer_id = null; - gl._deleteFramebuffer(buffer_id); -}; - -gl.deleteProgram = function(program) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.deleteShader(0) - if (typeof program === 'number') - program_id = program; - - gl._deleteProgram(program_id); -}; - -gl.deleteShader = function(shader) { - var shader_id = shader.shader_id; - // Accept numbers too. eg: gl.deleteShader(0) - if (typeof shader === 'number') - shader_id = shader; - - gl._deleteShader(shader_id); -}; - -// -// Bind Related -// -// void bindTexture(GLenum target, WebGLTexture? texture); -gl.bindTexture = function(target, texture) { - - var texture_id; - // Accept numbers too. eg: gl.bindTexture(0) - if (typeof texture === 'number') - texture_id = texture; - else if( texture === null ) - texture_id = 0; - else - texture_id = texture.texture_id; - - gl._bindTexture( target, texture_id ); -}; - -// void bindBuffer(GLenum target, WebGLBuffer? buffer); -gl.bindBuffer = function(target, buffer) { - var buffer_id; - // Accept numbers too. eg: gl.bindBuffer(0) - if (typeof buffer === 'number') - buffer_id = buffer; - else if (buffer === null) - buffer_id = 0; - else - buffer_id = buffer.buffer_id; - - gl._bindBuffer(target, buffer_id); -}; - -// void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer); -gl.bindRenderbuffer = function(target, buffer) { - var buffer_id; - - // Accept numbers too. eg: gl.bindRenderbuffer(0) - if (typeof buffer === 'number') - buffer_id = buffer; - else if (buffer === null) - buffer_id = 0; - else - buffer_id = buffer.renderbuffer_id; - - gl._bindRenderbuffer(target, buffer_id); -}; - -// void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer); -gl.bindFramebuffer = function(target, buffer) { - var buffer_id; - - // Accept numbers too. eg: gl.bindFramebuffer(0) - if (typeof buffer === 'number') - buffer_id = buffer; - else if( buffer === null ) - buffer_id = null; - else - buffer_id = buffer.framebuffer_id; - - gl._bindFramebuffer(target, buffer_id); -}; - -gl.framebufferRenderbuffer = function(target, attachment, renderbuffertarget, renderbuffer) { - gl._framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer.renderbuffer_id); -}; - -gl.framebufferTexture2D = function(target, attachment, textarget, texture, level) { - gl._framebufferTexture2D(target, attachment, textarget, texture.texture_id, level); -}; - -gl.isFramebuffer = function(buffer) { - if (buffer && buffer.framebuffer_id) { - return gl._isFramebuffer(buffer.framebuffer_id); - } - return false; -}; - -gl.isProgram = function(program) { - if (program && program.program_id) { - return gl._isProgram(program.program_id); - } - return false; -}; - -gl.isRenderbuffer = function(buffer) { - if (buffer && buffer.renderbuffer_id) { - return gl._isRenderbuffer(buffer.renderbuffer_id); - } - return false; -}; - -gl.isShader = function(shader) { - if (shader && shader.shader_id) { - return gl._isShader(shader.shader_id); - } - return false; -}; - -gl.isTexture = function(texture) { - if (texture && texture.texture_id) { - return gl._isTexture(texture.texture_id); - } - return false; -}; - -// -// Uniform related -// -// any getUniform(WebGLProgram? program, WebGLUniformLocation? location); -gl.getUniform = function(program, location) { - var program_id; - var location_id; - - // Accept numbers too. eg: gl.bindFramebuffer(0) - if (typeof program === 'number') - program_id = program; - else - program_id = program.program_id; - - if (typeof location === 'number') - location_id = location; - else - location_id = location.location_id; - - return gl._getUniform(program_id, location_id); -}; - -// gl.uniformMatrix2fv = function(location, bool, matrix) { -// gl._uniformMatrix2fv(program.program_id, bool, matrix); -// }; - -// gl.uniformMatrix3fv = function(program, bool, matrix) { -// gl._uniformMatrix3fv(program.program_id, bool, matrix); -// }; - -// gl.uniformMatrix4fv = function(program, bool, matrix) { -// gl._uniformMatrix4fv(program.program_id, bool, matrix); -// }; - - -// -// Shader related -// -// void compileShader(WebGLShader? shader); -gl.compileShader = function(shader) { - gl._compileShader( shader.shader_id); -}; - -// void shaderSource(WebGLShader? shader, DOMString source); -gl.shaderSource = function(shader, source) { - gl._shaderSource(shader.shader_id, source); -}; - -// any getShaderParameter(WebGLShader? shader, GLenum pname); -gl.getShaderParameter = function(shader, e) { - return gl._getShaderParameter(shader.shader_id,e); -}; - -// DOMString? getShaderInfoLog(WebGLShader? shader); -gl.getShaderInfoLog = function(shader) { - return gl._getShaderInfoLog(shader.shader_id); -}; - -// DOMString gl.getShaderSource(shader); -gl.getShaderSource = function(shader) { - return gl._getShaderSource(shader.shader_id); -}; - -// -// program related -// -// void attachShader(WebGLProgram? program, WebGLShader? shader); -gl.attachShader = function(program, shader) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.attachShader(17) - if( typeof program === 'number' ) - program_id = program; - - gl._attachShader(program_id, shader.shader_id); -}; - -// void linkProgram(WebGLProgram? program); -gl.linkProgram = function(program) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.linkProgram(17) - if( typeof program === 'number' ) - program_id = program; - - gl._linkProgram(program_id); -}; - -gl.bindAttribLocation = function(program, index, name) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.linkProgram(17) - if( typeof program === 'number' ) - program_id = program; - - gl._bindAttribLocation(program_id, index, name); -}; - -// any getProgramParameter(WebGLProgram? program, GLenum pname); -gl.getProgramParameter = function(program, e) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.getProgramParameter(17) - if (typeof program === 'number') - program_id = program; - - return gl._getProgramParameter(program_id, e); -}; - -gl.getProgramInfoLog = function(program) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.getProgramParameter(17) - if (typeof program === 'number') - program_id = program; - - return gl._getProgramInfoLog(program_id); -}; - -// void useProgram(WebGLProgram? program); -gl.useProgram = function(program) { - var program_id; - // Accept numbers too. eg: gl.useProgram(17) - if (typeof program === 'number') - program_id = program; - else - program_id = program.program_id; - - gl._useProgram (program_id); -}; - - -// [WebGLHandlesContextLoss] GLint getAttribLocation(WebGLProgram? program, DOMString name); -gl.getAttribLocation = function(program, name) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.getAttribLocation(17) - if (typeof program === 'number') - program_id = program; - - return gl._getAttribLocation(program_id, name); -}; - -// WebGLUniformLocation? getUniformLocation(WebGLProgram? program, DOMString name); -gl.getUniformLocation = function(program, name) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.getUniformLocation(17) - if (typeof program === 'number') - program_id = program; - - // XXX: it should return an object, not an integer - return gl._getUniformLocation(program_id,name); -}; - - -// WebGLActiveInfo? getActiveAttrib(WebGLProgram? program, GLuint index); -gl.getActiveAttrib = function(program, index) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.getActiveAttrib(17) - if (typeof program === 'number') - program_id = program; - - return gl._getActiveAttrib(program_id, index); -}; - -// WebGLActiveInfo? getActiveUniform(WebGLProgram? program, GLuint index); -gl.getActiveUniform = function(program, index) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.getActiveUniform(17) - if (typeof program === 'number') - program_id = program; - - return gl._getActiveUniform(program_id, index); -}; - -// sequence? getAttachedShaders(WebGLProgram? program); -gl.getAttachedShaders = function(program) { - var program_id = program.program_id; - // Accept numbers too. eg: gl.getAttachedShaders(17) - if (typeof program === 'number') - program_id = program; - - return gl._getAttachedShaders(program_id); -}; - // // Extensions // @@ -447,24 +68,23 @@ void gl.texImage2D(target, level, internalformat, format, type, ImageBitmap? pix gl.texImage2D = function(target, level, internalformat, width, height, border, format, type, pixels) { let argCount = arguments.length; if (argCount == 6) { + var image = border; type = height; format = width; if (image instanceof HTMLImageElement) { - // console.log(`==> texImage2D HTMLImageElement internalformat: ${image._glInternalFormat}, format: ${image._glFormat}, image: w:${image.width}, h:${image.height}, dataLen:${image._data.length}`); gl.pixelStorei(gl.UNPACK_ALIGNMENT, image._alignment); - _glTexImage2D(target, level, image._glInternalFormat, image.width, image.height, 0, image._glFormat, image._glType, image._data); } else if (image instanceof HTMLCanvasElement) { - // console.log(`==> texImage2D HTMLCanvasElement internalformat: ${internalformat}, format: ${format}, image: w:${image.width}, h:${image.height}`);//, dataLen:${image._data.length}`); + var data = null; if (image._data) { - _glTexImage2D(target, level, internalformat, image.width, image.height, 0, format, type, image._data._data); + data = image._data._data; } + _glTexImage2D(target, level, internalformat, image.width, image.height, 0, format, type, data); } else if (image instanceof ImageData) { - // console.log(`==> texImage2D ImageData internalformat: ${internalformat}, format: ${format}, image: w:${image.width}, h:${image.height}`); _glTexImage2D(target, level, internalformat, image.width, image.height, 0, format, type, image._data); } else { @@ -473,7 +93,8 @@ gl.texImage2D = function(target, level, internalformat, width, height, border, f } else if (argCount == 9) { _glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels); - } else { + } + else { console.error("gl.texImage2D: invalid argument count!"); } } @@ -496,15 +117,16 @@ gl.texSubImage2D = function(target, level, xoffset, yoffset, width, height, form type = height; format = width; - //TODO: ImageData if (image instanceof HTMLImageElement) { gl.pixelStorei(gl.UNPACK_ALIGNMENT, image._alignment); _glTexSubImage2D(target, level, xoffset, yoffset, image.width, image.height, image._glFormat, image._glType, image._data); } else if (image instanceof HTMLCanvasElement) { + var data = null; if (image._data) { - _glTexSubImage2D(target, level, xoffset, yoffset, image.width, image.height, format, type, image._data._data); + data = image._data._data; } + _glTexSubImage2D(target, level, xoffset, yoffset, image.width, image.height, format, type, data); } else if (image instanceof ImageData) { _glTexSubImage2D(target, level, xoffset, yoffset, image.width, image.height, format, type, image._data); @@ -515,7 +137,8 @@ gl.texSubImage2D = function(target, level, xoffset, yoffset, width, height, form } else if (argCount == 9) { _glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); - } else { + } + else { console.error((new Error("gl.texImage2D: invalid argument count!").stack)); } } diff --git a/jsb/builtin/jsb_opengl_constants.js b/jsb/builtin/jsb_opengl_constants.js index b0675ddc16..a9735a0c8c 100644 --- a/jsb/builtin/jsb_opengl_constants.js +++ b/jsb/builtin/jsb_opengl_constants.js @@ -23,13 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -/* -* AUTOGENERATED FILE. DO NOT EDIT IT -* Generated by "generate_jsb.py -c opengl_jsb.ini" on 2013-03-18 -* Script version: v0.6 -*/ - -window.gl = window.gl || {}; +const gl = __gl; gl.GCCSO_SHADER_BINARY_FJ = 0x9260; gl._3DC_XY_AMD = 0x87fa; From d8ca6001d89d2d0726d4846c8ba199bd963b90a4 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 19 Apr 2018 16:58:44 +0800 Subject: [PATCH 53/53] Recursively visit node instead of walk through comp chain --- cocos2d/core/CCNode.js | 4 - cocos2d/core/components/CCRenderComponent.js | 5 - .../core/renderer/render-component-walker.js | 90 +++++---- .../core/renderer/utils/hierarchy-chain.js | 187 ------------------ cocos2d/core/utils/base-node.js | 5 - 5 files changed, 48 insertions(+), 243 deletions(-) delete mode 100644 cocos2d/core/renderer/utils/hierarchy-chain.js diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index c1db785026..83c946aa52 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -35,7 +35,6 @@ const eventManager = require('./event-manager'); const macro = require('./platform/CCMacro'); const misc = require('./utils/misc'); const Event = require('./event/event'); -const hierarchyChain = require('./renderer/utils/hierarchy-chain'); const Flags = cc.Object.Flags; const Destroying = Flags.Destroying; @@ -1100,8 +1099,6 @@ var Node = cc.Class({ eventManager.pauseTarget(this); } - hierarchyChain.rebuild(this); - let children = this._children; for (let i = 0, len = children.length; i < len; i++) { children[i]._onBatchCreated(); @@ -2481,7 +2478,6 @@ var Node = cc.Class({ } this.emit(CHILD_REORDER); } - hierarchyChain.rebuild(this); cc.director.__fastOff(cc.Director.EVENT_AFTER_UPDATE, this.sortAllChildren, this); } }, diff --git a/cocos2d/core/components/CCRenderComponent.js b/cocos2d/core/components/CCRenderComponent.js index 48028bab40..699776fc45 100644 --- a/cocos2d/core/components/CCRenderComponent.js +++ b/cocos2d/core/components/CCRenderComponent.js @@ -26,7 +26,6 @@ const Component = require('./CCComponent'); const defaultVertexFormat = require('../renderer/vertex-format'); const renderEngine = require('../renderer/render-engine'); -const hierarchyChain = require('../renderer/utils/hierarchy-chain'); const RenderData = renderEngine.RenderData; /** @@ -62,10 +61,6 @@ var RenderComponent = cc.Class({ onEnable () { this.node._renderComponent = this; - // When parent children order dirty, its children's render component will be rechained in sortAllChildren - if (!this.node.parent._reorderChildDirty) { - hierarchyChain.rebuildSelf(this.node); - } }, onDisable () { diff --git a/cocos2d/core/renderer/render-component-walker.js b/cocos2d/core/renderer/render-component-walker.js index d5b8c09be4..5f26833511 100644 --- a/cocos2d/core/renderer/render-component-walker.js +++ b/cocos2d/core/renderer/render-component-walker.js @@ -27,7 +27,6 @@ const macro = require('../platform/CCMacro'); const renderEngine = require('./render-engine'); const defaultVertexFormat = require('./vertex-format'); const StencilManager = require('./stencil-manager'); -const hierarchyChain = require('./utils/hierarchy-chain'); const atlasManager = require('./utils/dynamic-atlas/manager'); const gfx = renderEngine.gfx; @@ -64,7 +63,6 @@ var RenderComponentWalker = function (device, renderScene) { MAX_INDICE: MAX_INDICE }; - let defaultFormat = new gfx.VertexFormat([]); this._iaPool = new RecyclePool(function () { return new InputAssembler(); @@ -74,7 +72,6 @@ var RenderComponentWalker = function (device, renderScene) { return new renderEngine.Model(); }, 16); - // buffers this._vb = null; this._ib = null; @@ -323,48 +320,57 @@ RenderComponentWalker.prototype = { return null; }, + _visitNode (node) { + if (!node._activeInHierarchy) { + return; + } + + let batchData = this._batchData; + // Transform + if (node._worldMatDirty) { + node._updateWorldMatrix(); + batchData.worldMatUpdated = true; + } + + // Culling mask + if (node.groupIndex !== 0) { + this._curCameraNode = node; + } + let group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; + let cullingMask = node._cullingMask = 1 << group; + + // Render self + let comp = node._renderComponent; + let needDraw = !!(comp && comp._enabled); + if (needDraw) { + let assembler = comp._assembler || comp.constructor._assembler; + this._commitComp(comp, assembler, cullingMask); + } + // Reset worldMatUpdated + batchData.worldMatUpdated = false; + + // Render children + let children = node._children; + for (let i = 0, l = children.length; i < l; i++) { + this._visitNode(children[i]); + } + + // Post render + if (needDraw && comp.constructor._postAssembler) { + this._commitComp(comp, comp.constructor._postAssembler, cullingMask); + } + + // Reset current camera node + if (this._curCameraNode === node) { + this._curCameraNode = null; + } + }, + visit (scene) { this.reset(); - let batchData = this._batchData; - let entry = this._findEntry(scene); - let comp, node, assembler, group, cullingMask; - for (; entry; entry = entry.next) { - comp = entry.comp; - node = comp.node; - if (!comp._enabled || !node._activeInHierarchy) { - continue; - } - assembler = null; - - // Pre handle - if (!entry.post) { - if (node.groupIndex !== 0) { - this._curCameraNode = node; - } - - group = this._curCameraNode ? this._curCameraNode.groupIndex : node.groupIndex; - node._cullingMask = 1 << group; - assembler = comp._assembler || comp.constructor._assembler; - } - // Post handle - else { - if (this._curCameraNode === node) { - this._curCameraNode = null; - } - assembler = comp.constructor._postAssembler; - } - - // Transform - if (node._worldMatDirty) { - node._updateWorldMatrix(); - batchData.worldMatUpdated = true; - } - - // Commit component render data - cullingMask = node._cullingMask; - this._commitComp(comp, assembler, cullingMask); - this._batchData.worldMatUpdated = false; + for (let i = 0, l = scene._children.length; i < l; i++) { + this._visitNode(scene._children[i]); } atlasManager.update(); diff --git a/cocos2d/core/renderer/utils/hierarchy-chain.js b/cocos2d/core/renderer/utils/hierarchy-chain.js deleted file mode 100644 index 38fe8401c4..0000000000 --- a/cocos2d/core/renderer/utils/hierarchy-chain.js +++ /dev/null @@ -1,187 +0,0 @@ -/**************************************************************************** - Copyright (c) 2013-2016 Chukong Technologies Inc. - Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. - - http://www.cocos2d-x.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - ****************************************************************************/ - -function findPrevious (node) { - let parent = node._parent; - // reach root scene - if (!parent) { - return null; - } - - // Find previous render component in siblings - let children = parent._children; - let index = children.indexOf(node); - let previous = null, comp = null; - for (let i = index - 1; i >= 0; i--) { - let sibling = children[i]; - previous = findLast(sibling); - if (previous) { - return previous; - } - } - - // Find previous render component in parent level - if (parent._renderComponent) { - return parent._renderComponent._chain; - } - else { - return findPrevious(parent); - } -} - -function findNext (node) { - let parent = node._parent; - // reach root scene - if (!parent) { - return null; - } - - // Find next render component in siblings - let children = parent._children; - let index = children.indexOf(node); - let next = null; - for (let i = index + 1; i < children.length; i++) { - let sibling = children[i]; - next = findFirst(sibling); - if (next) { - return next; - } - } - - let comp = parent._renderComponent; - if (comp && comp.constructor._postAssembler) { - if (!comp._postChain) { - comp._postChain = { - post: true, - comp: comp, - next: null - } - } - // If parent's component has post assembler, we need to chain it to the next component - return comp._postChain; - } - - // Find next render component in parent level - return findNext(parent); -} - -function findFirst (node) { - if (node._renderComponent) { - return node._renderComponent._chain; - } - - let children = node._children; - let first; - for (let i = 0; i < children.length; i++) { - let child = children[i]; - first = findFirst(child); - if (first) { - return first; - } - } - return null; -} - -function findLast (node) { - let comp = node._renderComponent; - if (comp && comp.constructor._postAssembler) { - if (!comp._postChain) { - comp._postChain = { - post: true, - comp: comp, - next: null - } - } - // If parent's component has post assembler, we need to chain it to the next component - return comp._postChain; - } - - let children = node._children; - let last; - for (let i = children.length - 1; i >= 0; i--) { - last = findLast(children[i]); - if (last) { - return last; - } - } - return comp ? comp._chain : null; -} - -module.exports = { - unchainSelf (node) { - let last = findLast(node); - if (last) { - // Chain previous node to the next node - let previous = findPrevious(node); - if (previous) { - previous.next = last.next; - } - } - }, - - rebuildSelf (node) { - let previous = findPrevious(node); - let first = findFirst(node); - // If first not exist, then no render component inside the current node - if (first) { - let last = findLast(node); - if (previous) { - last.next = previous.next; - previous.next = first; - } - else { - last.next = null; - } - } - }, - - rebuild (node) { - let previous = node._renderComponent ? node._renderComponent._chain : findPrevious(node); - // Rebuild for all children - let children = node._children; - let curr, first; - for (let i = 0; i < children.length; i++) { - curr = children[i]; - first = findFirst(curr); - // If first not exist, then no render component inside the current node, nothing to do - if (first) { - if (previous) { - // Rebuild chain for previous render component and the first render component in sub tree - previous.next = first; - } - // Set previous to the last render component in sub tree - previous = findLast(curr); - } - } - if (previous) { - // Link the last render component's next to the outside next render component - previous.next = findNext(node); - } - }, - - entry (scene) { - return findFirst(scene); - } -} \ No newline at end of file diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 503e290ce2..dcdda82f18 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -30,7 +30,6 @@ const misc = require('./misc'); const js = require('../platform/js'); const IdGenerater = require('../platform/id-generater'); const eventManager = require('../event-manager'); -const hierarchyChain = require('../renderer/utils/hierarchy-chain'); const Destroying = Flags.Destroying; const DontDestroy = Flags.DontDestroy; @@ -353,10 +352,6 @@ var BaseNode = cc.Class({ if (CC_DEBUG && oldParent && (oldParent._objFlags & Deactivating)) { cc.errorID(3821); } - if (oldParent) { - // Unchain from old parent - hierarchyChain.unchainSelf(this); - } this._parent = value || null; this._onSetParent(value);