From 71e8d22c16d5e12e6f08a7915bdbac5effba020d Mon Sep 17 00:00:00 2001 From: Leslie Date: Fri, 11 Jan 2019 16:34:13 +0800 Subject: [PATCH] module exports --- cocos/3d/debugger/draw-mng.js | 2 +- cocos/3d/debugger/index.js | 2 +- cocos/3d/debugger/utils.js | 2 +- cocos/3d/framework/light-component.js | 2 +- .../renderer/particle-system-renderer.js | 2 +- cocos/3d/framework/render-system.js | 2 +- .../3d/framework/skinning-model-component.js | 2 +- cocos/3d/framework/skybox-component.js | 2 +- cocos/core/game.js | 2 +- cocos/renderer/core/array-buffer-helper.js | 2 +- cocos/renderer/core/base-renderer.js | 2 +- cocos/renderer/core/buffer-pool.js | 2 +- cocos/renderer/core/dynamic-ia-pool.js | 2 +- cocos/renderer/core/view.js | 2 +- cocos/renderer/enums.js | 82 +++++++++---------- cocos/renderer/index.js | 69 +++++----------- cocos/renderer/renderers/forward-renderer.js | 2 +- cocos/renderer/scene/light.js | 2 +- index.js | 4 +- 19 files changed, 78 insertions(+), 109 deletions(-) diff --git a/cocos/3d/debugger/draw-mng.js b/cocos/3d/debugger/draw-mng.js index e4e211cea3..590b0e53e8 100644 --- a/cocos/3d/debugger/draw-mng.js +++ b/cocos/3d/debugger/draw-mng.js @@ -2,7 +2,7 @@ import { vec3, color3, mat4 } from '../vmath'; import { LinkedArray } from '../memop'; import { Node } from '../scene-graph'; import gfx from '../gfx'; -import { renderer } from '../renderer'; +import * as renderer from '../renderer'; import { sphere, wireframe } from '../primitives'; let _right = vec3.create(1, 0, 0); diff --git a/cocos/3d/debugger/index.js b/cocos/3d/debugger/index.js index 0cf5cfbaf5..eb7518cfe3 100644 --- a/cocos/3d/debugger/index.js +++ b/cocos/3d/debugger/index.js @@ -1,4 +1,4 @@ -import { renderer } from '../../renderer'; +import * as renderer from '../../renderer'; import OrbitCamera from './orbit-camera'; import DrawMng from './draw-mng'; import { createGrid } from './utils'; diff --git a/cocos/3d/debugger/utils.js b/cocos/3d/debugger/utils.js index d42febdbca..a84285605f 100644 --- a/cocos/3d/debugger/utils.js +++ b/cocos/3d/debugger/utils.js @@ -1,4 +1,4 @@ -import { renderer } from '../renderer'; +import * as renderer from '../renderer'; import { vec3, color3 } from '../vmath'; import { Node } from '../scene-graph'; diff --git a/cocos/3d/framework/light-component.js b/cocos/3d/framework/light-component.js index 01493bba33..c971d73853 100644 --- a/cocos/3d/framework/light-component.js +++ b/cocos/3d/framework/light-component.js @@ -24,7 +24,7 @@ ****************************************************************************/ // @ts-check import RenderSystemActor from './renderSystemActor'; -import { renderer } from '../../renderer/index'; +import * as renderer from '../../renderer/index'; import { Color, Enum } from '../../core/value-types'; import { toRadian } from '../../core/vmath'; import { ccclass, menu, property, executeInEditMode } from "../../core/data/class-decorator"; diff --git a/cocos/3d/framework/particle/renderer/particle-system-renderer.js b/cocos/3d/framework/particle/renderer/particle-system-renderer.js index 6af38c78ee..64d3415226 100644 --- a/cocos/3d/framework/particle/renderer/particle-system-renderer.js +++ b/cocos/3d/framework/particle/renderer/particle-system-renderer.js @@ -1,4 +1,4 @@ -import { renderer } from '../../../../renderer'; +import * as renderer from '../../../../renderer'; import { vec3, vec4, vec2, mat4 } from '../../../../core/vmath'; import gfx from '../../../../renderer/gfx'; import { Material } from '../../../assets/material'; diff --git a/cocos/3d/framework/render-system.js b/cocos/3d/framework/render-system.js index d51bd637bb..424e3f5006 100644 --- a/cocos/3d/framework/render-system.js +++ b/cocos/3d/framework/render-system.js @@ -1,4 +1,4 @@ -import { renderer } from '../../renderer'; +import * as renderer from '../../renderer'; export default class RenderSystem { constructor () { this._scene = new renderer.Scene(); diff --git a/cocos/3d/framework/skinning-model-component.js b/cocos/3d/framework/skinning-model-component.js index 858acd6ddb..46aaf107f3 100644 --- a/cocos/3d/framework/skinning-model-component.js +++ b/cocos/3d/framework/skinning-model-component.js @@ -26,7 +26,7 @@ // @ts-check import { mat4 } from '../../core/vmath'; import ModelComponent from './model-component'; -import { renderer } from '../../renderer/index'; +import * as renderer from '../../renderer/index'; import { ccclass, property, executionOrder, menu,executeInEditMode } from '../../core/data/class-decorator'; import * as utils from '../misc/utils'; import Skeleton from '../assets/skeleton'; diff --git a/cocos/3d/framework/skybox-component.js b/cocos/3d/framework/skybox-component.js index 37e73dcb8a..a913871413 100644 --- a/cocos/3d/framework/skybox-component.js +++ b/cocos/3d/framework/skybox-component.js @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ // @ts-check -import { renderer } from '../../renderer/index'; +import * as renderer from '../../renderer/index'; import { box } from '../primitive/index'; import { Material } from '../assets/material'; import { ccclass, property, menu, executeInEditMode } from '../../core/data/class-decorator'; diff --git a/cocos/core/game.js b/cocos/core/game.js index d2e9bfc0ef..ac46a63bec 100644 --- a/cocos/core/game.js +++ b/cocos/core/game.js @@ -29,7 +29,7 @@ import inputManager from './platform/event-manager/CCInputManager'; import debug from './platform/CCDebug'; import { addon } from './utils/js'; -import { renderer } from '../renderer'; +import * as renderer from '../renderer'; import gfx from '../renderer/gfx'; import builtinResMgr from '../3d/builtin/init'; import { ProgramLib } from '../renderer/core/program-lib'; diff --git a/cocos/renderer/core/array-buffer-helper.js b/cocos/renderer/core/array-buffer-helper.js index c419e17031..bb660772d4 100644 --- a/cocos/renderer/core/array-buffer-helper.js +++ b/cocos/renderer/core/array-buffer-helper.js @@ -1,6 +1,6 @@ // Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. -import enums from '../enums'; +import * as enums from '../enums'; function _defineProperty(target, name, internalName, arrayFn) { target[internalName] = new arrayFn(target._data); diff --git a/cocos/renderer/core/base-renderer.js b/cocos/renderer/core/base-renderer.js index 7a74ba46f6..9f8fa041cf 100644 --- a/cocos/renderer/core/base-renderer.js +++ b/cocos/renderer/core/base-renderer.js @@ -4,7 +4,7 @@ import { RecyclePool } from '../../3d/memop'; import { vec2, vec3, vec4, mat2, mat3, mat4, color3, color4 } from '../../core/vmath'; import { intersect } from '../../3d/geom-utils'; -import enums from '../enums'; +import * as enums from '../enums'; import View from './view'; import { ProgramLib } from './program-lib'; import { RenderQueue } from './constants'; diff --git a/cocos/renderer/core/buffer-pool.js b/cocos/renderer/core/buffer-pool.js index d9d7052574..c0868f631b 100644 --- a/cocos/renderer/core/buffer-pool.js +++ b/cocos/renderer/core/buffer-pool.js @@ -2,7 +2,7 @@ import { bits } from '../../core/vmath'; import ArrayBufferHelper from './array-buffer-helper'; -import enums from '../enums'; +import * as enums from '../enums'; const _DEFAULT_MAX_BATCH_BYTES = 512000; // 500 kb const _MIN_BATCH_BYTES = 64; diff --git a/cocos/renderer/core/dynamic-ia-pool.js b/cocos/renderer/core/dynamic-ia-pool.js index c2e6529c7f..70bfa85ecd 100644 --- a/cocos/renderer/core/dynamic-ia-pool.js +++ b/cocos/renderer/core/dynamic-ia-pool.js @@ -4,7 +4,7 @@ import gfx from '../gfx'; import { CircularPool } from '../../3d/memop'; import InputAssembler from './input-assembler'; import BufferPool from './buffer-pool'; -import enums from '../enums'; +import * as enums from '../enums'; let _attr2bufviewType = {}; _attr2bufviewType[gfx.ATTR_TYPE_INT8] = enums.BUFFER_VIEW_INT8; diff --git a/cocos/renderer/core/view.js b/cocos/renderer/core/view.js index c4e0c707ad..a9bc6af502 100644 --- a/cocos/renderer/core/view.js +++ b/cocos/renderer/core/view.js @@ -1,7 +1,7 @@ // Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. import { vec3, color4, mat4 } from '../../core/vmath'; -import enums from '../enums'; +import * as enums from '../enums'; import { frustum } from '../../3d/geom-utils'; let _m4_tmp = mat4.create(); diff --git a/cocos/renderer/enums.js b/cocos/renderer/enums.js index 4dd45af301..80737d1aa9 100644 --- a/cocos/renderer/enums.js +++ b/cocos/renderer/enums.js @@ -1,49 +1,47 @@ // Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd. -export default { - // projection - PROJ_PERSPECTIVE: 0, - PROJ_ORTHO: 1, +// projection +export const PROJ_PERSPECTIVE = 0; +export const PROJ_ORTHO = 1; - // lights - LIGHT_DIRECTIONAL: 0, - LIGHT_POINT: 1, - LIGHT_SPOT: 2, +// lights +export const LIGHT_DIRECTIONAL = 0; +export const LIGHT_POINT = 1; +export const LIGHT_SPOT = 2; - // shadows - SHADOW_NONE: 0, - SHADOW_HARD: 1, - SHADOW_SOFT: 2, +// shadows +export const SHADOW_NONE = 0; +export const SHADOW_HARD = 1; +export const SHADOW_SOFT = 2; - // parameter type - PARAM_INT: 0, - PARAM_INT2: 1, - PARAM_INT3: 2, - PARAM_INT4: 3, - PARAM_FLOAT: 4, - PARAM_FLOAT2: 5, - PARAM_FLOAT3: 6, - PARAM_FLOAT4: 7, - PARAM_COLOR3: 8, - PARAM_COLOR4: 9, - PARAM_MAT2: 10, - PARAM_MAT3: 11, - PARAM_MAT4: 12, - PARAM_TEXTURE_2D: 13, - PARAM_TEXTURE_CUBE: 14, +// parameter type +export const PARAM_INT = 0; +export const PARAM_INT2 = 1; +export const PARAM_INT3 = 2; +export const PARAM_INT4 = 3; +export const PARAM_FLOAT = 4; +export const PARAM_FLOAT2 = 5; +export const PARAM_FLOAT3 = 6; +export const PARAM_FLOAT4 = 7; +export const PARAM_COLOR3 = 8; +export const PARAM_COLOR4 = 9; +export const PARAM_MAT2 = 10; +export const PARAM_MAT3 = 11; +export const PARAM_MAT4 = 12; +export const PARAM_TEXTURE_2D = 13; +export const PARAM_TEXTURE_CUBE = 14; - // clear flags - CLEAR_COLOR: 1, - CLEAR_DEPTH: 2, - CLEAR_STENCIL: 4, - CLEAR_SKYBOX: 8, +// clear flags +export const CLEAR_COLOR = 1; +export const CLEAR_DEPTH = 2; +export const CLEAR_STENCIL = 4; +export const CLEAR_SKYBOX = 8; - // - BUFFER_VIEW_INT8: 0, - BUFFER_VIEW_UINT8: 1, - BUFFER_VIEW_INT16: 2, - BUFFER_VIEW_UINT16: 3, - BUFFER_VIEW_INT32: 4, - BUFFER_VIEW_UINT32: 5, - BUFFER_VIEW_FLOAT32: 6, -}; +// +export const BUFFER_VIEW_INT8 = 0; +export const BUFFER_VIEW_UINT8 = 1; +export const BUFFER_VIEW_INT16 = 2; +export const BUFFER_VIEW_UINT16 = 3; +export const BUFFER_VIEW_INT32 = 4; +export const BUFFER_VIEW_UINT32 = 5; +export const BUFFER_VIEW_FLOAT32 = 6; diff --git a/cocos/renderer/index.js b/cocos/renderer/index.js index e48d87e0b2..ab3d39982a 100644 --- a/cocos/renderer/index.js +++ b/cocos/renderer/index.js @@ -1,56 +1,25 @@ -import enums from './enums'; -import { createIA } from './utils'; +export * from './enums'; + +export { createIA } from './utils'; import config from './config'; -import { RenderQueue, PassStage } from './core/constants'; -import { Pass } from './core/pass'; -import { Effect } from './core/effect'; -import InputAssembler from './core/input-assembler'; -import View from './core/view'; +const addStage = config.addStage; +export { addStage }; -import { Light } from './scene/light'; -import { Camera } from './scene/camera'; -import { Model } from './scene/model'; -import Scene from './scene/scene'; +export { RenderQueue, PassStage } from './core/constants'; +export { Pass } from './core/pass'; +export { Effect } from './core/effect'; +export { default as InputAssembler } from './core/input-assembler'; +export { default as View } from './core/view'; -import LineBatchModel from './models/line-batch-model'; -import SpriteBatchModel from './models/sprite-batch-model'; -import ParticleBatchModel from './models/particle-batch-model'; -import SkinningModel from './models/skinning-model'; +export { Light } from './scene/light'; +export { Camera } from './scene/camera'; +export { Model } from './scene/model'; +export { default as Scene } from './scene/scene'; -import ForwardRenderer from './renderers/forward-renderer'; +export { default as LineBatchModel } from './models/line-batch-model'; +export { default as SpriteBatchModel } from './models/sprite-batch-model'; +export { default as ParticleBatchModel } from './models/particle-batch-model'; +export { default as SkinningModel } from './models/skinning-model'; -let renderer = { - // config - addStage: config.addStage, - - // utils - createIA, - - // core - RenderQueue, - PassStage, - Pass, - Effect, - InputAssembler, - View, - - // scene - Light, - Camera, - Model, - Scene, - - // models - LineBatchModel, - SpriteBatchModel, - ParticleBatchModel, - SkinningModel, - - // renderers - ForwardRenderer, -}; -Object.assign(renderer, enums); - -export { renderer }; -cc.renderer = renderer; +export { default as ForwardRenderer } from './renderers/forward-renderer'; diff --git a/cocos/renderer/renderers/forward-renderer.js b/cocos/renderer/renderers/forward-renderer.js index d27f320fc4..6d5cbb2924 100644 --- a/cocos/renderer/renderers/forward-renderer.js +++ b/cocos/renderer/renderers/forward-renderer.js @@ -5,7 +5,7 @@ import { vec3, mat4 } from '../../core/vmath'; import BaseRenderer from '../core/base-renderer'; import DynamicIAPool from '../core/dynamic-ia-pool'; -import enums from '../enums'; +import * as enums from '../enums'; import { PassStage } from '../core/constants'; // import GaussianBlur from './gaussian-blur'; diff --git a/cocos/renderer/scene/light.js b/cocos/renderer/scene/light.js index 1236a98104..fb79803202 100644 --- a/cocos/renderer/scene/light.js +++ b/cocos/renderer/scene/light.js @@ -3,7 +3,7 @@ import { color3, color4, mat4, mat3, vec3, toRadian } from '../../core/vmath'; import gfx from '../gfx'; -import enums from '../enums'; +import * as enums from '../enums'; const _forward = vec3.create(0, 0, -1); diff --git a/index.js b/index.js index bb1f4cb2c0..31c44b1770 100644 --- a/index.js +++ b/index.js @@ -31,7 +31,9 @@ import cc from './predefine'; // LOAD ENGINE CORE export * from './cocos/core'; export * from './cocos/scene-graph'; -export * from './cocos/renderer'; +import * as renderer from './cocos/renderer'; +export { renderer }; +cc.renderer = renderer; export * from './cocos/assets'; export * from './cocos/load-pipeline';