refactor: merge packages/reshader.gl into packages/gl (#2631)

* refactor: merge reshader into gl

* update codes

* delete packages/reshader.gl

* fix gl/rollup

* update pnpm-lock

Author: fuzhenn

packages/gl/build/index.d.ts

@@ -1,12 +1,10 @@
 import createREGL from '@maptalks/regl';
-import * as reshader from '@maptalks/reshader.gl';
 
 export {
-    glMatrix,
     mat2, mat2d, mat3, mat4,
     quat, quat2,
     vec2, vec3, vec4,
-} from '@maptalks/reshader.gl';
-export { createREGL, reshader };
+} from 'gl-matrix';
+export { createREGL };
 
 export type * from './gl/dist/index.d.ts';

packages/gl/build/index.js

@@ -5,15 +5,13 @@ import { gltfLoaderExport } from  './gltf-loader-bundle.js';
 registerGLTFLoaderBundle(gltfLoaderExport);
 
 import createREGL from '@maptalks/regl';
-import * as reshader from '@maptalks/reshader.gl';
 
 export {
-    glMatrix,
     mat2, mat2d, mat3, mat4,
     quat, quat2,
     vec2, vec3, vec4,
-} from '@maptalks/reshader.gl';
-export { createREGL, reshader };
+} from 'gl-matrix';
+export { createREGL };
 
 export * from './gl/gl.es.js';
 

packages/gl/package.json

