@deck.gl/extensions 9.0.0-beta.4 → 9.0.0-beta.6

package/dist/fill-style/fill-style-extension.js

@@ -1,5 +1,5 @@
 import { LayerExtension } from '@deck.gl/core';
-import { patternShaders } from "./shaders.glsl.js";
+import { patternShaders } from "./shader-module.js";
 const defaultProps = {
     fillPatternEnabled: true,
     fillPatternAtlas: {

package/dist/fill-style/{shaders.glsl.d.ts → shader-module.d.ts}

@@ -10,4 +10,4 @@ type FillStyleModuleSettings = {
 };
 export declare const patternShaders: ShaderModule<FillStyleModuleSettings>;
 export {};
-//# sourceMappingURL=shaders.glsl.d.ts.map
+//# sourceMappingURL=shader-module.d.ts.map

package/dist/fill-style/shader-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/fill-style/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAkB,MAAM,eAAe,CAAC;AAE7D,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAyE3C,KAAK,uBAAuB,GACxB;IACE,QAAQ,EAAE,QAAQ,CAAC;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACD;IACE,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoCN,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,uBAAuB,CAOhE,CAAC"}

package/dist/fill-style/{shaders.glsl.js → shader-module.js}

@@ -1,25 +1,23 @@
 import { project, fp64LowPart } from '@deck.gl/core';
+import { glsl } from "../utils/syntax-tags.js";
 /*
  * fill pattern shader module
  */
 const patternVs = `
 #ifdef NON_INSTANCED_MODEL
-  #define FILL_PATTERN_FRAME_ATTRIB fillPatternFrames
-  #define FILL_PATTERN_SCALE_ATTRIB fillPatternScales
-  #define FILL_PATTERN_OFFSET_ATTRIB fillPatternOffsets
+#define FILL_PATTERN_FRAME_ATTRIB fillPatternFrames
+#define FILL_PATTERN_SCALE_ATTRIB fillPatternScales
+#define FILL_PATTERN_OFFSET_ATTRIB fillPatternOffsets
 #else
-  #define FILL_PATTERN_FRAME_ATTRIB instanceFillPatternFrames
-  #define FILL_PATTERN_SCALE_ATTRIB instanceFillPatternScales
-  #define FILL_PATTERN_OFFSET_ATTRIB instanceFillPatternOffsets
+#define FILL_PATTERN_FRAME_ATTRIB instanceFillPatternFrames
+#define FILL_PATTERN_SCALE_ATTRIB instanceFillPatternScales
+#define FILL_PATTERN_OFFSET_ATTRIB instanceFillPatternOffsets
 #endif
-
 in vec4 FILL_PATTERN_FRAME_ATTRIB;
 in float FILL_PATTERN_SCALE_ATTRIB;
 in vec2 FILL_PATTERN_OFFSET_ATTRIB;
-
 uniform bool fill_patternEnabled;
 uniform vec2 fill_patternTextureSize;
-
 out vec2 fill_uv;
 out vec4 fill_patternBounds;
 out vec4 fill_patternPlacement;
@@ -30,39 +28,35 @@ uniform bool fill_patternMask;
 uniform sampler2D fill_patternTexture;
 uniform vec2 fill_uvCoordinateOrigin;
 uniform vec2 fill_uvCoordinateOrigin64Low;
-
 in vec4 fill_patternBounds;
 in vec4 fill_patternPlacement;
 in vec2 fill_uv;
-
 const float FILL_UV_SCALE = 512.0 / 40000000.0;
 `;
 const inject = {
     'vs:DECKGL_FILTER_GL_POSITION': `
-    fill_uv = geometry.position.xy;
-  `,
+fill_uv = geometry.position.xy;
+`,
     'vs:DECKGL_FILTER_COLOR': `
-    if (fill_patternEnabled) {
-      fill_patternBounds = FILL_PATTERN_FRAME_ATTRIB / vec4(fill_patternTextureSize, fill_patternTextureSize);
-      fill_patternPlacement.xy = FILL_PATTERN_OFFSET_ATTRIB;
-      fill_patternPlacement.zw = FILL_PATTERN_SCALE_ATTRIB * FILL_PATTERN_FRAME_ATTRIB.zw;
-    }
-  `,
+if (fill_patternEnabled) {
+fill_patternBounds = FILL_PATTERN_FRAME_ATTRIB / vec4(fill_patternTextureSize, fill_patternTextureSize);
+fill_patternPlacement.xy = FILL_PATTERN_OFFSET_ATTRIB;
+fill_patternPlacement.zw = FILL_PATTERN_SCALE_ATTRIB * FILL_PATTERN_FRAME_ATTRIB.zw;
+}
+`,
     'fs:DECKGL_FILTER_COLOR': `
-    if (fill_patternEnabled) {
-      vec2 scale = FILL_UV_SCALE * fill_patternPlacement.zw;
-      vec2 patternUV = mod(mod(fill_uvCoordinateOrigin, scale) + fill_uvCoordinateOrigin64Low + fill_uv, scale) / scale;
-      patternUV = mod(fill_patternPlacement.xy + patternUV, 1.0);
-
-      vec2 texCoords = fill_patternBounds.xy + fill_patternBounds.zw * patternUV;
-
-      vec4 patternColor = texture(fill_patternTexture, texCoords);
-      color.a *= patternColor.a;
-      if (!fill_patternMask) {
-        color.rgb = patternColor.rgb;
-      }
-    }
-  `
+if (fill_patternEnabled) {
+vec2 scale = FILL_UV_SCALE * fill_patternPlacement.zw;
+vec2 patternUV = mod(mod(fill_uvCoordinateOrigin, scale) + fill_uvCoordinateOrigin64Low + fill_uv, scale) / scale;
+patternUV = mod(fill_patternPlacement.xy + patternUV, 1.0);
+vec2 texCoords = fill_patternBounds.xy + fill_patternBounds.zw * patternUV;
+vec4 patternColor = texture(fill_patternTexture, texCoords);
+color.a *= patternColor.a;
+if (!fill_patternMask) {
+color.rgb = patternColor.rgb;
+}
+}
+`
 };
 /* eslint-disable camelcase */
 function getPatternUniforms(opts, uniforms) {

package/dist/fp64/project64.glsl.js

@@ -18,83 +18,64 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 export default `\
-
 const vec2 WORLD_SCALE_FP64 = vec2(81.4873275756836, 0.0000032873668232014097);
-
 uniform vec2 project_uViewProjectionMatrixFP64[16];
-
-// longitude: lnglat_fp64.xy; latitude: lnglat_fp64.zw
 void mercatorProject_fp64(vec4 lnglat_fp64, out vec2 out_val[2]) {
-
 #if defined(NVIDIA_FP64_WORKAROUND)
-  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);
+out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64 * ONE);
 #else
-  out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);
+out_val[0] = sum_fp64(radians_fp64(lnglat_fp64.xy), PI_FP64);
 #endif
-  out_val[1] = sum_fp64(PI_FP64,
-    log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));
-  return;
+out_val[1] = sum_fp64(PI_FP64,
+log_fp64(tan_fp64(sum_fp64(PI_4_FP64, radians_fp64(lnglat_fp64.zw) / 2.0))));
+return;
 }
