@luma.gl/shadertools - npm Package Compare versions

Comparing version 9.1.0-alpha.14 to 9.1.0-alpha.15

dist/index.d.ts

@@ -41,41 +41,41 @@ /**
 export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
-export type { BrightnessContrastProps, BrightnessContrastUniforms } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
-export { brightnessContrast } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
-export type { DenoiseProps, DenoiseUniforms } from "./modules/postprocessing/image-adjust-filters/denoise.js";
-export { denoise } from "./modules/postprocessing/image-adjust-filters/denoise.js";
-export type { HueSaturationProps, HueSaturationUniforms } from "./modules/postprocessing/image-adjust-filters/huesaturation.js";
-export { hueSaturation } from "./modules/postprocessing/image-adjust-filters/huesaturation.js";
-export type { NoiseProps, NoiseUniforms } from "./modules/postprocessing/image-adjust-filters/noise.js";
-export { noise } from "./modules/postprocessing/image-adjust-filters/noise.js";
-export type { SepiaProps, SepiaUniforms } from "./modules/postprocessing/image-adjust-filters/sepia.js";
-export { sepia } from "./modules/postprocessing/image-adjust-filters/sepia.js";
-export type { VibranceProps, VibranceUniforms } from "./modules/postprocessing/image-adjust-filters/vibrance.js";
-export { vibrance } from "./modules/postprocessing/image-adjust-filters/vibrance.js";
-export type { VignetteProps, VignetteUniforms } from "./modules/postprocessing/image-adjust-filters/vignette.js";
-export { vignette } from "./modules/postprocessing/image-adjust-filters/vignette.js";
-export type { TiltShiftProps, TiltShiftUniforms } from "./modules/postprocessing/image-blur-filters/tiltshift.js";
-export { tiltShift } from "./modules/postprocessing/image-blur-filters/tiltshift.js";
-export type { TriangleBlurProps, TriangleBlurUniforms } from "./modules/postprocessing/image-blur-filters/triangleblur.js";
-export { triangleBlur } from "./modules/postprocessing/image-blur-filters/triangleblur.js";
-export type { ZoomBlurProps, ZoomBlurUniforms } from "./modules/postprocessing/image-blur-filters/zoomblur.js";
-export { zoomBlur } from "./modules/postprocessing/image-blur-filters/zoomblur.js";
-export type { ColorHalftoneProps, ColorHalftoneUniforms } from "./modules/postprocessing/image-fun-filters/colorhalftone.js";
-export { colorHalftone } from "./modules/postprocessing/image-fun-filters/colorhalftone.js";
-export type { DotScreenProps, DotScreenUniforms } from "./modules/postprocessing/image-fun-filters/dotscreen.js";
-export { dotScreen } from "./modules/postprocessing/image-fun-filters/dotscreen.js";
-export type { EdgeWorkProps, EdgeWorkUniforms } from "./modules/postprocessing/image-fun-filters/edgework.js";
-export { edgeWork } from "./modules/postprocessing/image-fun-filters/edgework.js";
-export type { HexagonalPixelateProps, HexagonalPixelateUniforms } from "./modules/postprocessing/image-fun-filters/hexagonalpixelate.js";
-export { hexagonalPixelate } from "./modules/postprocessing/image-fun-filters/hexagonalpixelate.js";
-export type { InkProps, InkUniforms } from "./modules/postprocessing/image-fun-filters/ink.js";
-export { ink } from "./modules/postprocessing/image-fun-filters/ink.js";
-export type { MagnifyProps, MagnifyUniforms } from "./modules/postprocessing/image-fun-filters/magnify.js";
-export { magnify } from "./modules/postprocessing/image-fun-filters/magnify.js";
-export type { BulgePinchProps, BulgePinchUniforms } from "./modules/postprocessing/image-warp-filters/bulgepinch.js";
-export { bulgePinch } from "./modules/postprocessing/image-warp-filters/bulgepinch.js";
-export type { SwirlProps, SwirlUniforms } from "./modules/postprocessing/image-warp-filters/swirl.js";
-export { swirl } from "./modules/postprocessing/image-warp-filters/swirl.js";
-export { fxaa } from "./modules/postprocessing/fxaa/fxaa.js";
-export type { WarpProps, WarpUniforms } from "./modules/postprocessing/image-warp-filters/warp.js";
-export { warp as _warp } from "./modules/postprocessing/image-warp-filters/warp.js";
+export type { BrightnessContrastProps, BrightnessContrastUniforms } from "./passes/postprocessing/image-adjust-filters/brightnesscontrast.js";
+export { brightnessContrast } from "./passes/postprocessing/image-adjust-filters/brightnesscontrast.js";
+export type { DenoiseProps, DenoiseUniforms } from "./passes/postprocessing/image-adjust-filters/denoise.js";
+export { denoise } from "./passes/postprocessing/image-adjust-filters/denoise.js";
+export type { HueSaturationProps, HueSaturationUniforms } from "./passes/postprocessing/image-adjust-filters/huesaturation.js";
+export { hueSaturation } from "./passes/postprocessing/image-adjust-filters/huesaturation.js";
+export type { NoiseProps, NoiseUniforms } from "./passes/postprocessing/image-adjust-filters/noise.js";
+export { noise } from "./passes/postprocessing/image-adjust-filters/noise.js";
+export type { SepiaProps, SepiaUniforms } from "./passes/postprocessing/image-adjust-filters/sepia.js";
+export { sepia } from "./passes/postprocessing/image-adjust-filters/sepia.js";
+export type { VibranceProps, VibranceUniforms } from "./passes/postprocessing/image-adjust-filters/vibrance.js";
+export { vibrance } from "./passes/postprocessing/image-adjust-filters/vibrance.js";
+export type { VignetteProps, VignetteUniforms } from "./passes/postprocessing/image-adjust-filters/vignette.js";
+export { vignette } from "./passes/postprocessing/image-adjust-filters/vignette.js";
+export type { TiltShiftProps, TiltShiftUniforms } from "./passes/postprocessing/image-blur-filters/tiltshift.js";
+export { tiltShift } from "./passes/postprocessing/image-blur-filters/tiltshift.js";
+export type { TriangleBlurProps, TriangleBlurUniforms } from "./passes/postprocessing/image-blur-filters/triangleblur.js";
+export { triangleBlur } from "./passes/postprocessing/image-blur-filters/triangleblur.js";
+export type { ZoomBlurProps, ZoomBlurUniforms } from "./passes/postprocessing/image-blur-filters/zoomblur.js";
+export { zoomBlur } from "./passes/postprocessing/image-blur-filters/zoomblur.js";
+export type { ColorHalftoneProps, ColorHalftoneUniforms } from "./passes/postprocessing/image-fun-filters/colorhalftone.js";
+export { colorHalftone } from "./passes/postprocessing/image-fun-filters/colorhalftone.js";
+export type { DotScreenProps, DotScreenUniforms } from "./passes/postprocessing/image-fun-filters/dotscreen.js";
+export { dotScreen } from "./passes/postprocessing/image-fun-filters/dotscreen.js";
+export type { EdgeWorkProps, EdgeWorkUniforms } from "./passes/postprocessing/image-fun-filters/edgework.js";
+export { edgeWork } from "./passes/postprocessing/image-fun-filters/edgework.js";
+export type { HexagonalPixelateProps, HexagonalPixelateUniforms } from "./passes/postprocessing/image-fun-filters/hexagonalpixelate.js";
+export { hexagonalPixelate } from "./passes/postprocessing/image-fun-filters/hexagonalpixelate.js";
+export type { InkProps, InkUniforms } from "./passes/postprocessing/image-fun-filters/ink.js";
+export { ink } from "./passes/postprocessing/image-fun-filters/ink.js";
+export type { MagnifyProps, MagnifyUniforms } from "./passes/postprocessing/image-fun-filters/magnify.js";
+export { magnify } from "./passes/postprocessing/image-fun-filters/magnify.js";
+export type { BulgePinchProps, BulgePinchUniforms } from "./passes/postprocessing/image-warp-filters/bulgepinch.js";
+export { bulgePinch } from "./passes/postprocessing/image-warp-filters/bulgepinch.js";
+export type { SwirlProps, SwirlUniforms } from "./passes/postprocessing/image-warp-filters/swirl.js";
+export { swirl } from "./passes/postprocessing/image-warp-filters/swirl.js";
+export { fxaa } from "./passes/postprocessing/fxaa/fxaa.js";
+export type { WarpProps, WarpUniforms } from "./passes/postprocessing/image-warp-filters/warp.js";
+export { warp as _warp } from "./passes/postprocessing/image-warp-filters/warp.js";
 export { fp64, fp64arithmetic } from "./modules-webgl1/math/fp64/fp64.js";
@@ -82,0 +82,0 @@ export { geometry as geometry1 } from "./modules-webgl1/geometry/geometry.js";

dist/index.js

@@ -38,24 +38,24 @@ // luma.gl
 export { pbrMaterial } from "./modules/lighting/pbr-material/pbr-material.js";
-export { brightnessContrast } from "./modules/postprocessing/image-adjust-filters/brightnesscontrast.js";
-export { denoise } from "./modules/postprocessing/image-adjust-filters/denoise.js";
-export { hueSaturation } from "./modules/postprocessing/image-adjust-filters/huesaturation.js";
-export { noise } from "./modules/postprocessing/image-adjust-filters/noise.js";
-export { sepia } from "./modules/postprocessing/image-adjust-filters/sepia.js";
-export { vibrance } from "./modules/postprocessing/image-adjust-filters/vibrance.js";
-export { vignette } from "./modules/postprocessing/image-adjust-filters/vignette.js";
-export { tiltShift } from "./modules/postprocessing/image-blur-filters/tiltshift.js";
-export { triangleBlur } from "./modules/postprocessing/image-blur-filters/triangleblur.js";
-export { zoomBlur } from "./modules/postprocessing/image-blur-filters/zoomblur.js";
-export { colorHalftone } from "./modules/postprocessing/image-fun-filters/colorhalftone.js";
-export { dotScreen } from "./modules/postprocessing/image-fun-filters/dotscreen.js";
-export { edgeWork } from "./modules/postprocessing/image-fun-filters/edgework.js";
-export { hexagonalPixelate } from "./modules/postprocessing/image-fun-filters/hexagonalpixelate.js";
-export { ink } from "./modules/postprocessing/image-fun-filters/ink.js";
-export { magnify } from "./modules/postprocessing/image-fun-filters/magnify.js";
-export { bulgePinch } from "./modules/postprocessing/image-warp-filters/bulgepinch.js";
-export { swirl } from "./modules/postprocessing/image-warp-filters/swirl.js";
+export { brightnessContrast } from "./passes/postprocessing/image-adjust-filters/brightnesscontrast.js";
+export { denoise } from "./passes/postprocessing/image-adjust-filters/denoise.js";
+export { hueSaturation } from "./passes/postprocessing/image-adjust-filters/huesaturation.js";
+export { noise } from "./passes/postprocessing/image-adjust-filters/noise.js";
+export { sepia } from "./passes/postprocessing/image-adjust-filters/sepia.js";
+export { vibrance } from "./passes/postprocessing/image-adjust-filters/vibrance.js";
+export { vignette } from "./passes/postprocessing/image-adjust-filters/vignette.js";
+export { tiltShift } from "./passes/postprocessing/image-blur-filters/tiltshift.js";
+export { triangleBlur } from "./passes/postprocessing/image-blur-filters/triangleblur.js";
+export { zoomBlur } from "./passes/postprocessing/image-blur-filters/zoomblur.js";
+export { colorHalftone } from "./passes/postprocessing/image-fun-filters/colorhalftone.js";
+export { dotScreen } from "./passes/postprocessing/image-fun-filters/dotscreen.js";
+export { edgeWork } from "./passes/postprocessing/image-fun-filters/edgework.js";
+export { hexagonalPixelate } from "./passes/postprocessing/image-fun-filters/hexagonalpixelate.js";
+export { ink } from "./passes/postprocessing/image-fun-filters/ink.js";
+export { magnify } from "./passes/postprocessing/image-fun-filters/magnify.js";
+export { bulgePinch } from "./passes/postprocessing/image-warp-filters/bulgepinch.js";
+export { swirl } from "./passes/postprocessing/image-warp-filters/swirl.js";
 // Postprocessing modules
-// export type {FXAAProps, FXAAUniforms} from './modules/postprocessing/fxaa/fxaa';
-export { fxaa } from "./modules/postprocessing/fxaa/fxaa.js";
-export { warp as _warp } from "./modules/postprocessing/image-warp-filters/warp.js";
+// export type {FXAAProps, FXAAUniforms} from './passes/postprocessing/fxaa/fxaa';
+export { fxaa } from "./passes/postprocessing/fxaa/fxaa.js";
+export { warp as _warp } from "./passes/postprocessing/image-warp-filters/warp.js";
 // DEPRECATED - v8 legacy shader modules (non-uniform buffer)
@@ -62,0 +62,0 @@ // math libraries

dist/lib/shader-module/shader-pass.d.ts

 import type { ShaderModule, UniformValue } from "./shader-module.js";
 /**
  * A ShaderPass is a ShaderModule that can be run "standalone" (e.g. post processing effects)
- * It adds additional information on how to run the module in one or more passes.
+ * It adds additional information on how to run the module.
+ * A ShaderPass can require one or more sub passes.
  */
 export type ShaderPass<PropsT extends Record<string, unknown> = Record<string, unknown>, UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>> = ShaderModule<PropsT, UniformsT> & {
-    passes: ShaderPassData[];
+    /** A shader pass can run multiple sub passes */
+    passes?: ShaderSubPass<UniformsT>[];
 };
