@luma.gl/engine - npm Package Compare versions

Comparing version 9.0.14 to 9.0.15

dist/model/model.js

@@ -381,2 +381,3 @@ // luma.gl
         this._uniformStore.setUniforms(this.shaderInputs.getUniformValues());
+        this.setBindings(this.shaderInputs.getBindings());
         // TODO - this is already tracked through buffer/texture update times?
@@ -383,0 +384,0 @@ this.setNeedsRedraw('shaderInputs');

dist/shader-inputs.js

 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { log } from '@luma.gl/core';
+import { log, splitUniformsAndBindings } from '@luma.gl/core';
 // import type {ShaderUniformType, UniformValue, UniformFormat, UniformInfoDevice, Texture, Sampler} from '@luma.gl/core';
@@ -66,10 +66,9 @@ import { _resolveModules } from '@luma.gl/shadertools';
             const oldUniforms = this.moduleUniforms[moduleName];
-            const uniforms = module.getUniforms?.(moduleProps, this.moduleUniforms[moduleName]) || moduleProps;
-            // console.error(uniforms)
+            const oldBindings = this.moduleBindings[moduleName];
+            const uniformsAndBindings = module.getUniforms?.(moduleProps, this.moduleUniforms[moduleName]) || moduleProps;
+            const { uniforms, bindings } = splitUniformsAndBindings(uniformsAndBindings);
             this.moduleUniforms[moduleName] = { ...oldUniforms, ...uniforms };
+            this.moduleBindings[moduleName] = { ...oldBindings, ...bindings };
             // this.moduleUniformsChanged ||= moduleName;
             // console.log(`setProps(${String(moduleName)}`, moduleName, this.moduleUniforms[moduleName])
-            // TODO - Get Module bindings
-            // const bindings = module.getBindings?.(moduleProps);
-            // this.moduleUniforms[moduleName] = bindings;
         }
@@ -76,0 +75,0 @@ }

package.json

 {
   "name": "@luma.gl/engine",
-  "version": "9.0.14",
+  "version": "9.0.15",
   "description": "3D Engine Components for luma.gl",
@@ -46,3 +46,3 @@ "type": "module",
   "dependencies": {
-    "@luma.gl/shadertools": "9.0.14",
+    "@luma.gl/shadertools": "9.0.15",
     "@math.gl/core": "^4.0.0",
@@ -52,3 +52,3 @@ "@probe.gl/log": "^4.0.2",
   },
-  "gitHead": "0b466762e8255ed11b00c6bc518049d3b54c4009"
+  "gitHead": "48b6e702cf6ad35748cfa88ffd249c17861ff2af"
 }

src/model/model.ts

@@ -508,2 +508,3 @@ // luma.gl
     this._uniformStore.setUniforms(this.shaderInputs.getUniformValues());
+    this.setBindings(this.shaderInputs.getBindings());
     // TODO - this is already tracked through buffer/texture update times?
@@ -510,0 +511,0 @@ this.setNeedsRedraw('shaderInputs');

src/shader-inputs.ts

@@ -6,3 +6,3 @@ // luma.gl
 import type {UniformValue, Texture, Sampler} from '@luma.gl/core';
-import {log} from '@luma.gl/core';
+import {log, splitUniformsAndBindings} from '@luma.gl/core';
 // import type {ShaderUniformType, UniformValue, UniformFormat, UniformInfoDevice, Texture, Sampler} from '@luma.gl/core';
@@ -108,13 +108,12 @@ import {_resolveModules, ShaderModuleInstance} from '@luma.gl/shadertools';
       const oldUniforms = this.moduleUniforms[moduleName];
-      const uniforms =
+      const oldBindings = this.moduleBindings[moduleName];
+      const uniformsAndBindings =
         module.getUniforms?.(moduleProps, this.moduleUniforms[moduleName]) || (moduleProps as any);
-      // console.error(uniforms)
+
+      const {uniforms, bindings} = splitUniformsAndBindings(uniformsAndBindings);
       this.moduleUniforms[moduleName] = {...oldUniforms, ...uniforms};
+      this.moduleBindings[moduleName] = {...oldBindings, ...bindings};
       // this.moduleUniformsChanged ||= moduleName;
 
       // console.log(`setProps(${String(moduleName)}`, moduleName, this.moduleUniforms[moduleName])
-
-      // TODO - Get Module bindings
-      // const bindings = module.getBindings?.(moduleProps);
-      // this.moduleUniforms[moduleName] = bindings;
     }
@@ -121,0 +120,0 @@ }

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

1077142

increased by0.62%

Lines of code

22100

increased by0.71%

Dependency changes

• + [e-mail]/shadertools@9.0.15(transitive)

• - [e-mail]/shadertools@9.0.14(transitive)

• [e-mail]/shadertools@9.0.15