From fbbdf7e8c8a9ea0ccd94dd25a04b486451bfcc0a Mon Sep 17 00:00:00 2001 From: yinkaile <501251991@qq.com> Date: Fri, 30 Mar 2018 15:16:19 +0800 Subject: [PATCH] adjust motion streak structure --- .../components}/CCMotionStreak.js | 6 ++--- cocos2d/core/components/index.js | 1 + cocos2d/core/renderer/assemblers/index.js | 1 + .../renderer/assemblers/motion-streak.js} | 9 ++++--- cocos2d/motion-streak/index.js | 27 ------------------- extends.js | 1 - modules.json | 3 ++- 7 files changed, 12 insertions(+), 36 deletions(-) rename cocos2d/{motion-streak => core/components}/CCMotionStreak.js (97%) rename cocos2d/{motion-streak/motion-streak-assembler.js => core/renderer/assemblers/motion-streak.js} (96%) delete mode 100644 cocos2d/motion-streak/index.js diff --git a/cocos2d/motion-streak/CCMotionStreak.js b/cocos2d/core/components/CCMotionStreak.js similarity index 97% rename from cocos2d/motion-streak/CCMotionStreak.js rename to cocos2d/core/components/CCMotionStreak.js index a663159855..24623e2b80 100644 --- a/cocos2d/motion-streak/CCMotionStreak.js +++ b/cocos2d/core/components/CCMotionStreak.js @@ -24,9 +24,9 @@ THE SOFTWARE. ****************************************************************************/ -const RenderComponent = require('../core/components/CCRenderComponent'); -const renderer = require('../core/renderer'); -const renderEngine = require('../core/renderer/render-engine'); +const RenderComponent = require('../components/CCRenderComponent'); +const renderer = require('../renderer'); +const renderEngine = require('../renderer/render-engine'); const SpriteMaterial = renderEngine.SpriteMaterial; /** diff --git a/cocos2d/core/components/index.js b/cocos2d/core/components/index.js index dac7750edb..d5bfad41bb 100644 --- a/cocos2d/core/components/index.js +++ b/cocos2d/core/components/index.js @@ -51,6 +51,7 @@ var components = [ require('./CCToggleGroup'), require('./CCToggle'), require('./CCBlockInputEvents'), + require('./CCMotionStreak') ]; // Delay require render components assemblers diff --git a/cocos2d/core/renderer/assemblers/index.js b/cocos2d/core/renderer/assemblers/index.js index 55f9daabd7..65a9b28071 100644 --- a/cocos2d/core/renderer/assemblers/index.js +++ b/cocos2d/core/renderer/assemblers/index.js @@ -27,3 +27,4 @@ require('./sprite'); require('./mask-assembler'); require('./graphics'); require('./label'); +require('./motion-streak'); diff --git a/cocos2d/motion-streak/motion-streak-assembler.js b/cocos2d/core/renderer/assemblers/motion-streak.js similarity index 96% rename from cocos2d/motion-streak/motion-streak-assembler.js rename to cocos2d/core/renderer/assemblers/motion-streak.js index f62131cc25..3bbbf903ce 100644 --- a/cocos2d/motion-streak/motion-streak-assembler.js +++ b/cocos2d/core/renderer/assemblers/motion-streak.js @@ -23,10 +23,11 @@ THE SOFTWARE. ****************************************************************************/ -const js = require('../core/platform/js'); -const assembler = require('../core/renderer/assemblers/assembler'); -const MotionStreak = require('./CCMotionStreak'); -const renderEngine = require('../core/renderer/render-engine'); +const js = require('../../platform/js'); +const assembler = require('../../renderer/assemblers/assembler'); +const renderEngine = require('../../renderer/render-engine'); + +const MotionStreak = require('../../components/CCMotionStreak'); function Point (point, dir) { this.point = point || cc.v2(); diff --git a/cocos2d/motion-streak/index.js b/cocos2d/motion-streak/index.js deleted file mode 100644 index 505944d9e3..0000000000 --- a/cocos2d/motion-streak/index.js +++ /dev/null @@ -1,27 +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. - ****************************************************************************/ - -require('./CCMotionStreak'); -require('./motion-streak-assembler'); \ No newline at end of file diff --git a/extends.js b/extends.js index f36895ddea..7da1a785dc 100644 --- a/extends.js +++ b/extends.js @@ -36,7 +36,6 @@ else { require('./cocos2d/tilemap'); require('./cocos2d/videoplayer/CCVideoPlayer'); require('./cocos2d/webview/CCWebView'); - require('./cocos2d/motion-streak'); require('./cocos2d/core/components/CCStudioComponent'); require('./extensions/ccpool/CCNodePool'); if (!CC_JSB) { diff --git a/modules.json b/modules.json index dc4fde30c1..71082176f0 100644 --- a/modules.json +++ b/modules.json @@ -172,7 +172,8 @@ { "name": "MotionStreak", "entries": [ - "./cocos2d/motion-streak/index.js" + "./cocos2d/core/components/motion-streak/CCMotionStreak.js", + "./cocos2d/core/renderer/assemblers/motion-streak.js" ] }, {