@luma.gl/shadertools - npm Package Compare versions

Comparing version 9.0.0-alpha.44 to 9.0.0-alpha.45

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

@@ -17,3 +17,3 @@ import { NumberArray } from '@math.gl/types';
     /** Used for type inference, not currently used for values */
-    uniforms?: Required<UniformsT>;
+    uniforms?: UniformsT;
     /** Uniform shader types */
@@ -20,0 +20,0 @@ uniformTypes?: Record<keyof UniformsT, UniformFormat>;

dist/modules/engine/picking/picking.d.ts

@@ -20,2 +20,8 @@ import { NumberArray } from '../../../types';
     isHighlightActive?: boolean;
+    /** Set to a picking color to visually highlight that item */
+    highlightedObjectColor?: NumberArray;
+    /** Color of visual highlight of "selected" item */
+    highlightColor?: NumberArray;
+};
+export type PickingSettings = Omit<PickingUniforms, 'isHighlightActive' | 'highlightedObjectColor'> & {
     /**
@@ -27,4 +33,2 @@ * Set to a picking color to visually highlight that item.
     highlightedObjectColor?: NumberArray | null;
-    /** Color of visual highlight of "selected" item */
-    highlightColor?: NumberArray;
 };
@@ -38,3 +42,3 @@ /**
  */
-export declare const picking: ShaderModule<PickingUniforms>;
+export declare const picking: ShaderModule<PickingUniforms, PickingSettings>;
 //# sourceMappingURL=picking.d.ts.map

dist/modules/engine/picking/picking.js

@@ -162,12 +162,10 @@ import { glsl } from "../../../lib/glsl-utils/highlight.js";
   };
-  if (opts.highlightedObjectColor !== undefined) {
-    if (!opts.highlightedObjectColor) {
-      uniforms.isHighlightActive = false;
-    } else {
-      uniforms.isHighlightActive = true;
-      const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3);
-      uniforms.highlightedObjectColor = highlightedObjectColor;
-    }
+  if (opts.highlightedObjectColor === undefined) {
+    delete uniforms.highlightedObjectColor;
+  } else if (opts.highlightedObjectColor === null) {
+    uniforms.isHighlightActive = false;
   } else {
-    delete uniforms.highlightedObjectColor;
+    uniforms.isHighlightActive = true;
+    const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3);
+    uniforms.highlightedObjectColor = highlightedObjectColor;
   }
@@ -174,0 +172,0 @@ if (opts.highlightColor) {

package.json

 {
   "name": "@luma.gl/shadertools",
-  "version": "9.0.0-alpha.44",
+  "version": "9.0.0-alpha.45",
   "description": "Shader module system for luma.gl",
@@ -49,7 +49,7 @@ "type": "module",
     "@babel/runtime": "^7.0.0",
-    "@luma.gl/core": "9.0.0-alpha.44",
+    "@luma.gl/core": "9.0.0-alpha.45",
     "@math.gl/core": "^4.0.0",
     "@math.gl/types": "^4.0.0"
   },
-  "gitHead": "195bed39c8587a68686cf28c0ae0e8dbd9c963f5"
+  "gitHead": "38b58964a1287a84ac021fa02d4432a5d3f960a0"
 }

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

@@ -24,3 +24,3 @@ // luma.gl, MIT license
   /** Used for type inference, not currently used for values */
-  uniforms?: Required<UniformsT>;
+  uniforms?: UniformsT;
 
@@ -27,0 +27,0 @@ /** Uniform shader types */

src/modules/engine/picking/picking.ts

@@ -28,2 +28,9 @@ // luma.gl, MIT license
   isHighlightActive?: boolean;
+  /** Set to a picking color to visually highlight that item */
+  highlightedObjectColor?: NumberArray;
+  /** Color of visual highlight of "selected" item */
+  highlightColor?: NumberArray;
+};
+
+export type PickingSettings = Omit<PickingUniforms, 'isHighlightActive' | 'highlightedObjectColor'> & {
   /**
@@ -35,4 +42,2 @@ * Set to a picking color to visually highlight that item.
   highlightedObjectColor?: NumberArray | null;
-  /** Color of visual highlight of "selected" item */
-  highlightColor?: NumberArray;
 };
@@ -180,3 +185,3 @@
  */
-export const picking: ShaderModule<PickingUniforms> = {
+export const picking: ShaderModule<PickingUniforms, PickingSettings> = {
   name: 'picking',
@@ -204,15 +209,13 @@ vs,
 
-function getUniforms(opts: Partial<PickingUniforms> = {}, prevUniforms?: PickingUniforms): PickingUniforms {
+function getUniforms(opts: Partial<PickingSettings> = {}, prevUniforms?: PickingUniforms): PickingUniforms {
   const uniforms = {...picking.defaultUniforms};
 
-  if (opts.highlightedObjectColor !== undefined) {
-    if (!opts.highlightedObjectColor) {
-      uniforms.isHighlightActive = false;
-    } else {
-      uniforms.isHighlightActive = true;
-      const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3);
-      uniforms.highlightedObjectColor = highlightedObjectColor;
-    }
+  if (opts.highlightedObjectColor === undefined) {
+    delete uniforms.highlightedObjectColor;
+  } else if (opts.highlightedObjectColor === null) {
+    uniforms.isHighlightActive = false;
   } else {
-    delete uniforms.highlightedObjectColor;
+    uniforms.isHighlightActive = true;
+    const highlightedObjectColor = opts.highlightedObjectColor.slice(0, 3);
+    uniforms.highlightedObjectColor = highlightedObjectColor;
   }
@@ -219,0 +222,0 @@

No alert changes

Worsened metrics

Total package byte prevSize

2422245

decreased by-0.64%

Number of package files

413

decreased by-0.24%

Dependency changes

• + [e-mail]/core@9.0.0-alpha.45(transitive)

• - [e-mail]/core@9.0.0-alpha.44(transitive)

• [e-mail]/core@9.0.0-alpha.45