fix: fix ExtrudePolygonLayer in webgpu and set default altitudeProperty to 'height' and minHeightProperty to 'min_height'

Author: fuzhenn

packages/gl/src/reshader/pbr/wgsl/standard_vert.wgsl

@@ -35,7 +35,7 @@ struct VertexInput {
     #endif
 
     #ifdef HAS_OPACITY
-        @location($i) aOpacity: f32,
+        @location($i) aOpacity: vec4u,
     #endif
 
     #if HAS_COLOR0
@@ -278,7 +278,7 @@ fn main(input: VertexInput) -> VertexOutput {
         #endif
 
         #ifdef HAS_OPACITY
-            output.vOpacity = input.aOpacity / 255.0;
+            output.vOpacity = f32(input.aOpacity[0]) / 255.0;
         #else
             output.vOpacity = 1.0;
         #endif

packages/gl/src/reshader/shaderlib/wgsl/mesh_picking.ts

@@ -3,7 +3,11 @@ const vert = /*wgsl*/`
 #include <get_output>
 
 struct VertexInput {
-    @location($i) aPosition: vec3f,
+    #ifdef POSITION_IS_INT
+        @location($i) aPosition: vec4i,
+    #else
+        @location($i) aPosition: vec3f,
+    #endif
 }
 
 struct Uniforms {

packages/vt/src/layer/vector/ExtrudePolygonLayer.ts

@@ -139,7 +139,9 @@ const SYMBOL = {
 };
 
 const DEFAULT_DATACONFIG = {
-  defaultAltitude: 20,
+    altitudeProperty: 'height',
+    minHeightProperty: 'min_height',
+    defaultAltitude: 20,
 };
 
 const topFilter = (mesh) => {
@@ -278,15 +280,15 @@ class ExtrudePolygonLayerRenderer extends PolygonLayerRenderer {
     const topDataConfig = extend({}, dataConfig);
     topDataConfig.upsideUpTexture = true;
     const painter = new StandardPainter(
-      this.regl,
+      this.device,
       layer,
       this.painterSymbol,
       sceneConfig,
       0,
       topDataConfig
     );
     this.sidePainter = new StandardPainter(
-      this.regl,
+      this.device,
       layer,
       this.sidePainterSymbol,
       sceneConfig,

packages/vt/src/worker/builder/Extrusion.js

@@ -257,7 +257,13 @@ export function buildExtrudeFaces(
             }
         }
     }
-    const pickingCtor = PackUtil.getUnsignedArrayType(pickingIds.getLength() ? pickingIds[pickingIds.getLength() - 1] : 0);
+    const isVector3D = !!center;
+    let pickingCtor;
+    if (isVector3D) {
+        pickingCtor = Float32Array;
+    } else {
+        pickingCtor = PackUtil.getUnsignedArrayType(pickingIds.getLength() ? pickingIds[pickingIds.getLength() - 1] : 0);
+    }
 
     const data = {
         hasNegativeHeight,

packages/vt/src/worker/layer/BaseLayerWorker.js

@@ -541,8 +541,13 @@ export default class BaseLayerWorker {
             }
             const projectionCode = this.options.projectionCode;
             const textureWidth = symbol.material && symbol.material.textureWidth || DEFAULT_TEX_WIDTH;
-            return Promise.all([Promise.resolve(build3DExtrusion(features, dataConfig, extent, tilePoint,
-                textureWidth, context.tileInfo.res, glScale, extent / this.options['tileSize'], centimeterToPoint, verticalCentimeterToPoint, symbol, zoom, projectionCode, debugIndex))]);
+            return Promise.all([Promise.resolve(
+                build3DExtrusion(
+                    features, dataConfig, extent, tilePoint,
+                    textureWidth, context.tileInfo.res, glScale, extent / this.options['tileSize'], centimeterToPoint,
+                    verticalCentimeterToPoint, symbol, zoom, projectionCode, debugIndex
+                )
+            )]);
         } else if (type === '3d-wireframe') {
             return Promise.all([Promise.resolve(buildWireframe(features, extent, symbol, dataConfig))]);
         } else if (type === 'point') {