@luma.gl/shadertools - npm Package Compare versions

Comparing version 8.0.0-beta.1 to 8.0.0-beta.2

dist/es5/lib/shader-module.js

@@ -75,3 +75,3 @@ "use strict";
 
-      return "#define MODULE_".concat(this.name.toUpperCase(), "\n").concat(moduleSource, "// END MODULE_").concat(this.name, "\n\n");
+      return "#define MODULE_".concat(this.name.toUpperCase().replace(/[^0-9a-z]/gi, '_'), "\n").concat(moduleSource, "// END MODULE_").concat(this.name, "\n\n");
     }
@@ -78,0 +78,0 @@ }, {

dist/es5/modules/fp64/fp64.js

@@ -26,3 +26,3 @@ "use strict";
 });
-exports.fp64fs = exports.fp64arithmetic = exports["default"] = void 0;
+exports["default"] = exports.fp64arithmetic = void 0;
 
@@ -35,3 +35,2 @@ var _fp64Utils = require("./fp64-utils");
 
-var fp64shader = "".concat(_fp64Arithmetic["default"], "\n").concat(_fp64Functions["default"]);
 var CONST_UNIFORMS = {
@@ -42,27 +41,24 @@ ONE: 1.0
 function getUniforms() {
-  return Object.assign({}, CONST_UNIFORMS);
+  return CONST_UNIFORMS;
 }
 
+var fp64arithmetic = {
+  name: 'fp64-arithmetic',
+  vs: _fp64Arithmetic["default"],
+  fs: null,
+  getUniforms: getUniforms,
+  fp64ify: _fp64Utils.fp64ify,
+  fp64LowPart: _fp64Utils.fp64LowPart
+};
+exports.fp64arithmetic = fp64arithmetic;
 var _default = {
   name: 'fp64',
-  vs: fp64shader,
+  vs: _fp64Functions["default"],
   fs: null,
+  dependencies: [fp64arithmetic],
   fp64ify: _fp64Utils.fp64ify,
   fp64LowPart: _fp64Utils.fp64LowPart,
-  fp64ifyMatrix4: _fp64Utils.fp64ifyMatrix4,
-  getUniforms: getUniforms
+  fp64ifyMatrix4: _fp64Utils.fp64ifyMatrix4
 };
 exports["default"] = _default;
-var fp64arithmetic = {
-  name: 'fp64-arithmetic',
-  vs: "".concat(_fp64Arithmetic["default"]),
-  fs: null
-};
-exports.fp64arithmetic = fp64arithmetic;
-var fp64fs = {
-  name: 'fp64-fs',
-  vs: null,
-  fs: fp64shader
-};
-exports.fp64fs = fp64fs;
 //# sourceMappingURL=fp64.js.map

dist/es5/modules/index.js

 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -20,2 +22,8 @@
 });
