fix: fix wgsl error in picking of PolygonLayer, maptalks/issues#889

Author: fuzhenn

packages/vt/src/layer/plugins/painters/FillPainter.js

@@ -603,14 +603,16 @@ class FillPainter extends BasicPainter {
 
         if (this.pickingFBO) {
             const projViewModelMatrix = [];
-            const isVectorTile = this.layer instanceof maptalks.TileLayer;
+            const isVectorTile = this.layer.isVectorTileLayer;
+            const defines = { 'PICKING_MODE': 1 };
+            this.appendWGSLPositionType(defines);
             this.picking = [new reshader.FBORayPicking(
                 this.renderer,
                 {
                     name: 'fill-picking',
                     vert: pickingVert,
                     wgslVert: pickingWgsl,
-                    defines: { 'PICKING_MODE': 1 },
+                    defines,
                     uniforms: [
                         {
                             name: 'projViewModelMatrix',
@@ -647,13 +649,11 @@ class FillPainter extends BasicPainter {
         const defines = {};
         this.fillIncludes(defines, uniforms, context);
 
-        const isVectorTile = this.layer instanceof maptalks.TileLayer;
-        const TYPE_CONSTS = `#define POSITION_TYPE ${isVectorTile ? 'vec2i' : 'vec2f'}
-`;
+        this.appendWGSLPositionType(defines);
         this.shader = new reshader.MeshShader({
             name: 'vt-fill',
             vert, frag,
-            wgslVert: TYPE_CONSTS + wgslVert,
+            wgslVert: wgslVert,
             wgslFrag,
             uniforms,
             defines,

packages/vt/src/layer/plugins/painters/IconPainter.js

@@ -730,9 +730,7 @@ class IconPainter extends CollisionPainter {
         };
         const defines = this._shaderDefines || {};
 
-        const isVectorTile = this.layer.isVectorTileLayer;
-        defines['POSITION_TYPE_2'] = isVectorTile ? 'vec2i' : 'vec2f';
-        defines['POSITION_TYPE_3'] = isVectorTile ? 'vec4i' : 'vec3f';
+        this.appendWGSLPositionType(defines);
         this.shader = new reshader.MeshShader({
             name: 'marker',
             vert, frag,

packages/vt/src/layer/plugins/painters/LinePainter.js

@@ -450,16 +450,16 @@ class LinePainter extends BasicPainter {
 
         if (this.pickingFBO) {
             const isVectorTile = this.layer instanceof maptalks.TileLayer;
-            const TYPE_CONSTS = `#define POSITION_TYPE ${isVectorTile ? 'vec2i' : 'vec2f'}
-#define LINESOFAR_TYPE ${isVectorTile ? 'u32' : 'f32'}
-`;
+            const defines = { 'PICKING_MODE': 1 };
+            this.appendWGSLPositionType(defines);
+            defines['LINESOFAR_TYPE'] = isVectorTile ? 'u32' : 'f32';
             this.picking = [new reshader.FBORayPicking(
                 this.renderer,
                 {
                     name: 'line-picking',
                     vert: pickingVert,
-                    wgslVert: TYPE_CONSTS + wgslVert,
-                    defines: { 'PICKING_MODE': 1 },
+                    wgslVert: wgslVert,
+                    defines,
                     uniforms: [
                         {
                             name: 'projViewModelMatrix',
@@ -500,15 +500,14 @@ class LinePainter extends BasicPainter {
             }
         );
 
-        const isVectorTile = this.layer instanceof maptalks.TileLayer;
-        const TYPE_CONSTS = `#define POSITION_TYPE ${isVectorTile ? 'vec2i' : 'vec2f'}
-#define LINESOFAR_TYPE ${isVectorTile ? 'u32' : 'f32'}
-`;
+        const isVectorTile = this.layer.isVectorTileLayer;
+        this.appendWGSLPositionType(defines);
+        defines['LINESOFAR_TYPE'] = isVectorTile ? 'u32' : 'f32';
         this.shader = new reshader.MeshShader({
             name: 'vt-line',
             vert,
             frag,
-            wgslVert: TYPE_CONSTS + wgslVert,
+            wgslVert,
             wgslFrag,
             uniforms,
             defines,

packages/vt/src/layer/plugins/painters/Painter.js

@@ -1417,6 +1417,12 @@ class Painter {
     shouldDrawParentTile() {
         return true;
     }
+
+    appendWGSLPositionType(defines) {
+        const isVectorTile = this.layer.isVectorTileLayer;
+        defines['POSITION_TYPE_2'] = isVectorTile ? 'vec2i' : 'vec2f';
+        defines['POSITION_TYPE_3'] = isVectorTile ? 'vec4i' : 'vec3f';
+    }
 }
 
 export default Painter;

packages/vt/src/layer/plugins/painters/TerrainFlatMaskPainter.js

@@ -94,8 +94,6 @@ class TerrainFlatMaskPainter extends BasicPainter {
             },
         ];
 
-//         const TYPE_CONSTS = `#define POSITION_TYPE vec2i
-// `;
         this.shader = new reshader.MeshShader({
             name: 'vt-terrain-flat-mask',
             vert, frag,

packages/vt/src/layer/plugins/painters/TextPainter.js

@@ -925,10 +925,8 @@ export default class TextPainter extends CollisionPainter {
         };
 
         extraCommandProps.viewport = viewport;
-        const isVectorTile = this.layer.isVectorTileLayer;
         const defines = {};
-        defines['POSITION_TYPE_2'] = isVectorTile ? 'vec2i' : 'vec2f';
-        defines['POSITION_TYPE_3'] = isVectorTile ? 'vec4i' : 'vec3f';
+        this.appendWGSLPositionType(defines);
         this.shader = new reshader.MeshShader({
             name: 'text',
             // vert: vertAlongLine, frag,

packages/vt/src/layer/plugins/painters/wgsl/fill_picking_vert.wgsl

@@ -1,9 +1,9 @@
 struct VertexInput {
 #ifdef HAS_ALTITUDE
-        @location($i) aPosition: vec2i,
+        @location($i) aPosition: POSITION_TYPE_2,
         @location($i) aAltitude: f32,
 #else
-        @location($i) aPosition: vec4i,
+        @location($i) aPosition: POSITION_TYPE_3,
 #endif
 }
 

packages/vt/src/layer/plugins/painters/wgsl/fill_vert.wgsl

@@ -1,10 +1,10 @@
 #define SHADER_NAME FILL
 struct VertexInput {
 #ifdef HAS_ALTITUDE
-    @location($i) aPosition: POSITION_TYPE,
+    @location($i) aPosition: POSITION_TYPE_2,
     @location($i) aAltitude: f32,
 #else
-    @location($i) aPosition: vec4i,
+    @location($i) aPosition: POSITION_TYPE_3,
 #endif
 #ifdef HAS_COLOR
     @location($i) aColor: vec4u,

packages/vt/src/layer/plugins/painters/wgsl/line_vert.wgsl

@@ -35,10 +35,10 @@ struct ShaderUniforms {
 
 struct VertexInput {
 #ifdef HAS_ALTITUDE
-    @location($i) aPosition: POSITION_TYPE,
+    @location($i) aPosition: POSITION_TYPE_2,
     @location($i) aAltitude: f32,
 #else
-    @location($i) aPosition: vec4i,
+    @location($i) aPosition: POSITION_TYPE_3,
 #endif
 
 @location($i) aExtrude: vec4i,