-/** Information on how to run a specific pass */
-type ShaderPassData = {
+/** Information on how to run a specific sub pass */
+export type ShaderSubPass<UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>> = {
+    /**
+     * Action indicates whether this pass:
+     * - filters the color in each pixel (provides a `<pass.name>_filterColor()` shader function)
+     * - performs its own sampling (provides a `<pass.name>_sampleColor()` shader function)
+     */
+    action?: 'filter' | 'sample';
     sampler?: boolean;
     filter?: boolean;
-    uniforms?: Record<string, UniformValue>;
+    uniforms?: UniformsT;
 };
-export {};
 //# sourceMappingURL=shader-pass.d.ts.map

package.json

 {
   "name": "@luma.gl/shadertools",
-  "version": "9.1.0-alpha.14",
+  "version": "9.1.0-alpha.15",
   "description": "Shader module system for luma.gl",
@@ -49,3 +49,3 @@ "type": "module",
   "peerDependencies": {
-    "@luma.gl/core": "9.1.0-alpha.10"
+    "@luma.gl/core": "9.1.0-alpha.14"
   },
@@ -57,3 +57,3 @@ "dependencies": {
   },
-  "gitHead": "e6e014efa323dbcd7d3774e982e442b1bf2c93be"
+  "gitHead": "41af576ca655cb749a5567cf903f9e9242793c77"
 }

src/index.ts

@@ -93,28 +93,28 @@ // luma.gl
   BrightnessContrastUniforms
-} from './modules/postprocessing/image-adjust-filters/brightnesscontrast';
-export {brightnessContrast} from './modules/postprocessing/image-adjust-filters/brightnesscontrast';
+} from './passes/postprocessing/image-adjust-filters/brightnesscontrast';
+export {brightnessContrast} from './passes/postprocessing/image-adjust-filters/brightnesscontrast';
 export type {
   DenoiseProps,
   DenoiseUniforms
-} from './modules/postprocessing/image-adjust-filters/denoise';
-export {denoise} from './modules/postprocessing/image-adjust-filters/denoise';
+} from './passes/postprocessing/image-adjust-filters/denoise';
+export {denoise} from './passes/postprocessing/image-adjust-filters/denoise';
 export type {
   HueSaturationProps,
   HueSaturationUniforms
-} from './modules/postprocessing/image-adjust-filters/huesaturation';
-export {hueSaturation} from './modules/postprocessing/image-adjust-filters/huesaturation';
-export type {NoiseProps, NoiseUniforms} from './modules/postprocessing/image-adjust-filters/noise';
-export {noise} from './modules/postprocessing/image-adjust-filters/noise';
-export type {SepiaProps, SepiaUniforms} from './modules/postprocessing/image-adjust-filters/sepia';
-export {sepia} from './modules/postprocessing/image-adjust-filters/sepia';
+} from './passes/postprocessing/image-adjust-filters/huesaturation';
+export {hueSaturation} from './passes/postprocessing/image-adjust-filters/huesaturation';
+export type {NoiseProps, NoiseUniforms} from './passes/postprocessing/image-adjust-filters/noise';
+export {noise} from './passes/postprocessing/image-adjust-filters/noise';
+export type {SepiaProps, SepiaUniforms} from './passes/postprocessing/image-adjust-filters/sepia';
+export {sepia} from './passes/postprocessing/image-adjust-filters/sepia';
 export type {
   VibranceProps,
   VibranceUniforms
-} from './modules/postprocessing/image-adjust-filters/vibrance';
-export {vibrance} from './modules/postprocessing/image-adjust-filters/vibrance';
+} from './passes/postprocessing/image-adjust-filters/vibrance';
+export {vibrance} from './passes/postprocessing/image-adjust-filters/vibrance';
 export type {
   VignetteProps,
   VignetteUniforms
-} from './modules/postprocessing/image-adjust-filters/vignette';
-export {vignette} from './modules/postprocessing/image-adjust-filters/vignette';
+} from './passes/postprocessing/image-adjust-filters/vignette';
+export {vignette} from './passes/postprocessing/image-adjust-filters/vignette';
 