+Object.defineProperty(exports, "fp64arithmetic", {
+  enumerable: true,
+  get: function get() {
+    return _fp2.fp64arithmetic;
+  }
+});
 Object.defineProperty(exports, "project", {
@@ -180,3 +188,3 @@ enumerable: true,
 
-var _fp2 = _interopRequireDefault(require("./fp64/fp64"));
+var _fp2 = _interopRequireWildcard(require("./fp64/fp64"));
 
@@ -183,0 +191,0 @@ var _project = _interopRequireDefault(require("./project/project"));

dist/es6/lib/shader-module.js

@@ -51,3 +51,3 @@ import transpileShader from './transpile-shader';
 
-    return "#define MODULE_".concat(this.name.toUpperCase(), "\n").concat(moduleSource, "// END MODULE_").concat(this.name, "\n\n");
+    return "#define MODULE_".concat(this.name.toUpperCase().replace(/[^0-9a-z]/gi, '_'), "\n").concat(moduleSource, "// END MODULE_").concat(this.name, "\n\n");
   }
@@ -54,0 +54,0 @@

dist/es6/modules/fp64/fp64.js

 import { fp64ify, fp64LowPart, fp64ifyMatrix4 } from './fp64-utils';
 import fp64arithmeticShader from './fp64-arithmetic.glsl';
 import fp64functionShader from './fp64-functions.glsl';
-const fp64shader = "".concat(fp64arithmeticShader, "\n").concat(fp64functionShader);
 const CONST_UNIFORMS = {
@@ -11,24 +10,22 @@ ONE: 1.0
 function getUniforms() {
-  return Object.assign({}, CONST_UNIFORMS);
+  return CONST_UNIFORMS;
 }
 
+export const fp64arithmetic = {
+  name: 'fp64-arithmetic',
+  vs: fp64arithmeticShader,
+  fs: null,
+  getUniforms,
+  fp64ify,
+  fp64LowPart
+};
 export default {
   name: 'fp64',
-  vs: fp64shader,
+  vs: fp64functionShader,
   fs: null,
+  dependencies: [fp64arithmetic],
   fp64ify,
   fp64LowPart,
-  fp64ifyMatrix4,
-  getUniforms
+  fp64ifyMatrix4
 };
-export const fp64arithmetic = {
-  name: 'fp64-arithmetic',
-  vs: "".concat(fp64arithmeticShader),
-  fs: null
-};
-export const fp64fs = {
-  name: 'fp64-fs',
-  vs: null,
-  fs: fp64shader
-};
 //# sourceMappingURL=fp64.js.map

dist/es6/modules/index.js

 export { default as fp32 } from './fp32/fp32';
-export { default as fp64 } from './fp64/fp64';
+export { default as fp64, fp64arithmetic } from './fp64/fp64';
 export { default as project } from './project/project';
@@ -4,0 +4,0 @@ export { default as lights } from './lights/lights';

dist/esm/lib/shader-module.js

@@ -62,3 +62,3 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 
-      return "#define MODULE_".concat(this.name.toUpperCase(), "\n").concat(moduleSource, "// END MODULE_").concat(this.name, "\n\n");
+      return "#define MODULE_".concat(this.name.toUpperCase().replace(/[^0-9a-z]/gi, '_'), "\n").concat(moduleSource, "// END MODULE_").concat(this.name, "\n\n");
     }
@@ -65,0 +65,0 @@ }, {

dist/esm/modules/fp64/fp64.js

 import { fp64ify, fp64LowPart, fp64ifyMatrix4 } from './fp64-utils';
 import fp64arithmeticShader from './fp64-arithmetic.glsl';
 import fp64functionShader from './fp64-functions.glsl';
-var fp64shader = "".concat(fp64arithmeticShader, "\n").concat(fp64functionShader);
 var CONST_UNIFORMS = {
@@ -11,24 +10,22 @@ ONE: 1.0
 function getUniforms() {
-  return Object.assign({}, CONST_UNIFORMS);
+  return CONST_UNIFORMS;
 }
 
+export var fp64arithmetic = {
+  name: 'fp64-arithmetic',
+  vs: fp64arithmeticShader,
+  fs: null,
+  getUniforms: getUniforms,
+  fp64ify: fp64ify,
+  fp64LowPart: fp64LowPart
+};
 export default {
   name: 'fp64',
-  vs: fp64shader,
+  vs: fp64functionShader,
   fs: null,
+  dependencies: [fp64arithmetic],
   fp64ify: fp64ify,
   fp64LowPart: fp64LowPart,
-  fp64ifyMatrix4: fp64ifyMatrix4,
-  getUniforms: getUniforms
+  fp64ifyMatrix4: fp64ifyMatrix4
 };
-export var fp64arithmetic = {
-  name: 'fp64-arithmetic',
-  vs: "".concat(fp64arithmeticShader),
-  fs: null
-};
-export var fp64fs = {
-  name: 'fp64-fs',
-  vs: null,
-  fs: fp64shader
-};
 //# sourceMappingURL=fp64.js.map

dist/esm/modules/index.js

 export { default as fp32 } from './fp32/fp32';
-export { default as fp64 } from './fp64/fp64';
+export { default as fp64, fp64arithmetic } from './fp64/fp64';
 export { default as project } from './project/project';
@@ -4,0 +4,0 @@ export { default as lights } from './lights/lights';

package.json

 {
   "name": "@luma.gl/shadertools",
-  "version": "8.0.0-beta.1",
+  "version": "8.0.0-beta.2",
   "description": "Shader module system for luma.gl",
@@ -42,3 +42,3 @@ "license": "MIT",
   },
-  "gitHead": "7387a28ccac98072ef4df83606c932e53c31dfa8"
+  "gitHead": "3f15fc4b59555ed2cc2b237824a1ff50eccd4af3"
 }

src/lib/shader-module.js

@@ -53,3 +53,3 @@ import transpileShader from './transpile-shader';
     return `\
-#define MODULE_${this.name.toUpperCase()}
+#define MODULE_${this.name.toUpperCase().replace(/[^0-9a-z]/gi, '_')}
 ${moduleSource}\
@@ -56,0 +56,0 @@ // END MODULE_${this.name}

src/modules/fp64/fp64.js

@@ -26,3 +26,2 @@ // Copyright (c) 2015 - 2017 Uber Technologies, Inc.
 
-const fp64shader = `${fp64arithmeticShader}\n${fp64functionShader}`;
 const CONST_UNIFORMS = {
@@ -35,27 +34,24 @@ // Used in LUMA_FP64_CODE_ELIMINATION_WORKAROUND
 function getUniforms() {
-  return Object.assign({}, CONST_UNIFORMS);
+  return CONST_UNIFORMS;
 }
 
+// Arithmetic only
+export const fp64arithmetic = {
+  name: 'fp64-arithmetic',
+  vs: fp64arithmeticShader,
+  fs: null,
+  getUniforms,
+  fp64ify,
+  fp64LowPart
+};
+
+// Full fp64 shader
 export default {
   name: 'fp64',
-  vs: fp64shader,
+  vs: fp64functionShader,
   fs: null,
+  dependencies: [fp64arithmetic],
   fp64ify,
   fp64LowPart,
-  fp64ifyMatrix4,
-  getUniforms
+  fp64ifyMatrix4
 };
-
-// Arithmetic only
-export const fp64arithmetic = {
-  name: 'fp64-arithmetic',
-  vs: `${fp64arithmeticShader}`,
-  fs: null
-};
-
-// Fragment shader fp64
-export const fp64fs = {
-  name: 'fp64-fs',
-  vs: null,
-  fs: fp64shader
-};

src/modules/index.js

 export {default as fp32} from './fp32/fp32';
-export {default as fp64} from './fp64/fp64';
+export {default as fp64, fp64arithmetic} from './fp64/fp64';
 export {default as project} from './project/project';
@@ -4,0 +4,0 @@ export {default as lights} from './lights/lights';

New alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Fixed alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1931395

0.02%

Worsened metrics

Lines of code

25778

-0.03%

No dependency changes