merge maptalks into maptalks.js (#2501)

* prepare Abstract Classes for webgpu

* mv Shader.ts

* some method renames for consistency between gl and gpu

* simplify some regl command config and change createMeshCommand parameter to mesh

* implement all needed by GPUShader.run

* implement DynamicBufferPool, DynamicBuffer and GraphicsDevice

* implement Geometry.createBuffer/createElementBuffer and fix Geometry buffer descriptor

* fix typo

* merge GL Classes and GPUClasses, add device in getCommandKey and fix bundling

* fix reshader.gl

* add GraphicsDevice.commandEncoder and Shader._getCurrentRenderPassEncoder

* fix rendering call for example cube.html

* add webgpu cube.html

* first successful webgpu rendering

* add GraphicsTexture and fix cube-texture.html

* implement InstancedMesh on webgpu

* fix WGSL preprocess

* initial commit for GraphicsFramebuffer

* fix depthTexture and incorrect dynamicOffsets

* fix webgpu/shadowmapping.html

* add support of device.framebuffer(width, height)

* adaption of gl renderer for VectorTileLayer and Vector3DLayer

* merge maptalks-canvas into @maptalks/map and add LayerGLRenderer, MapGLAbstractRenderer TileLayerRenderable for maptalks-gl

* @maptalks/maptalks => maptalks

* fix build

* fixing circleci

* updating circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing circleci

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing

* fixing specs

* fixing specs

* fixing specs

* fixing specs

* fixing specs

* fixing specs

* add OverlayLayerGLRenderer

* fixing OverlayLayerGLRenderer

Author: fuzhenn

.circleci/config.yml

@@ -3,42 +3,44 @@
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 #
 version: 2.1
+executors:
+  node-browser-executor:
+    docker:
+      - image: cimg/node:22.14-browsers
 orbs:
   browser-tools: circleci/[email protected]
 jobs:
-  build:
-    docker:
-      # specify the version you desire here
-      - image: cimg/node:20.11-browsers
-        environment:
-          CHROME_BIN: "/usr/bin/google-chrome"
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mongo:3.4.4
+  maptalks-test:
+    executor: node-browser-executor
 
-    working_directory: ~/repo
+    working_directory: ~/repo/
 
     steps:
       - browser-tools/install-chrome
       - checkout
 
       # Download and cache dependencies
       - restore_cache:
+          name: Restore pnpm Package Cache
           keys:
-          - v1-dependencies-{{ checksum "package-lock.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
+            - pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
 
-      - run: npm install
+      - run:
+          name: Install pnpm package manager
+          command: |
+            sudo npm install --global pnpm
+
+      - run: pnpm i
 
       - save_cache:
+          name: Save pnpm Package Cache
+          key: pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
           paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package-lock.json" }}
-
+            - .pnpm-store
       # run tests!
-      - run: npm test
-
+      - run: npm run maptalks-test
 
+workflows:
+  maptalks:
+    jobs:
+      - maptalks-test

package.json

@@ -11,7 +11,7 @@
     "build-dev": "turbo run build-dev*",
     "lint": "turbo run lint",
     "prettier": "prettier --parser=typescript --write **/*.{js,ts,md}",
-    "test": "turbo run test",
+    "maptalks-test": "pnpm --filter=maptalks run test",
     "changeset": "changeset",
     "changeset-version": "changeset version",
     "release": "pnpm build && changeset publish"
@@ -43,6 +43,6 @@
       "git add"
     ]
   },
-  "packageManager": "pnpm@9.1.2",
+  "packageManager": "pnpm@10.4.1",
   "license": "MIT"
 }

packages/analysis/package.json

@@ -48,7 +48,7 @@
     "karma-expect": "^1.1.3",
     "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
-    "@maptalks/map": "workspace:*",
+    "maptalks": "workspace:*",
     "mocha": "^10.3.0",
     "pixelmatch": "^4.0.2",
     "rollup": "^4.17.2"

packages/analysis/src/Analysis.js

@@ -1,5 +1,5 @@
 import { reshader, mat4, quat, earcut } from '@maptalks/gl';
-import { Class, Eventable, Handlerable, Polygon } from '@maptalks/map';
+import { Class, Eventable, Handlerable, Polygon } from 'maptalks';
 import ExtentPass from './pass/ExtentPass';
 import { coordinateToWorld } from './common/Util';
 

