diff --git a/CCBoot.js b/CCBoot.js index bc24b6c8c6..c512e37692 100644 --- a/CCBoot.js +++ b/CCBoot.js @@ -31,7 +31,7 @@ * @property {String} ENGINE_VERSION */ var engineVersion; -engineVersion = '2.0.0 preview'; +engineVersion = '2.0.0 preview3'; window['CocosEngine'] = cc.ENGINE_VERSION = engineVersion; require('./cocos2d/core/utils'); diff --git a/cocos2d/animation/animation-manager.js b/cocos2d/animation/animation-manager.js index 8b0dfccb88..1edd4ec9b8 100644 --- a/cocos2d/animation/animation-manager.js +++ b/cocos2d/animation/animation-manager.js @@ -46,7 +46,7 @@ var AnimationManager = cc.Class({ } var events = this._delayEvents; - for (i = 0, l = events.length; i < l; i++) { + for (let i = 0, l = events.length; i < l; i++) { var event = events[i]; event.target[event.func].apply(event.target, event.args); } diff --git a/cocos2d/core/CCPrivateNode.js b/cocos2d/core/CCPrivateNode.js index 566c4900e1..017d430991 100644 --- a/cocos2d/core/CCPrivateNode.js +++ b/cocos2d/core/CCPrivateNode.js @@ -114,7 +114,7 @@ let PrivateNode = cc.Class({ this.setLocalDirty(LocalDirtyFlag.POSITION); this._renderFlag |= RenderFlow.FLAG_LOCAL_TRANSFORM; if (sendEvent === true && (this._eventMask & POSITION_ON)) { - this.emit(EventType.POSITION_CHANGED); + this.emit(Node.EventType.POSITION_CHANGED); } }, diff --git a/cocos2d/core/base-ui/CCWidgetManager.js b/cocos2d/core/base-ui/CCWidgetManager.js index 302be847a2..6bf10f1d60 100644 --- a/cocos2d/core/base-ui/CCWidgetManager.js +++ b/cocos2d/core/base-ui/CCWidgetManager.js @@ -47,11 +47,8 @@ function getReadonlyNodeSize (parent) { if (parent instanceof cc.Scene) { return CC_EDITOR ? cc.engine.getDesignResolutionSize() : cc.visibleRect; } - else if (!parent._sizeProvider || (parent._sizeProvider instanceof _ccsg.Node)) { - return parent._contentSize; - } else { - return parent.getContentSize(); + return parent._contentSize; } } diff --git a/cocos2d/core/components/CCComponentEventHandler.js b/cocos2d/core/components/CCComponentEventHandler.js index 9a0b2fd373..5fd1265e2a 100644 --- a/cocos2d/core/components/CCComponentEventHandler.js +++ b/cocos2d/core/components/CCComponentEventHandler.js @@ -98,14 +98,14 @@ cc.Component.EventHandler = cc.Class({ */ emitEvents: function(events) { 'use strict'; - var args, i, l; + let args; if (arguments.length > 0) { args = new Array(arguments.length - 1); - for (i = 0, l = args.length; i < l; i++) { + for (let i = 0, l = args.length; i < l; i++) { args[i] = arguments[i+1]; } } - for (i = 0, l = events.length; i < l; i++) { + for (let i = 0, l = events.length; i < l; i++) { var event = events[i]; if (!(event instanceof cc.Component.EventHandler)) continue; diff --git a/cocos2d/core/components/CCMask.js b/cocos2d/core/components/CCMask.js index 6fc45da4ba..ea83a75cd0 100644 --- a/cocos2d/core/components/CCMask.js +++ b/cocos2d/core/components/CCMask.js @@ -145,7 +145,6 @@ let Mask = cc.Class({ this._spriteFrame = value; this._applySpriteFrame(lastSprite); }, - type: cc.SpriteFrame, }, /** diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index 5aa738cbe6..2ebaf27b4c 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -649,7 +649,7 @@ let ScrollView = cc.Class({ */ scrollTo (anchor, timeInSecond, attenuated) { let moveDelta = this._calculateMovePercentDelta({ - anchor: anchor, + anchor: cc.v2(anchor), applyToHorizontal: true, applyToVertical: true, }); diff --git a/cocos2d/core/load-pipeline/CCLoader.js b/cocos2d/core/load-pipeline/CCLoader.js index 28b88f7679..7efa22542d 100644 --- a/cocos2d/core/load-pipeline/CCLoader.js +++ b/cocos2d/core/load-pipeline/CCLoader.js @@ -767,8 +767,9 @@ proto.release = function (asset) { var removed = this.removeItem(id); asset = item.content; if (cc.Class.isInstanceOf(asset, cc.Asset)) { - if (asset.nativeUrl) { - this.release(asset.nativeUrl); // uncache loading item of native asset + let nativeUrl = asset.nativeUrl; + if (nativeUrl) { + this.release(nativeUrl); // uncache loading item of native asset } asset.destroy(); } diff --git a/cocos2d/core/platform/CCView.js b/cocos2d/core/platform/CCView.js index 753ac0fcf8..4b4ee802aa 100644 --- a/cocos2d/core/platform/CCView.js +++ b/cocos2d/core/platform/CCView.js @@ -863,11 +863,12 @@ View.prototype = { * @param {Number} h */ setScissorInPoints: function (x, y, w, h) { - var scaleX = this._scaleX, scaleY = this._scaleY; - var sx = Math.ceil(x * scaleX + this._viewportRect.x); - var sy = Math.ceil(y * scaleY + this._viewportRect.y); - var sw = Math.ceil(w * scaleX); - var sh = Math.ceil(h * scaleY); + let scaleX = this._scaleX, scaleY = this._scaleY; + let sx = Math.ceil(x * scaleX + this._viewportRect.x); + let sy = Math.ceil(y * scaleY + this._viewportRect.y); + let sw = Math.ceil(w * scaleX); + let sh = Math.ceil(h * scaleY); + let gl = cc.game._renderContext; if (!_scissorRect) { var boxArr = gl.getParameter(gl.SCISSOR_BOX); @@ -879,7 +880,7 @@ View.prototype = { _scissorRect.y = sy; _scissorRect.width = sw; _scissorRect.height = sh; - cc.game._renderContext.scissor(sx, sy, sw, sh); + gl.scissor(sx, sy, sw, sh); } }, diff --git a/cocos2d/core/renderer/canvas/renderers/sprite/index.js b/cocos2d/core/renderer/canvas/renderers/sprite/index.js index 85927679c6..0e7b137e63 100644 --- a/cocos2d/core/renderer/canvas/renderers/sprite/index.js +++ b/cocos2d/core/renderer/canvas/renderers/sprite/index.js @@ -23,7 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -let SpriteType = require('../../../../components/CCSprite').Type; +const Sprite = require('../../../../components/CCSprite'); +const SpriteType = Sprite.Type; +const FillType = Sprite.FillType; let simple = require('./simple'); let sliced = require('./sliced'); let tiled = require('./tiled'); diff --git a/cocos2d/core/renderer/render-engine.js b/cocos2d/core/renderer/render-engine.js index 540c5ac47d..dbc53710df 100644 --- a/cocos2d/core/renderer/render-engine.js +++ b/cocos2d/core/renderer/render-engine.js @@ -14327,7 +14327,7 @@ var StencilMaterial = (function (Material$$1) { }; prototypeAccessors.useTexture.get = function () { - this._effect.getDefine('useTexture', val); + this._effect.getDefine('useTexture'); }; prototypeAccessors.useTexture.set = function (val) { diff --git a/cocos2d/core/renderer/render-engine.jsb.js b/cocos2d/core/renderer/render-engine.jsb.js index c86b0ae360..9878a4c96f 100644 --- a/cocos2d/core/renderer/render-engine.jsb.js +++ b/cocos2d/core/renderer/render-engine.jsb.js @@ -1974,7 +1974,7 @@ var StencilMaterial = (function (Material$$1) { }; prototypeAccessors.useTexture.get = function () { - this._effect.getDefine('useTexture', val); + this._effect.getDefine('useTexture'); }; prototypeAccessors.useTexture.set = function (val) { diff --git a/cocos2d/core/renderer/webgl/assemblers/sprite/mesh.js b/cocos2d/core/renderer/webgl/assemblers/sprite/mesh.js index f35c59c4d3..f5b0d44c45 100644 --- a/cocos2d/core/renderer/webgl/assemblers/sprite/mesh.js +++ b/cocos2d/core/renderer/webgl/assemblers/sprite/mesh.js @@ -109,7 +109,7 @@ const dynamicAtlasManager = require('../../../utils/dynamic-atlas/manager'); rectWidth = frame._rect.width, rectHeight = frame._rect.height, offsetX = frame._offset.x, - offsetY = frame._offset.y; + offsetY = frame._offset.y, trimX = offsetX + (originalWidth - rectWidth) / 2, trimY = offsetY + (originalHeight - rectHeight) / 2; diff --git a/cocos2d/core/value-types/vec2.js b/cocos2d/core/value-types/vec2.js index bb949c8fa1..c16b0c9c84 100644 --- a/cocos2d/core/value-types/vec2.js +++ b/cocos2d/core/value-types/vec2.js @@ -24,10 +24,10 @@ THE SOFTWARE. ****************************************************************************/ -var ValueType = require('./value-type'); -var js = require('../platform/js'); -var CCClass = require('../platform/CCClass'); -var misc = require('../utils/misc'); +const ValueType = require('./value-type'); +const js = require('../platform/js'); +const CCClass = require('../platform/CCClass'); +const misc = require('../utils/misc'); /** * !#en Representation of 2D vectors and points. diff --git a/cocos2d/core/value-types/vec3.js b/cocos2d/core/value-types/vec3.js index 335f22e45a..407ff3f245 100644 --- a/cocos2d/core/value-types/vec3.js +++ b/cocos2d/core/value-types/vec3.js @@ -24,10 +24,11 @@ THE SOFTWARE. ****************************************************************************/ -var ValueType = require('./value-type'); -var js = require('../platform/js'); -var CCClass = require('../platform/CCClass'); -var math = require('../renderer/render-engine').math; +const ValueType = require('./value-type'); +const js = require('../platform/js'); +const CCClass = require('../platform/CCClass'); +const math = require('../renderer/render-engine').math; +const misc = require('../utils/misc'); /** * !#en Representation of 3D vectors and points.