diff --git a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js index f1127443d6..016459275f 100644 --- a/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js +++ b/cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js @@ -22,6 +22,8 @@ THE SOFTWARE. ****************************************************************************/ +require('../shape-nodes/CCDrawNode'); + //-------------------------- ClippingNode's canvas render cmd -------------------------------- cc.ClippingNode.CanvasRenderCmd = function(renderable){ this._rootCtor(renderable); diff --git a/cocos2d/core/components/CCMask.js b/cocos2d/core/components/CCMask.js index 02d9babf36..cb5bf34a2e 100644 --- a/cocos2d/core/components/CCMask.js +++ b/cocos2d/core/components/CCMask.js @@ -22,9 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + require('../../clipping-nodes/CCClippingNode'); require('../../clipping-nodes/CCClippingNodeCanvasRenderCmd'); require('../../clipping-nodes/CCClippingNodeWebGLRenderCmd'); + +require('../../shape-nodes/CCDrawNode'); + var Base = cc._RendererInSG; /** diff --git a/cocos2d/index.js b/cocos2d/index.js index 4c0f05e58a..ba06b83849 100644 --- a/cocos2d/index.js +++ b/cocos2d/index.js @@ -16,9 +16,6 @@ require('./core/sprites/CCScale9Sprite'); require('./core/sprites/CCScale9SpriteCanvasRenderCmd'); require('./core/sprites/CCScale9SpriteWebGLRenderCmd'); require('./core/sprites/CCSpriteBatchNode'); -require('./shape-nodes/CCDrawNode'); -require('./shape-nodes/CCDrawNodeCanvasRenderCmd'); -require('./shape-nodes/CCDrawNodeWebGLRenderCmd'); require('./render-texture/CCRenderTexture'); require('./render-texture/CCRenderTextureCanvasRenderCmd'); require('./render-texture/CCRenderTextureWebGLRenderCmd'); diff --git a/cocos2d/shape-nodes/CCDrawNode.js b/cocos2d/shape-nodes/CCDrawNode.js index e19b55a924..a887eacf78 100644 --- a/cocos2d/shape-nodes/CCDrawNode.js +++ b/cocos2d/shape-nodes/CCDrawNode.js @@ -448,7 +448,9 @@ cc.game.once(cc.game.EVENT_RENDERER_INITED, function () { this._buffer.length = 0; }; - proto._createRenderCmd = function(){ + require('./CCDrawNodeCanvasRenderCmd'); + + proto._createRenderCmd = function () { return new cc.DrawNode.CanvasRenderCmd(this); }; } @@ -839,6 +841,8 @@ cc.game.once(cc.game.EVENT_RENDERER_INITED, function () { this._dirty = true; }; + require('./CCDrawNodeWebGLRenderCmd'); + proto._createRenderCmd = function () { return new cc.DrawNode.WebGLRenderCmd(this); }; diff --git a/cocos2d/tilemap/CCSGTMXObject.js b/cocos2d/tilemap/CCSGTMXObject.js index 3b1e8df60c..e48524ba91 100644 --- a/cocos2d/tilemap/CCSGTMXObject.js +++ b/cocos2d/tilemap/CCSGTMXObject.js @@ -23,6 +23,7 @@ THE SOFTWARE. ****************************************************************************/ +require('../shape-nodes/CCDrawNode'); /** * !#en Renders the TMX object. diff --git a/extensions/dragonbones/CCArmatureDisplay.js b/extensions/dragonbones/CCArmatureDisplay.js index 560886ff9c..07a96a6048 100644 --- a/extensions/dragonbones/CCArmatureDisplay.js +++ b/extensions/dragonbones/CCArmatureDisplay.js @@ -23,6 +23,7 @@ ****************************************************************************/ var EventTarget = require('../../cocos2d/core/event/event-target'); +require('../../cocos2d/shape-nodes/CCDrawNode'); dragonBones.CCArmatureDisplay = cc.Class({ name: 'dragonBones.CCArmatureDisplay',