@@ -125,14 +125,14 @@ // glfx  BLUR shader modules
   TiltShiftUniforms
-} from './modules/postprocessing/image-blur-filters/tiltshift';
-export {tiltShift} from './modules/postprocessing/image-blur-filters/tiltshift';
+} from './passes/postprocessing/image-blur-filters/tiltshift';
+export {tiltShift} from './passes/postprocessing/image-blur-filters/tiltshift';
 export type {
   TriangleBlurProps,
   TriangleBlurUniforms
-} from './modules/postprocessing/image-blur-filters/triangleblur';
-export {triangleBlur} from './modules/postprocessing/image-blur-filters/triangleblur';
+} from './passes/postprocessing/image-blur-filters/triangleblur';
+export {triangleBlur} from './passes/postprocessing/image-blur-filters/triangleblur';
 export type {
   ZoomBlurProps,
   ZoomBlurUniforms
-} from './modules/postprocessing/image-blur-filters/zoomblur';
-export {zoomBlur} from './modules/postprocessing/image-blur-filters/zoomblur';
+} from './passes/postprocessing/image-blur-filters/zoomblur';
+export {zoomBlur} from './passes/postprocessing/image-blur-filters/zoomblur';
 
@@ -143,26 +143,26 @@ // glfx FUN shader modules
   ColorHalftoneUniforms
