From 802d57cdacbb1a3e10ba01ef5cdc5cec08625ffa Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 19 Mar 2018 12:33:49 +0800 Subject: [PATCH] Move affine-transform to utils --- cocos2d/core/CCNode.js | 2 +- cocos2d/core/camera/CCCamera.js | 2 +- cocos2d/core/{value-types => utils}/affine-transform.js | 0 cocos2d/core/value-types/index.js | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) rename cocos2d/core/{value-types => utils}/affine-transform.js (100%) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index d9db617932..d649d552bb 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -29,7 +29,7 @@ const BaseNode = require('./utils/base-node'); const PrefabHelper = require('./utils/prefab-helper'); const mathPools = require('./utils/math-pools'); const renderEngine = require('./renderer/render-engine'); -const AffineTrans = require('./value-types/affine-transform'); +const AffineTrans = require('./utils/affine-transform'); const math = renderEngine.math; const eventManager = require('./event-manager'); const macro = require('./platform/CCMacro'); diff --git a/cocos2d/core/camera/CCCamera.js b/cocos2d/core/camera/CCCamera.js index b107575fd1..16a3195d56 100644 --- a/cocos2d/core/camera/CCCamera.js +++ b/cocos2d/core/camera/CCCamera.js @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -const AffineTrans = require('../value-types/affine-transform'); +const AffineTrans = require('../utils/affine-transform'); const renderEngine = require('../renderer/render-engine'); const renderer = require('../renderer/index'); diff --git a/cocos2d/core/value-types/affine-transform.js b/cocos2d/core/utils/affine-transform.js similarity index 100% rename from cocos2d/core/value-types/affine-transform.js rename to cocos2d/core/utils/affine-transform.js diff --git a/cocos2d/core/value-types/index.js b/cocos2d/core/value-types/index.js index 423dc251fa..7a2e9e6d0e 100644 --- a/cocos2d/core/value-types/index.js +++ b/cocos2d/core/value-types/index.js @@ -33,6 +33,5 @@ require('./size'); require('./rect'); require('./color'); require('./CCTypes'); -require('./affine-transform'); cc.vmath = require('../renderer/render-engine').math;