@deck.gl/geo-layers 9.0.0-beta.5 → 9.0.0-beta.7

package/dist/index.cjs

@@ -1966,149 +1966,105 @@ var import_mesh_layers2 = require("@deck.gl/mesh-layers");
 var import_gltf = require("@luma.gl/gltf");
 var import_shadertools = require("@luma.gl/shadertools");
 var import_engine = require("@luma.gl/engine");
-var import_constants = require("@luma.gl/constants");
 var import_mesh_layers = require("@deck.gl/mesh-layers");
 
 // dist/mesh-layer/mesh-layer-vertex.glsl.js
 var mesh_layer_vertex_glsl_default = `#version 300 es
 #define SHADER_NAME simple-mesh-layer-vs
-
-// Scale the model
 uniform float sizeScale;
 uniform bool composeModelMatrix;
 uniform bool pickFeatureIds;
-
-// Primitive attributes
 in vec3 positions;
 in vec3 normals;
 in vec3 colors;
 in vec2 texCoords;
 in vec4 uvRegions;
 in vec3 featureIdsPickingColors;
-
-// Instance attributes
 in vec4 instanceColors;
 in vec3 instancePickingColors;
 in vec3 instanceModelMatrixCol0;
 in vec3 instanceModelMatrixCol1;
 in vec3 instanceModelMatrixCol2;
-
-// Outputs to fragment shader
 out vec2 vTexCoord;
 out vec3 cameraPosition;
 out vec3 normals_commonspace;
 out vec4 position_commonspace;
 out vec4 vColor;
-
 vec2 applyUVRegion(vec2 uv) {
-  #ifdef HAS_UV_REGIONS
-    // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md
-    return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
-  #else
-    return uv;
-  #endif
+#ifdef HAS_UV_REGIONS
+return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
+#else
+return uv;
+#endif
 }
-
 void main(void) {
-  vec2 uv = applyUVRegion(texCoords);
-  geometry.uv = uv;
-
-  if (pickFeatureIds) {
-    geometry.pickingColor = featureIdsPickingColors;
-  } else {
-    geometry.pickingColor = instancePickingColors;
-  }
-
-  mat3 instanceModelMatrix = mat3(instanceModelMatrixCol0, instanceModelMatrixCol1, instanceModelMatrixCol2);
-
-  vTexCoord = uv;
-  cameraPosition = project_uCameraPosition;
-  vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
-
-  vec3 pos = (instanceModelMatrix * positions) * sizeScale;
-  vec3 projectedPosition = project_position(positions);
-  position_commonspace = vec4(projectedPosition, 1.0);
-  gl_Position = project_common_position_to_clipspace(position_commonspace);
-
-  geometry.position = position_commonspace;
-  normals_commonspace = project_normal(instanceModelMatrix * normals);
-  geometry.normal = normals_commonspace;
-
-  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
-
-  #ifdef MODULE_PBR
-    // set PBR data
-    pbr_vPosition = geometry.position.xyz;
-    #ifdef HAS_NORMALS
-      pbr_vNormal = geometry.normal;
-    #endif
-
-    #ifdef HAS_UV
-      pbr_vUV = uv;
-    #else
-      pbr_vUV = vec2(0., 0.);
-    #endif
-    geometry.uv = pbr_vUV;
-  #endif
-
-  DECKGL_FILTER_COLOR(vColor, geometry);
+vec2 uv = applyUVRegion(texCoords);
+geometry.uv = uv;
+if (pickFeatureIds) {
+geometry.pickingColor = featureIdsPickingColors;
+} else {
+geometry.pickingColor = instancePickingColors;
+}
+mat3 instanceModelMatrix = mat3(instanceModelMatrixCol0, instanceModelMatrixCol1, instanceModelMatrixCol2);
+vTexCoord = uv;
+cameraPosition = project_uCameraPosition;
+vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
+vec3 pos = (instanceModelMatrix * positions) * sizeScale;
+vec3 projectedPosition = project_position(positions);
+position_commonspace = vec4(projectedPosition, 1.0);
+gl_Position = project_common_position_to_clipspace(position_commonspace);
+geometry.position = position_commonspace;
+normals_commonspace = project_normal(instanceModelMatrix * normals);
+geometry.normal = normals_commonspace;
+DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+#ifdef MODULE_PBR
+pbr_vPosition = geometry.position.xyz;
+#ifdef HAS_NORMALS
+pbr_vNormal = geometry.normal;
+#endif
+#ifdef HAS_UV
+pbr_vUV = uv;
+#else
+pbr_vUV = vec2(0., 0.);
+#endif
+geometry.uv = pbr_vUV;
+#endif
+DECKGL_FILTER_COLOR(vColor, geometry);
 }
 `;
 
 // dist/mesh-layer/mesh-layer-fragment.glsl.js
 var mesh_layer_fragment_glsl_default = `#version 300 es
 #define SHADER_NAME simple-mesh-layer-fs
-
 precision highp float;
-
 uniform bool hasTexture;
 uniform sampler2D sampler;
 uniform bool flatShading;
 uniform float opacity;
-
 in vec2 vTexCoord;
 in vec3 cameraPosition;
 in vec3 normals_commonspace;
 in vec4 position_commonspace;
 in vec4 vColor;
-
 out vec4 fragColor;
-
 void main(void) {
-  
 #ifdef MODULE_PBR
-
-  fragColor = vColor * pbr_filterColor(vec4(0));
-  geometry.uv = pbr_vUV;
-  fragColor.a *= opacity;
-
+fragColor = vColor * pbr_filterColor(vec4(0));
+geometry.uv = pbr_vUV;
+fragColor.a *= opacity;
 #else
-
-  geometry.uv = vTexCoord;
-
-  vec3 normal;
-  if (flatShading) {
-
-// NOTE(Tarek): This is necessary because
-// headless.gl reports the extension as
-// available but does not support it in
-// the shader.
-#ifdef DERIVATIVES_AVAILABLE
-    normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
-#else
-    normal = vec3(0.0, 0.0, 1.0);
-#endif
-  } else {
-    normal = normals_commonspace;
-  }
-
-  vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;
-  vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
-  fragColor = vec4(lightColor, color.a * opacity);
-
+geometry.uv = vTexCoord;
+vec3 normal;
+if (flatShading) {
+normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
+} else {
+normal = normals_commonspace;
+}
+vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;
+vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
+fragColor = vec4(lightColor, color.a * opacity);
 #endif
-
-  DECKGL_FILTER_COLOR(fragColor, geometry);
+DECKGL_FILTER_COLOR(fragColor, geometry);
 }
 `;
 
@@ -2143,7 +2099,7 @@ var _MeshLayer = class extends import_mesh_layers.SimpleMeshLayer {
     if (featureIds) {
       attributeManager.add({
         featureIdsPickingColors: {
-          type: import_constants.GL.UNSIGNED_BYTE,
+          type: "uint8",
           size: 3,
           noAlloc: true,
           update: this.calculateFeatureIdsPickingColors