-} from './modules/postprocessing/image-fun-filters/colorhalftone';
-export {colorHalftone} from './modules/postprocessing/image-fun-filters/colorhalftone';
+} from './passes/postprocessing/image-fun-filters/colorhalftone';
+export {colorHalftone} from './passes/postprocessing/image-fun-filters/colorhalftone';
 export type {
   DotScreenProps,
   DotScreenUniforms
-} from './modules/postprocessing/image-fun-filters/dotscreen';
-export {dotScreen} from './modules/postprocessing/image-fun-filters/dotscreen';
+} from './passes/postprocessing/image-fun-filters/dotscreen';
+export {dotScreen} from './passes/postprocessing/image-fun-filters/dotscreen';
 export type {
   EdgeWorkProps,
   EdgeWorkUniforms
-} from './modules/postprocessing/image-fun-filters/edgework';
-export {edgeWork} from './modules/postprocessing/image-fun-filters/edgework';
+} from './passes/postprocessing/image-fun-filters/edgework';
+export {edgeWork} from './passes/postprocessing/image-fun-filters/edgework';
 export type {
   HexagonalPixelateProps,
   HexagonalPixelateUniforms
-} from './modules/postprocessing/image-fun-filters/hexagonalpixelate';
-export {hexagonalPixelate} from './modules/postprocessing/image-fun-filters/hexagonalpixelate';
-export type {InkProps, InkUniforms} from './modules/postprocessing/image-fun-filters/ink';
-export {ink} from './modules/postprocessing/image-fun-filters/ink';
+} from './passes/postprocessing/image-fun-filters/hexagonalpixelate';
+export {hexagonalPixelate} from './passes/postprocessing/image-fun-filters/hexagonalpixelate';
+export type {InkProps, InkUniforms} from './passes/postprocessing/image-fun-filters/ink';
+export {ink} from './passes/postprocessing/image-fun-filters/ink';
 export type {
   MagnifyProps,
   MagnifyUniforms
-} from './modules/postprocessing/image-fun-filters/magnify';
-export {magnify} from './modules/postprocessing/image-fun-filters/magnify';
+} from './passes/postprocessing/image-fun-filters/magnify';
+export {magnify} from './passes/postprocessing/image-fun-filters/magnify';
 