@@ -6,9 +6,9 @@
   "module": "dist/maptalksgl.es.js",
   "scripts": {
     "clean": "rimraf dist && rimraf ./build/gl",
-    "build": "npm run clean && npm run lint && cd ../reshader.gl && npm run build && cd ../gl && rollup --environment BUILD:production -c rollup.config.js",
-    "build-dev": "cd ../reshader.gl && npm run build-dev && cd ../gl && rollup -c rollup.config.js",
-    "dev": "cd ../reshader.gl && npm run build-dev && cd ../gl && rollup -w -c rollup.config.js",
+    "build": "npm run clean && npm run lint && rollup --environment BUILD:production -c rollup.config.js",
+    "build-dev": "rollup -c rollup.config.js",
+    "dev": "rollup -w -c rollup.config.js",
     "test": "cd ../layer-gltf && npm run build && cd ../gl && karma start --single-run",
     "tdd": "karma start --no-single-run",
     "lint": "eslint \"src/**/*.{js,jsx,mjs,ts,tsx}\"",
@@ -36,12 +36,17 @@
     "maptalks": "workspace:*",
     "@maptalks/martini": "^0.4.0",
     "@maptalks/regl": "^3.6.0",
-    "@maptalks/reshader.gl": "workspace:*",
+    "@maptalks/tbn-packer": "^1.4.5",
+    "@webgpu/types": "0.1.52",
     "color": "^3.0.0",
     "colorin": "^0.6.0",
-    "frustum-intersects": "^0.2.4"
+    "earcut": "^3.0.1",
+    "frustum-intersects": "^0.2.4",
+    "gl-matrix": "^3.4.0",
+    "wgsl_reflect": "^1.0.16"
   },
   "devDependencies": {
+    "@maptalks/rollup-plugin-glsl-minify": "^0.1.7",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "0.4.4",

packages/gl/rollup.config.js

@@ -3,6 +3,7 @@ const commonjs = require('@rollup/plugin-commonjs');
 const replace = require('@rollup/plugin-replace');
 const terser = require('@rollup/plugin-terser');
 const typescript = require('@rollup/plugin-typescript');
+const glslMinify = require('@maptalks/rollup-plugin-glsl-minify');
 const { dts } = require("rollup-plugin-dts");
 const pkg = require('./package.json');
 
@@ -56,7 +57,11 @@ const plugins = production ? [terser({
 const banner = `/*!\n * ${pkg.name} v${pkg.version}\n * LICENSE : ${pkg.license}\n * (c) 2016-${new Date().getFullYear()} maptalks.com\n */`;
 const outro = `typeof console !== 'undefined' && console.log('${pkg.name} v${pkg.version}');`;
 const configPlugins = [
-    glsl(),
+    production ? glslMinify({
+        commons: [
+            './src/reshader/shaderlib/glsl'
+        ]
+    }) : glsl(),
     wgsl(),
     nodeResolve({
         // mainFields: ''
@@ -115,6 +120,8 @@ var getGlobal = function () {
   if (typeof global !== "undefined") { return global; }
 };`
 
+const externalPackages = ['maptalks', '@maptalks/fusiongl', '@maptalks/regl', 'gl-matrix', '@maptalks/gltf-loader', '@maptalks/tbn-packer'];
+
 
 module.exports = [
     {
@@ -192,7 +199,7 @@ if (production) {
     module.exports.push({
         input: 'src/index.ts',
         plugins: tsPlugins.concat(plugins),
-        external : ['maptalks', '@maptalks/reshader.gl', '@maptalks/fusiongl', '@maptalks/regl', 'gl-matrix'],
+        external : externalPackages,
         output: {
             'sourcemap': true,
             'format': 'es',
@@ -230,7 +237,7 @@ if (production) {
     module.exports.push({
         input: 'src/index-dev.js',
         plugins: tsPlugins,
-        external : ['maptalks', '@maptalks/reshader.gl', '@maptalks/fusiongl', '@maptalks/regl', 'gl-matrix'],
+        external : externalPackages,
         output: {
             'sourcemap': true,
             'format': 'es',

packages/gl/src/analysis/AnalysisPainter.js

@@ -1,4 +1,4 @@
-import * as reshader from '@maptalks/reshader.gl';
+import * as reshader from '../reshader';
 import AnalysisShader from './AnalysisShader.js';
 import { extend } from '../layer/util/util.js';
 import { Util } from 'maptalks';

packages/gl/src/analysis/AnalysisShader.js

@@ -1,5 +1,5 @@
 // import QuadShader from '../shader/QuadShader.js';
-import * as reshader from '@maptalks/reshader.gl';
+import * as reshader from '../reshader';
 import vert from './glsl/quad.vert';
 import frag from './glsl/analysis.frag';
 

packages/gl/src/index-dev.js

@@ -4,20 +4,16 @@ import { gltfLoaderExport } from  '../build/gltf-loader-bundle.js';
 registerGLTFLoaderBundle(gltfLoaderExport);
 
 import createREGL from '@maptalks/regl';
-import * as reshader from '@maptalks/reshader.gl';
 
 export {
-    glMatrix,
     mat2, mat2d, mat3, mat4,
     quat, quat2,
     vec2, vec3, vec4,
-} from '@maptalks/reshader.gl';
-export { createREGL, reshader };
+} from 'gl-matrix';
+export { createREGL };
 
 export * from './index.ts';
 
-
-
 import * as maptalks from 'maptalks';
 import chunk from '../build/worker.js';
 maptalks.registerWorkerAdapter('@maptalks/terrain', chunk);

packages/gl/src/index.ts

@@ -39,11 +39,14 @@ import Area3DTool from './analysis/Area3DTool';
 import Height3DTool from './analysis/Height3DTool';
 export { Distance3DTool, Measure3DTool, Area3DTool, Height3DTool };
 
-import { earcut } from '@maptalks/reshader.gl';
+import earcut from 'earcut';
 export { earcut };
 
 export { default as color } from 'color';
 
+import * as reshader from './reshader';
+export { reshader };
+
 // if (typeof window !== 'undefined') {
 //     // append GroupGLLayer on maptalks manually
 //     if (window.maptalks) {

packages/gl/src/layer/EnvironmentPainter.js

@@ -1,5 +1,5 @@
-import * as reshader from '@maptalks/reshader.gl';
-import { mat3, vec3 } from '@maptalks/reshader.gl';
+import * as reshader from '../reshader';
+import { mat3, vec3 } from 'gl-matrix';
 import { isNumber } from './util/util.js';
 
 const { createIBLTextures, disposeIBLTextures } = reshader.pbr.PBRUtils;

packages/gl/src/layer/GroundPainter.ts

@@ -1,6 +1,6 @@
-import { vec2, mat4 } from '@maptalks/reshader.gl';
-import { pbr } from '@maptalks/reshader.gl';
-import * as reshader from '@maptalks/reshader.gl';
+import { vec2, mat4 } from 'gl-matrix';
+import { pbr } from '../reshader';
+import * as reshader from '../reshader';
 import { fillVert, fillFrag } from './glsl/fill.js';
 import ShadowProcess from './shadow/ShadowProcess';
 import { extend, getGroundTransform, hasOwn, normalizeColor } from './util/util.js';