-
 void project_position_fp64(vec4 position_fp64, out vec2 out_val[2]) {
-  vec2 pos_fp64[2];
-  mercatorProject_fp64(position_fp64, pos_fp64);
-  out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);
-  out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);
-
-  return;
+vec2 pos_fp64[2];
+mercatorProject_fp64(position_fp64, pos_fp64);
+out_val[0] = mul_fp64(pos_fp64[0], WORLD_SCALE_FP64);
+out_val[1] = mul_fp64(pos_fp64[1], WORLD_SCALE_FP64);
+return;
 }
-
 void project_position_fp64(vec2 position, vec2 position64xyLow, out vec2 out_val[2]) {
-  vec4 position64xy = vec4(
-    position.x, position64xyLow.x,
-    position.y, position64xyLow.y);
-
-  project_position_fp64(position64xy, out_val);
+vec4 position64xy = vec4(
+position.x, position64xyLow.x,
+position.y, position64xyLow.y);
+project_position_fp64(position64xy, out_val);
 }
-
 vec4 project_common_position_to_clipspace_fp64(vec2 vertex_pos_modelspace[4]) {
-  vec2 vertex_pos_clipspace[4];
-  mat4_vec4_mul_fp64(project_uViewProjectionMatrixFP64, vertex_pos_modelspace,
-    vertex_pos_clipspace);
-  return vec4(
-    vertex_pos_clipspace[0].x,
-    vertex_pos_clipspace[1].x,
-    vertex_pos_clipspace[2].x,
-    vertex_pos_clipspace[3].x
-    );
+vec2 vertex_pos_clipspace[4];
+mat4_vec4_mul_fp64(project_uViewProjectionMatrixFP64, vertex_pos_modelspace,
+vertex_pos_clipspace);
+return vec4(
+vertex_pos_clipspace[0].x,
+vertex_pos_clipspace[1].x,
+vertex_pos_clipspace[2].x,
+vertex_pos_clipspace[3].x
+);
 }
-
 vec4 project_position_to_clipspace(
-  vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition
+vec3 position, vec3 position64xyLow, vec3 offset, out vec4 commonPosition
 ) {
-  // This is the local offset to the instance position
-  vec2 offset64[4];
-  vec4_fp64(vec4(offset, 0.0), offset64);
-
-  float z = project_size(position.z);
-
-  // Apply web mercator projection (depends on coordinate system imn use)
-  vec2 projectedPosition64xy[2];
-  project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);
-
-  vec2 commonPosition64[4];
-  commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);
-  commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);
-  commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));
-  commonPosition64[3] = vec2(1.0, 0.0);
-
-  commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);
-
-  return project_common_position_to_clipspace_fp64(commonPosition64);
+vec2 offset64[4];
+vec4_fp64(vec4(offset, 0.0), offset64);
+float z = project_size(position.z);
+vec2 projectedPosition64xy[2];
+project_position_fp64(position.xy, position64xyLow.xy, projectedPosition64xy);
+vec2 commonPosition64[4];
+commonPosition64[0] = sum_fp64(offset64[0], projectedPosition64xy[0]);
+commonPosition64[1] = sum_fp64(offset64[1], projectedPosition64xy[1]);
+commonPosition64[2] = sum_fp64(offset64[2], vec2(z, 0.0));
+commonPosition64[3] = vec2(1.0, 0.0);
+commonPosition = vec4(projectedPosition64xy[0].x, projectedPosition64xy[1].x, z, 1.0);
+return project_common_position_to_clipspace_fp64(commonPosition64);
 }
-
 vec4 project_position_to_clipspace(
-  vec3 position, vec3 position64xyLow, vec3 offset
+vec3 position, vec3 position64xyLow, vec3 offset
 ) {
-  vec4 commonPosition;
-  return project_position_to_clipspace(
-    position, position64xyLow, offset, commonPosition
-  );
+vec4 commonPosition;
+return project_position_to_clipspace(
+position, position64xyLow, offset, commonPosition
+);
 }
 `;