@@ -173,14 +173,14 @@ // glfx  WARP shader modules
   BulgePinchUniforms
-} from './modules/postprocessing/image-warp-filters/bulgepinch';
-export {bulgePinch} from './modules/postprocessing/image-warp-filters/bulgepinch';
-export type {SwirlProps, SwirlUniforms} from './modules/postprocessing/image-warp-filters/swirl';
-export {swirl} from './modules/postprocessing/image-warp-filters/swirl';
+} from './passes/postprocessing/image-warp-filters/bulgepinch';
+export {bulgePinch} from './passes/postprocessing/image-warp-filters/bulgepinch';
+export type {SwirlProps, SwirlUniforms} from './passes/postprocessing/image-warp-filters/swirl';
+export {swirl} from './passes/postprocessing/image-warp-filters/swirl';
 
 // Postprocessing modules
-// export type {FXAAProps, FXAAUniforms} from './modules/postprocessing/fxaa/fxaa';
-export {fxaa} from './modules/postprocessing/fxaa/fxaa';
+// export type {FXAAProps, FXAAUniforms} from './passes/postprocessing/fxaa/fxaa';
+export {fxaa} from './passes/postprocessing/fxaa/fxaa';
 
 // experimental modules
-export type {WarpProps, WarpUniforms} from './modules/postprocessing/image-warp-filters/warp';
-export {warp as _warp} from './modules/postprocessing/image-warp-filters/warp';
+export type {WarpProps, WarpUniforms} from './passes/postprocessing/image-warp-filters/warp';
+export {warp as _warp} from './passes/postprocessing/image-warp-filters/warp';
 