packages/analysis/src/CrossCutAnalysis.js

@@ -1,5 +1,5 @@
 import Analysis from './Analysis';
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import { reshader, mat4 } from '@maptalks/gl';
 import CrossCutPass from './pass/CrossCutPass';
 import pickingVert from './pass/glsl/picking.vert';

packages/analysis/src/ExcavateRenderer.js

@@ -1,5 +1,5 @@
 import { reshader, mat4, vec4 } from '@maptalks/gl';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import HeightmapPass from './pass/HeightmapPass';
 import { coordinateToWorld, altitudeToDistance } from './common/Util';
 import { ExtrudePolygonLayer } from '@maptalks/vt';

packages/analysis/src/common/Util.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 
 
 export function containerPointToWorldPoint(point, map) {

packages/analysis/src/pass/CrossCutPass.js

@@ -1,7 +1,7 @@
 import { reshader, mat4 } from '@maptalks/gl';
 import vert from './glsl/crosscut.vert';
 import frag from './glsl/crosscut.frag';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import AnalysisPass from './AnalysisPass';
 
 export default class CrossCutPass extends AnalysisPass {

packages/analysis/src/pass/CutAnalysisController.js

@@ -1,6 +1,6 @@
 import { reshader, mat4, quat, vec3, vec2 } from '@maptalks/gl';
 import partsModels from '../common/parts';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import { defined } from '../common/Util';
 import pickingVert from './glsl/picking.vert';
 

packages/analysis/src/pass/CutPass.js

@@ -2,7 +2,7 @@ import { mat4 } from '@maptalks/gl';
 import { reshader } from '@maptalks/gl';
 import vert from './glsl/cut.vert';
 import frag from './glsl/cut.frag';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import CutAnalysisController from './CutAnalysisController';
 import CutShader from './CutShader';
 import AnalysisPass from './AnalysisPass';

packages/analysis/src/pass/ExcavatePass.js

@@ -2,7 +2,7 @@ import { mat4 } from '@maptalks/gl';
 import { reshader } from '@maptalks/gl';
 import vert from './glsl/excavate.vert';
 import frag from './glsl/excavate.frag';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import AnalysisPass from './AnalysisPass';
 
 const clearColor = [1.0, 0.0, 0.0, 1];

packages/analysis/src/pass/ExtentPass.js

@@ -1,5 +1,5 @@
 import { reshader, mat4 } from '@maptalks/gl';
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import vert from './glsl/excavateExtent.vert';
 import frag from './glsl/excavateExtent.frag';
 import AnalysisPass from './AnalysisPass';

packages/analysis/src/pass/FloodPass.js

@@ -1,7 +1,7 @@
 import { reshader } from '@maptalks/gl';
 import vert from './glsl/flood.vert';
 import frag from './glsl/flood.frag';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import AnalysisPass from './AnalysisPass';
 
 export default class FloodPass extends AnalysisPass {

packages/analysis/src/pass/HeightmapPass.js

@@ -1,5 +1,5 @@
 import { reshader, mat4 } from '@maptalks/gl';
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import vert from './glsl/heightmap.vert';
 import frag from './glsl/heightmap.frag';
 import AnalysisPass from './AnalysisPass';

packages/analysis/src/pass/InSightPass.js

@@ -2,7 +2,7 @@ import { mat4 } from '@maptalks/gl';
 import { reshader } from '@maptalks/gl';
 import vert from './glsl/insight.vert';
 import frag from './glsl/insight.frag';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import AnalysisPass from './AnalysisPass';
 
 const helperPos = [

packages/analysis/src/pass/OutlinePass.js

@@ -3,7 +3,7 @@ import quadVert from './glsl/quad.vert';
 import extentFrag from './glsl/extent.frag';
 import outlineFrag from './glsl/outline.frag';
 import sceneVert from './glsl/sceneVert.vert';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 import AnalysisPass from './AnalysisPass';
 
 export default class OutlinePass extends AnalysisPass {

packages/analysis/src/pass/ViewShedPass.js

@@ -2,7 +2,7 @@ import { mat4, quat, vec3 } from '@maptalks/gl';
 import { reshader } from '@maptalks/gl';
 import vert from './glsl/viewshed.vert';
 import frag from './glsl/viewshed.frag';
-import { Util, Point } from '@maptalks/map';
+import { Util, Point } from 'maptalks';
 import AnalysisPass from './AnalysisPass';
 
 const helperPos = [

packages/gl/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@maptalks/fusiongl": "workspace:*",
     "@maptalks/gltf-loader": "workspace:*",
-    "@maptalks/map": "workspace:*",
+    "maptalks": "workspace:*",
     "@maptalks/martini": "^0.4.0",
     "@maptalks/regl": "^3.4.0",
     "@maptalks/reshader.gl": "workspace:*",

packages/gl/src/analysis/AnalysisPainter.js

@@ -1,7 +1,7 @@
 import * as reshader from '@maptalks/reshader.gl';
 import AnalysisShader from './AnalysisShader.js';
 import { extend } from '../layer/util/util.js';
-import { Util } from '@maptalks/map';
+import { Util } from 'maptalks';
 
 class AnalysisPainter {
     constructor(regl, layer, config) {

packages/gl/src/analysis/Area3DTool.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import Measure3DTool from './Measure3DTool';
 
 export default class Area3DTool extends Measure3DTool {

packages/gl/src/analysis/Distance3DTool.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import Measure3DTool from './Measure3DTool';
 
 export default class Distance3DTool extends Measure3DTool {

packages/gl/src/analysis/Height3DTool.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import Measure3DTool from './Measure3DTool';
 
 const MEASURE_HEIGHT_NAMES = [['直线距离', '垂直高度', '水平距离'], ['spatial distance', 'vertical height', 'horizontal distance']];

packages/gl/src/analysis/Measure3DTool.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 
 const options = {
     'mode': 'LineString',

packages/gl/src/index-dev.js

@@ -18,6 +18,6 @@ export * from './index.ts';
 
 
 
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import chunk from '../build/worker.js';
 maptalks.registerWorkerAdapter('@maptalks/terrain', chunk);

packages/gl/src/layer/GroupGLLayer.ts

@@ -1,11 +1,11 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import Renderer from './GroupGLLayerRenderer.js';
 import { vec3 } from '@maptalks/reshader.gl';
 import { isNil, extend } from './util/util.js';
 import TerrainLayer from './terrain/TerrainLayer';
 import RayCaster from './raycaster/RayCaster.js';
 import Mask from './mask/Mask.js';
-import { LayerJSONType } from '@maptalks/map';
+import { LayerJSONType } from 'maptalks';
 
 const options: GroupGLLayerOptions = {
     renderer : 'gl',

packages/gl/src/layer/GroupGLLayerRenderer.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import { vec2, vec3, mat4 } from '@maptalks/reshader.gl';
 import ShadowProcess from './shadow/ShadowProcess';
 import * as reshader from '@maptalks/reshader.gl';

packages/gl/src/layer/TileLayerGLRenderer.ts

@@ -1,5 +1,5 @@
-import * as maptalks from '@maptalks/map';
-import { RenderContext, Tile } from '@maptalks/map';
+import * as maptalks from 'maptalks';
+import { RenderContext, Tile } from 'maptalks';
 import * as reshader from '@maptalks/reshader.gl';
 import { mat4 } from '@maptalks/reshader.gl';
 

packages/gl/src/layer/mask/BoxClipMask.js

@@ -1,4 +1,4 @@
-import { Point } from '@maptalks/map';
+import { Point } from 'maptalks';
 import { vec2 } from '@maptalks/reshader.gl';
 import ClipMask from './ClipMask';
 

packages/gl/src/layer/mask/Mask.js

@@ -1,4 +1,4 @@
-import { Coordinate, Polygon, Point } from "@maptalks/map";
+import { Coordinate, Polygon, Point } from "maptalks";
 import * as reshader from '@maptalks/reshader.gl';
 import { mat4, quat } from '@maptalks/reshader.gl';
 import { earcut } from '@maptalks/reshader.gl';

packages/gl/src/layer/mask/MaskLayerMixin.ts

@@ -1,8 +1,8 @@
-import { Coordinate, Extent } from "@maptalks/map";
+import { Coordinate, Extent } from "maptalks";
 import { mat4, vec3 } from '@maptalks/reshader.gl';
 import Mask from "./Mask";
 import { extend } from "../util/util";
-import { MixinConstructor } from "@maptalks/map";
+import { MixinConstructor } from "maptalks";
 
 const maskLayerEvents = ['shapechange', 'heightrangechange', 'flatheightchange'];
 const COORD_EXTENT = new Coordinate(0, 0);

packages/gl/src/layer/raycaster/RayCaster.js

@@ -1,6 +1,6 @@
 import { vec3, vec4, mat4 } from '@maptalks/reshader.gl';
-import { Coordinate, Point, Util } from '@maptalks/map';
-import * as maptalks from '@maptalks/map';
+import { Coordinate, Point, Util } from 'maptalks';
+import * as maptalks from 'maptalks';
 
 const TRIANGLE = [], POS_A = [], POS_B = [], POS_C = [], TEMP_POINT = new Point(0, 0), NULL_ALTITUDES = [];
 const TEMP_VEC_AB = [], TEMP_VEC_AC = [];

packages/gl/src/layer/terrain/TerrainLayer.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import TerrainLayerRenderer from './TerrainLayerRenderer';
 import { getTileIdsAtLevel, getSkinTileScale, getSkinTileRes, getCascadeTileIds } from './TerrainTileUtil';
 import { extend } from '../util/util';

packages/gl/src/layer/terrain/TerrainLayerRenderer.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import TerrainWorkerConnection from './TerrainWorkerConnection';
 import * as reshader from '@maptalks/reshader.gl';
 import skinVert from './glsl/terrainSkin.vert';

packages/gl/src/layer/terrain/TerrainTileUtil.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import { createMartiniData } from './util/martini.js';
 
 export function getCascadeTileIds(layer, x, y, z, center, offset, terrainTileScaleY, scale, levelLimit) {

packages/gl/src/layer/terrain/TerrainWorkerConnection.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 
 export default class TerrainWorkerConnection extends maptalks.worker.Actor {
     constructor(mapId) {

packages/gl/src/layer/util/util.js

@@ -1,7 +1,7 @@
 const supportAssign = typeof Object.assign === 'function';
 import { vec3, mat4 } from '@maptalks/reshader.gl';
 import Color from 'color';
-import { Coordinate } from '@maptalks/map';
+import { Coordinate } from 'maptalks';
 
 /**
  * Merges the properties of sources into destination object.

packages/gl/src/layer/util/uvUniforms.js

@@ -1,4 +1,4 @@
-import * as maptalks from '@maptalks/map';
+import * as maptalks from 'maptalks';
 import { vec2 } from '@maptalks/reshader.gl';
 
 const DEFAULT_TEX_OFFSET = [0, 0];

packages/gl/src/light/MapLights.js

@@ -1,4 +1,4 @@
-import { Map } from '@maptalks/map';
+import { Map } from 'maptalks';
 import LightManager from './LightManager.js';
 
 

packages/gl/src/map/MapGLRenderer.js

@@ -1,6 +1,6 @@
 import { GLContext } from '@maptalks/fusiongl';
 import createREGL from '@maptalks/regl';
-import { Map, renderer } from '@maptalks/map';
+import { Map, renderer } from 'maptalks';
 
 export default class MapGLRenderer extends renderer.MapCanvasRenderer {
     // createCanvas, createContext, getContextInstance, clearLayerCanvasContext 和 clearCanvas 方法都应该动态注入

packages/gl/src/map/MapPostProcess.js

@@ -1,4 +1,4 @@
-import { Map, renderer } from '@maptalks/map';
+import { Map, renderer } from 'maptalks';
 import createREGL from '@maptalks/regl';
 import PostProcess from '../layer/postprocess/PostProcess';
 

packages/gltf-loader/package.json

@@ -32,7 +32,7 @@
     "karma-expect": "^1.1.3",
     "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
-    "@maptalks/map": "workspace:*",
+    "maptalks": "workspace:*",
     "mocha": "^10.3.0",
     "rollup": "^4.17.2"
   },

packages/layer-3dtiles/package.json

@@ -40,7 +40,7 @@
   "homepage": "https://github.com/fuzhenn/3dtiles-issues/",
   "dependencies": {
     "@maptalks/function-type": "^1.4.0",
-    "@maptalks/map": "workspace:*",
+    "maptalks": "workspace:*",
     "@maptalks/tbn-packer": "^1.4.5",
     "frustum-intersects": "^0.2.4",
     "gl-matrix": "^3.4.0",