diff --git a/packages/layers/src/core/BaseLayer.ts b/packages/layers/src/core/BaseLayer.ts index 394087d4f7..d987ae15b4 100644 --- a/packages/layers/src/core/BaseLayer.ts +++ b/packages/layers/src/core/BaseLayer.ts @@ -510,8 +510,8 @@ export default class BaseLayer extends EventEmitter } /** - * 渲染所有的图层 - */ + * 渲染所有的图层 + */ public renderLayers(): void { this.rendering = true; diff --git a/packages/renderer/src/regl/ReglModel.ts b/packages/renderer/src/regl/ReglModel.ts index ffa5a52160..fe853134d6 100644 --- a/packages/renderer/src/regl/ReglModel.ts +++ b/packages/renderer/src/regl/ReglModel.ts @@ -6,8 +6,8 @@ import { IModelInitializationOptions, IUniform, } from '@antv/l7-core'; -import { isPlainObject, isTypedArray } from 'lodash'; import regl from 'l7regl'; +import { isPlainObject, isTypedArray } from 'lodash'; import { blendEquationMap, blendFuncMap, diff --git a/packages/renderer/src/regl/__tests__/attribute.spec.ts b/packages/renderer/src/regl/__tests__/attribute.spec.ts index dba9783b08..76adad8a26 100644 --- a/packages/renderer/src/regl/__tests__/attribute.spec.ts +++ b/packages/renderer/src/regl/__tests__/attribute.spec.ts @@ -1,6 +1,6 @@ import { gl } from '@antv/l7-core'; -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import quad from '../../../../core/src/shaders/post-processing/quad.glsl'; import ReglAttribute from '../ReglAttribute'; import ReglBuffer from '../ReglBuffer'; diff --git a/packages/renderer/src/regl/__tests__/elements.spec.ts b/packages/renderer/src/regl/__tests__/elements.spec.ts index d8f0f120ec..5eebacb1b0 100644 --- a/packages/renderer/src/regl/__tests__/elements.spec.ts +++ b/packages/renderer/src/regl/__tests__/elements.spec.ts @@ -1,6 +1,6 @@ import { gl } from '@antv/l7-core'; -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import quad from '../../../../core/src/shaders/post-processing/quad.glsl'; import ReglAttribute from '../ReglAttribute'; import ReglBuffer from '../ReglBuffer'; diff --git a/packages/renderer/src/regl/__tests__/framebuffer.spec.ts b/packages/renderer/src/regl/__tests__/framebuffer.spec.ts index edb9a659d7..681ff8f8b5 100644 --- a/packages/renderer/src/regl/__tests__/framebuffer.spec.ts +++ b/packages/renderer/src/regl/__tests__/framebuffer.spec.ts @@ -1,6 +1,6 @@ import { gl } from '@antv/l7-core'; -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import quad from '../../../../core/src/shaders/post-processing/quad.glsl'; import ReglAttribute from '../ReglAttribute'; import ReglBuffer from '../ReglBuffer'; diff --git a/packages/renderer/src/regl/__tests__/model.draw.spec.ts b/packages/renderer/src/regl/__tests__/model.draw.spec.ts index 240b4de193..ee07bd007e 100644 --- a/packages/renderer/src/regl/__tests__/model.draw.spec.ts +++ b/packages/renderer/src/regl/__tests__/model.draw.spec.ts @@ -1,6 +1,6 @@ import { gl } from '@antv/l7-core'; -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import quad from '../../../../core/src/shaders/post-processing/quad.glsl'; import ReglAttribute from '../ReglAttribute'; import ReglBuffer from '../ReglBuffer'; diff --git a/packages/renderer/src/regl/__tests__/model.spec.ts b/packages/renderer/src/regl/__tests__/model.spec.ts index 1a2c7f1570..1ae2971096 100644 --- a/packages/renderer/src/regl/__tests__/model.spec.ts +++ b/packages/renderer/src/regl/__tests__/model.spec.ts @@ -1,5 +1,5 @@ -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import ReglModel from '../ReglModel'; import createContext from './utils/create-context'; diff --git a/packages/renderer/src/regl/__tests__/model.uniform.spec.ts b/packages/renderer/src/regl/__tests__/model.uniform.spec.ts index c8a9ffd64a..8c079efc51 100644 --- a/packages/renderer/src/regl/__tests__/model.uniform.spec.ts +++ b/packages/renderer/src/regl/__tests__/model.uniform.spec.ts @@ -1,5 +1,5 @@ -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import ReglFramebuffer from '../ReglFramebuffer'; import ReglModel from '../ReglModel'; import ReglTexture2D from '../ReglTexture2D'; diff --git a/packages/renderer/src/regl/__tests__/renderer.spec.ts b/packages/renderer/src/regl/__tests__/renderer.spec.ts index df2bc2e8a5..8788251d7d 100644 --- a/packages/renderer/src/regl/__tests__/renderer.spec.ts +++ b/packages/renderer/src/regl/__tests__/renderer.spec.ts @@ -1,6 +1,6 @@ import { gl } from '@antv/l7-core'; -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import copy from '../../../../core/src/shaders/post-processing/copy.glsl'; import quad from '../../../../core/src/shaders/post-processing/quad.glsl'; import { ReglRendererService } from '../../index'; diff --git a/packages/renderer/src/regl/__tests__/texture.spec.ts b/packages/renderer/src/regl/__tests__/texture.spec.ts index 564607b2af..5bf99e72de 100644 --- a/packages/renderer/src/regl/__tests__/texture.spec.ts +++ b/packages/renderer/src/regl/__tests__/texture.spec.ts @@ -1,6 +1,6 @@ import { gl } from '@antv/l7-core'; -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import copy from '../../../../core/src/shaders/post-processing/copy.glsl'; import quad from '../../../../core/src/shaders/post-processing/quad.glsl'; import ReglAttribute from '../ReglAttribute'; diff --git a/packages/renderer/src/regl/index.ts b/packages/renderer/src/regl/index.ts index 999cab76e7..69fda86c42 100644 --- a/packages/renderer/src/regl/index.ts +++ b/packages/renderer/src/regl/index.ts @@ -22,8 +22,8 @@ import { ITexture2DInitializationOptions, } from '@antv/l7-core'; import { injectable } from 'inversify'; -import 'reflect-metadata'; import regl from 'l7regl'; +import 'reflect-metadata'; import ReglAttribute from './ReglAttribute'; import ReglBuffer from './ReglBuffer'; import ReglElements from './ReglElements'; diff --git a/stories/customMap/components/Map.tsx b/stories/customMap/components/Map.tsx index 826a2ef391..433d262dfc 100644 --- a/stories/customMap/components/Map.tsx +++ b/stories/customMap/components/Map.tsx @@ -127,9 +127,9 @@ export default class ScaleComponent extends React.Component { scene.addLayer(layer); }); - scene.on('loaded', () => { - scene.addLayer(imageLayer); - }); + scene.on('loaded', () => { + scene.addLayer(imageLayer); + }); } public render() {