@@ -187,0 +187,0 @@ // DEPRECATED - v8 legacy shader modules (non-uniform buffer)

src/lib/shader-module/shader-pass.ts

@@ -9,3 +9,4 @@ // luma.gl
  * A ShaderPass is a ShaderModule that can be run "standalone" (e.g. post processing effects)
- * It adds additional information on how to run the module in one or more passes.
+ * It adds additional information on how to run the module.
+ * A ShaderPass can require one or more sub passes.
  */
@@ -16,10 +17,21 @@ export type ShaderPass<
 > = ShaderModule<PropsT, UniformsT> & {
-  passes: ShaderPassData[];
+  /** A shader pass can run multiple sub passes */
+  passes?: ShaderSubPass<UniformsT>[];
+  // TODO better name
+  // subPasses?: ShaderSubPass[];
 };
 
-/** Information on how to run a specific pass */
-type ShaderPassData = {
+/** Information on how to run a specific sub pass */
+export type ShaderSubPass<
+  UniformsT extends Record<string, UniformValue> = Record<string, UniformValue>
+> = {
+  /**
+   * Action indicates whether this pass:
+   * - filters the color in each pixel (provides a `<pass.name>_filterColor()` shader function)
+   * - performs its own sampling (provides a `<pass.name>_sampleColor()` shader function)
+   */
+  action?: 'filter' | 'sample';
   sampler?: boolean;
   filter?: boolean;
-  uniforms?: Record<string, UniformValue>;
+  uniforms?: UniformsT;
 };

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1914115

increased by0.31%

Lines of code

37357

increased by0.3%

No dependency changes