Skip to content

Commit b1ec504

Browse files
fuzhennfuzhenn
authored
refactor: add gpu packages (#2639)
* better gl build * add packages/gpu and fix vt-fill.html * add packages/maptalks-gpu and fix vt-default.html
1 parent 48a06b6 commit b1ec504

File tree

23 files changed

+1021
-22
lines changed

23 files changed

+1021
-22
lines changed

‎debug/gl/vt-default.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
height: 100%;
1717
}
1818
</style>
19-
<link rel="stylesheet" href="/maptalks/dist/maptalks.css">
20-
<script type="text/javascript" src="/maptalks/dist/maptalks.js"></script>
21-
<script type="text/javascript" src="/maptalks-work/packages/gl/dist/maptalksgl.js"></script>
22-
<script type="text/javascript" src="/maptalks-work/packages/vt/dist/maptalks.vt.js"></script>
19+
<link rel="stylesheet" href="../../packages/maptalks/dist/maptalks.css">
20+
<!-- <script type="text/javascript" src="../../packages/maptalks/dist/maptalks.js"></script>
21+
<script type="text/javascript" src="../../packages/gpu/dist/maptalksgpu.js"></script>
22+
<script type="text/javascript" src="../../packages/vt/dist/maptalks.vt.js"></script> -->
23+
<script type="text/javascript" src="../../packages/maptalks-gpu/dist/maptalks-gpu.js"></script>
2324

2425
<body>
2526
<div id="map" class="container"></div>

‎debug/gl/vt-fill.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</style>
1919
<link rel="stylesheet" href="/maptalks/dist/maptalks.css">
2020
<script type="text/javascript" src="/maptalks/dist/maptalks.js"></script>
21-
<script type="text/javascript" src="/maptalks-work/packages/gl/dist/maptalksgl.js"></script>
21+
<script type="text/javascript" src="/maptalks-work/packages/gpu/dist/maptalksgpu.js"></script>
2222
<script type="text/javascript" src="/maptalks-work/packages/vt/dist/maptalks.vt.js"></script>
2323

2424
<body>

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"scripts": {
77
"clean": "turbo run clean",
88
"dev": "turbo run dev",
9+
"build-gpu": "turbo run build --filter=maptalks-gpu",
910
"build": "turbo run build --filter=maptalks-gl",
1011
"build-all": "turbo run build",
1112
"build-dev": "turbo run build-dev*",

‎packages/gl/build/index.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ export {
77
} from 'gl-matrix';
88
export { createREGL };
99

10-
export type * from './gl/dist/index.d.ts';
10+
export type * from './dist/gl/dist/index.d.ts';

‎packages/gl/build/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// transcoders必须要在reshader.gl之前import，否则reshader.gl无法识别到GLTFLoader
22
import transcoders, { registerGLTFLoaderBundle } from '../src/transcoders';
33
export { transcoders };
4-
import { gltfLoaderExport } from './gltf-loader-bundle.js';
4+
import { gltfLoaderExport } from './dist/gltf-loader-bundle.js';
55
registerGLTFLoaderBundle(gltfLoaderExport);
66

77
import createREGL from '@maptalks/regl';
@@ -13,9 +13,9 @@ export {
1313
} from 'gl-matrix';
1414
export { createREGL };
1515

16-
export * from './gl/gl.es.js';
16+
export * from './dist/gl/gl.es.js';
1717

1818

1919
import * as maptalks from 'maptalks';
20-
import chunk from './worker.js';
20+
import chunk from './dist/worker.js';
2121
maptalks.registerWorkerAdapter('@maptalks/terrain', chunk);

‎packages/gl/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "dist/maptalksgl.js",
66
"module": "dist/maptalksgl.es.js",
77
"scripts": {
8-
"clean": "rimraf dist && rimraf ./build/gl",
8+
"clean": "rimraf dist && rimraf ./build/dist",
99
"build": "npm run clean && npm run lint && rollup --environment BUILD:production -c rollup.config.js",
1010
"build-dev": "rollup -c rollup.config.js",
1111
"dev": "rollup -w -c rollup.config.js",

‎packages/gl/rollup.config.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ module.exports = [
145145
name: "exports",
146146
globals: ["exports"],
147147
extend: true,
148-
file: "build/gltf-loader-bundle.js"
148+
file: "build/dist/gltf-loader-bundle.js"
149149
// footer: ``
150150
},
151151
watch: {
@@ -175,7 +175,7 @@ module.exports = [
175175
name: 'exports',
176176
globals: ['exports'],
177177
extend: true,
178-
file: 'build/worker.js',
178+
file: 'build/dist/worker.js',
179179
banner: `export default `,
180180
// footer: ``
181181
},
@@ -206,7 +206,7 @@ if (production) {
206206
'globals' : {
207207
'maptalks' : 'maptalks'
208208
},
209-
'file': 'build/gl/gl.es.js'
209+
'file': 'build/dist/gl/gl.es.js'
210210
}
211211
});
212212
}
@@ -229,7 +229,7 @@ module.exports.push({
229229
},
230230
watch: {
231231
include: ['src/**/*.js', 'src/**/*.ts', 'src/**/*.glsl', 'src/**/*.wgsl', 'src/**/*.vert', 'src/**/*.frag',
232-
'../reshader.gl/dist/reshadergl.es.js', 'build/worker.js', 'build/gltf-loader-bundle.js']
232+
'build/dist/**/*.js']
233233
}
234234
});
235235

‎packages/gl/src/index-dev.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import transcoders, { registerGLTFLoaderBundle } from './transcoders';
22
export { transcoders };
3-
import { gltfLoaderExport } from '../build/gltf-loader-bundle.js';
3+
import { gltfLoaderExport } from '../build/dist/gltf-loader-bundle.js';
44
registerGLTFLoaderBundle(gltfLoaderExport);
55

66
import createREGL from '@maptalks/regl';
@@ -15,5 +15,5 @@ export { createREGL };
1515
export * from './index.ts';
1616

1717
import * as maptalks from 'maptalks';
18-
import chunk from '../build/worker.js';
18+
import chunk from '../build/dist/worker.js';
1919
maptalks.registerWorkerAdapter('@maptalks/terrain', chunk);

‎packages/gl/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export { GroupGLLayer, GroundPainter, CanvasCompatible, HighlightUtil, ContextUt
1212
import './layer/TileLayerGLRenderer';
1313
import './map/MapGLRenderer';
1414
import './layer/ImageLayerGLRenderer';
15-
// import './map/MapGPURenderer';
15+
import './map/MapGPURenderer';
1616

1717
export { default as HeatmapProcess } from './layer/HeatmapProcess';
1818
export { GLContext } from '@maptalks/fusiongl';

‎packages/gl/src/layer/effect/ScanEffectPainter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ScanEffectPainter {
3636
}),
3737
depth: true
3838
});
39-
this.EMPTY_TEXTURE = this._regl.texture({ with: 2, height: 2 });
39+
this.EMPTY_TEXTURE = this._regl.texture({ width: 2, height: 2 });
4040
this._shader = new reshader.ScanEffectShader();
4141
this._pass = new reshader.ScanEffectPass(this._regl, viewport, this._layer);
4242
this._shader.version = 300;

0 commit comments

Comments
 (0)