Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More →
troika-three-utils
Advanced tools
troika-three-utils - npm Package Compare versions
Comparing version 0.49.0 to 0.50.0
@@ -6,2 +6,19 @@ # Change Log | ||
| # [0.50.0](https://github.com/protectwise/troika/compare/v0.49.1...v0.50.0) (2024-10-11) | ||
| ### Bug Fixes | ||
| * **troika-three-utils:** add `colorspace_fragment` (introduced in Three r154) to the list of fragment shaders to process in `upgradeShaders()` ([#325](https://github.com/protectwise/troika/issues/325)) ([9169ebf](https://github.com/protectwise/troika/commit/9169ebf0773f9ad6cd10ab74456b68d1eebbe243)) | ||
| * change JSDoc for createDerivedMaterial params to be optional ([#307](https://github.com/protectwise/troika/issues/307)) ([6969e85](https://github.com/protectwise/troika/commit/6969e855608803d20c6634a415d2a78218222d79)) | ||
| ### Features | ||
| * **troika-three-utils:** add isDerivedFrom method to derived materials ([a4a2fcd](https://github.com/protectwise/troika/commit/a4a2fcd18ddf03cf6f9b6b72df2e2fbdfa700c51)) | ||
| # [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08) | ||
@@ -8,0 +25,0 @@ |
@@ -88,37 +88,38 @@ import { ShaderChunk, UniformsUtils, MeshDepthMaterial, RGBADepthPacking, MeshDistanceMaterial, ShaderLib, Matrix4, Vector3, Mesh, CylinderGeometry, Vector2, MeshStandardMaterial, DoubleSide } from 'three'; | ||
| * @param {Object} options - How the base material should be modified. | ||
| * @param {Object} options.defines - Custom `defines` for the material | ||
| * @param {Object} options.extensions - Custom `extensions` for the material, e.g. `{derivatives: true}` | ||
| * @param {Object} options.uniforms - Custom `uniforms` for use in the modified shader. These can | ||
| * @param {Object=} options.defines - Custom `defines` for the material | ||
| * @param {Object=} options.extensions - Custom `extensions` for the material, e.g. `{derivatives: true}` | ||
| * @param {Object=} options.uniforms - Custom `uniforms` for use in the modified shader. These can | ||
| * be accessed and manipulated via the resulting material's `uniforms` property, just like | ||
| * in a ShaderMaterial. You do not need to repeat the base material's own uniforms here. | ||
| * @param {String} options.timeUniform - If specified, a uniform of this name will be injected into | ||
| * @param {String=} options.timeUniform - If specified, a uniform of this name will be injected into | ||
| * both shaders, and it will automatically be updated on each render frame with a number of | ||
| * elapsed milliseconds. The "zero" epoch time is not significant so don't rely on this as a | ||
| * true calendar time. | ||
| * @param {String} options.vertexDefs - Custom GLSL code to inject into the vertex shader's top-level | ||
| * @param {String=} options.vertexDefs - Custom GLSL code to inject into the vertex shader's top-level | ||
| * definitions, above the `void main()` function. | ||
| * @param {String} options.vertexMainIntro - Custom GLSL code to inject at the top of the vertex | ||
| * @param {String=} options.vertexMainIntro - Custom GLSL code to inject at the top of the vertex | ||
| * shader's `void main` function. | ||
| * @param {String} options.vertexMainOutro - Custom GLSL code to inject at the end of the vertex | ||
| * @param {String=} options.vertexMainOutro - Custom GLSL code to inject at the end of the vertex | ||
| * shader's `void main` function. | ||
| * @param {String} options.vertexTransform - Custom GLSL code to manipulate the `position`, `normal`, | ||
| * @param {String=} options.vertexTransform - Custom GLSL code to manipulate the `position`, `normal`, | ||
| * and/or `uv` vertex attributes. This code will be wrapped within a standalone function with | ||
| * those attributes exposed by their normal names as read/write values. | ||
| * @param {String} options.fragmentDefs - Custom GLSL code to inject into the fragment shader's top-level | ||
| * @param {String=} options.fragmentDefs - Custom GLSL code to inject into the fragment shader's top-level | ||
| * definitions, above the `void main()` function. | ||
| * @param {String} options.fragmentMainIntro - Custom GLSL code to inject at the top of the fragment | ||
| * @param {String=} options.fragmentMainIntro - Custom GLSL code to inject at the top of the fragment | ||
| * shader's `void main` function. | ||
| * @param {String} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * @param {String=} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * shader's `void main` function. You can manipulate `gl_FragColor` here but keep in mind it goes | ||
| * after any of ThreeJS's color postprocessing shader chunks (tonemapping, fog, etc.), so if you | ||
| * want those to apply to your changes use `fragmentColorTransform` instead. | ||
| * @param {String} options.fragmentColorTransform - Custom GLSL code to manipulate the `gl_FragColor` | ||
| * @param {String=} options.fragmentColorTransform - Custom GLSL code to manipulate the `gl_FragColor` | ||
| * output value. Will be injected near the end of the `void main` function, but before any | ||
| * of ThreeJS's color postprocessing shader chunks (tonemapping, fog, etc.), and before the | ||
| * `fragmentMainOutro`. | ||
| * @param {function<{vertexShader,fragmentShader}>:{vertexShader,fragmentShader}} options.customRewriter - A function | ||
| * @param {function({fragmentShader: string, vertexShader:string}): | ||
| * {fragmentShader: string, vertexShader:string}} options.customRewriter - A function | ||
| * for performing custom rewrites of the full shader code. Useful if you need to do something | ||
| * special that's not covered by the other builtin options. This function will be executed before | ||
| * any other transforms are applied. | ||
| * @param {boolean} options.chained - Set to `true` to prototype-chain the derived material to the base | ||
| * @param {boolean=} options.chained - Set to `true` to prototype-chain the derived material to the base | ||
| * material, rather than the default behavior of copying it. This allows the derived material to | ||
@@ -222,2 +223,11 @@ * automatically pick up changes made to the base material and its properties. This can be useful | ||
| isDerivedFrom: { | ||
| writable: true, | ||
| configurable: true, | ||
| value: function (testMaterial) { | ||
| const base = this.baseMaterial; | ||
| return testMaterial === base || (base.isDerivedMaterial && base.isDerivedFrom(testMaterial)) || false | ||
| } | ||
| }, | ||
| customProgramCacheKey: { | ||
@@ -357,3 +367,3 @@ writable: true, | ||
| fragmentShader = fragmentShader.replace( | ||
| /^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| /^[ \t]*#include <((?:tonemapping|encodings|colorspace|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| '\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n' | ||
@@ -360,0 +370,0 @@ ); |
@@ -92,37 +92,38 @@ (function (global, factory) { | ||
| * @param {Object} options - How the base material should be modified. | ||
| * @param {Object} options.defines - Custom `defines` for the material | ||
| * @param {Object} options.extensions - Custom `extensions` for the material, e.g. `{derivatives: true}` | ||
| * @param {Object} options.uniforms - Custom `uniforms` for use in the modified shader. These can | ||
| * @param {Object=} options.defines - Custom `defines` for the material | ||
| * @param {Object=} options.extensions - Custom `extensions` for the material, e.g. `{derivatives: true}` | ||
| * @param {Object=} options.uniforms - Custom `uniforms` for use in the modified shader. These can | ||
| * be accessed and manipulated via the resulting material's `uniforms` property, just like | ||
| * in a ShaderMaterial. You do not need to repeat the base material's own uniforms here. | ||
| * @param {String} options.timeUniform - If specified, a uniform of this name will be injected into | ||
| * @param {String=} options.timeUniform - If specified, a uniform of this name will be injected into | ||
| * both shaders, and it will automatically be updated on each render frame with a number of | ||
| * elapsed milliseconds. The "zero" epoch time is not significant so don't rely on this as a | ||
| * true calendar time. | ||
| * @param {String} options.vertexDefs - Custom GLSL code to inject into the vertex shader's top-level | ||
| * @param {String=} options.vertexDefs - Custom GLSL code to inject into the vertex shader's top-level | ||
| * definitions, above the `void main()` function. | ||
| * @param {String} options.vertexMainIntro - Custom GLSL code to inject at the top of the vertex | ||
| * @param {String=} options.vertexMainIntro - Custom GLSL code to inject at the top of the vertex | ||
| * shader's `void main` function. | ||
| * @param {String} options.vertexMainOutro - Custom GLSL code to inject at the end of the vertex | ||
| * @param {String=} options.vertexMainOutro - Custom GLSL code to inject at the end of the vertex | ||
| * shader's `void main` function. | ||
| * @param {String} options.vertexTransform - Custom GLSL code to manipulate the `position`, `normal`, | ||
| * @param {String=} options.vertexTransform - Custom GLSL code to manipulate the `position`, `normal`, | ||
| * and/or `uv` vertex attributes. This code will be wrapped within a standalone function with | ||
| * those attributes exposed by their normal names as read/write values. | ||
| * @param {String} options.fragmentDefs - Custom GLSL code to inject into the fragment shader's top-level | ||
| * @param {String=} options.fragmentDefs - Custom GLSL code to inject into the fragment shader's top-level | ||
| * definitions, above the `void main()` function. | ||
| * @param {String} options.fragmentMainIntro - Custom GLSL code to inject at the top of the fragment | ||
| * @param {String=} options.fragmentMainIntro - Custom GLSL code to inject at the top of the fragment | ||
| * shader's `void main` function. | ||
| * @param {String} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * @param {String=} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * shader's `void main` function. You can manipulate `gl_FragColor` here but keep in mind it goes | ||
| * after any of ThreeJS's color postprocessing shader chunks (tonemapping, fog, etc.), so if you | ||
| * want those to apply to your changes use `fragmentColorTransform` instead. | ||
| * @param {String} options.fragmentColorTransform - Custom GLSL code to manipulate the `gl_FragColor` | ||
| * @param {String=} options.fragmentColorTransform - Custom GLSL code to manipulate the `gl_FragColor` | ||
| * output value. Will be injected near the end of the `void main` function, but before any | ||
| * of ThreeJS's color postprocessing shader chunks (tonemapping, fog, etc.), and before the | ||
| * `fragmentMainOutro`. | ||
| * @param {function<{vertexShader,fragmentShader}>:{vertexShader,fragmentShader}} options.customRewriter - A function | ||
| * @param {function({fragmentShader: string, vertexShader:string}): | ||
| * {fragmentShader: string, vertexShader:string}} options.customRewriter - A function | ||
| * for performing custom rewrites of the full shader code. Useful if you need to do something | ||
| * special that's not covered by the other builtin options. This function will be executed before | ||
| * any other transforms are applied. | ||
| * @param {boolean} options.chained - Set to `true` to prototype-chain the derived material to the base | ||
| * @param {boolean=} options.chained - Set to `true` to prototype-chain the derived material to the base | ||
| * material, rather than the default behavior of copying it. This allows the derived material to | ||
@@ -226,2 +227,11 @@ * automatically pick up changes made to the base material and its properties. This can be useful | ||
| isDerivedFrom: { | ||
| writable: true, | ||
| configurable: true, | ||
| value: function (testMaterial) { | ||
| const base = this.baseMaterial; | ||
| return testMaterial === base || (base.isDerivedMaterial && base.isDerivedFrom(testMaterial)) || false | ||
| } | ||
| }, | ||
| customProgramCacheKey: { | ||
@@ -361,3 +371,3 @@ writable: true, | ||
| fragmentShader = fragmentShader.replace( | ||
| /^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| /^[ \t]*#include <((?:tonemapping|encodings|colorspace|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| '\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n' | ||
@@ -364,0 +374,0 @@ ); |
@@ -1,9 +0,9 @@ | ||
| 'use strict';(function(h,c){"object"===typeof exports&&"undefined"!==typeof module?c(exports,require("three")):"function"===typeof define&&define.amd?define(["exports","three"],c):(h="undefined"!==typeof globalThis?globalThis:h||self,c(h.troika_three_utils={},h.THREE))})(this,function(h,c){function q(a){return a.replace(/^[ \t]*#include +<([\w\d./]+)>/gm,function(a,k){return(k=c.ShaderChunk[k])?q(k):a})}function m(a,b){let k=D(b),e=n.get(a);e||n.set(a,e=Object.create(null));if(e[k])return new e[k]; | ||
| let g=`_onBeforeCompile${k}`,h=function(d,e){a.onBeforeCompile.call(this,d,e);e=this.customProgramCacheKey()+"|"+d.vertexShader+"|"+d.fragmentShader;var c=v[e];c||(c=E(this,d,b,k),c=v[e]=c);d.vertexShader=c.vertexShader;d.fragmentShader=c.fragmentShader;l(d.uniforms,this.uniforms);b.timeUniform&&(d.uniforms[b.timeUniform]={get value(){return Date.now()-F}});if(this[g])this[g](d)},t=function(){return w(b.chained?a:a.clone())},w=function(d){const c=Object.create(d,G);Object.defineProperty(c,"baseMaterial", | ||
| {value:a});Object.defineProperty(c,"id",{value:H++});{var e=4294967295*Math.random()|0;let a=4294967295*Math.random()|0,b=4294967295*Math.random()|0,d=4294967295*Math.random()|0;e=(f[e&255]+f[e>>8&255]+f[e>>16&255]+f[e>>24&255]+"-"+f[a&255]+f[a>>8&255]+"-"+f[a>>16&15|64]+f[a>>24&255]+"-"+f[b&63|128]+f[b>>8&255]+"-"+f[b>>16&255]+f[b>>24&255]+f[d&255]+f[d>>8&255]+f[d>>16&255]+f[d>>24&255]).toUpperCase()}c.uuid=e;c.uniforms=l({},d.uniforms,b.uniforms);c.defines=l({},d.defines,b.defines);c.defines[`TROIKA_DERIVED_MATERIAL_${k}`]= | ||
| "";c.extensions=l({},d.extensions,b.extensions);c._listeners=void 0;return c},G={constructor:{value:t},isDerivedMaterial:{value:!0},customProgramCacheKey:{writable:!0,configurable:!0,value:function(){return a.customProgramCacheKey()+"|"+k}},onBeforeCompile:{get(){return h},set(a){this[g]=a}},copy:{writable:!0,configurable:!0,value:function(b){a.copy.call(this,b);a.isShaderMaterial||a.isDerivedMaterial||(l(this.extensions,b.extensions),l(this.defines,b.defines),l(this.uniforms,c.UniformsUtils.clone(b.uniforms))); | ||
| return this}},clone:{writable:!0,configurable:!0,value:function(){const b=new a.constructor;return w(b).copy(this)}},getDepthMaterial:{writable:!0,configurable:!0,value:function(){let d=this._depthMaterial;d||(d=this._depthMaterial=m(a.isDerivedMaterial?a.getDepthMaterial():new c.MeshDepthMaterial({depthPacking:c.RGBADepthPacking}),b),d.defines.IS_DEPTH_MATERIAL="",d.uniforms=this.uniforms);return d}},getDistanceMaterial:{writable:!0,configurable:!0,value:function(){let d=this._distanceMaterial;d|| | ||
| (d=this._distanceMaterial=m(a.isDerivedMaterial?a.getDistanceMaterial():new c.MeshDistanceMaterial,b),d.defines.IS_DISTANCE_MATERIAL="",d.uniforms=this.uniforms);return d}},dispose:{writable:!0,configurable:!0,value(){const {_depthMaterial:b,_distanceMaterial:c}=this;b&&b.dispose();c&&c.dispose();a.dispose.call(this)}}};e[k]=t;return new t}function E(a,{vertexShader:b,fragmentShader:c},e,g){let {vertexDefs:k,vertexMainIntro:f,vertexMainOutro:h,vertexTransform:l,fragmentDefs:d,fragmentMainIntro:m, | ||
| fragmentMainOutro:p,fragmentColorTransform:u,customRewriter:r,timeUniform:n}=e;k=k||"";f=f||"";h=h||"";d=d||"";m=m||"";p=p||"";if(l||r)b=q(b);if(u||r)c=c.replace(/^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm,"\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n"),c=q(c);r&&(c=r({vertexShader:b,fragmentShader:c}),b=c.vertexShader,c=c.fragmentShader);if(u){let a=[];c=c.replace(/^\/\/!BEGIN_POST_CHUNK[^]+?^\/\/!END_POST_CHUNK/gm,b=>{a.push(b);return""});p= | ||
| `${u}\n${a.join("\n")}\n${p}`}n&&(e=`\nuniform float ${n};\n`,k=e+k,d=e+d);l&&(k=`${k} | ||
| 'use strict';(function(h,c){"object"===typeof exports&&"undefined"!==typeof module?c(exports,require("three")):"function"===typeof define&&define.amd?define(["exports","three"],c):(h="undefined"!==typeof globalThis?globalThis:h||self,c(h.troika_three_utils={},h.THREE))})(this,function(h,c){function q(b){return b.replace(/^[ \t]*#include +<([\w\d./]+)>/gm,function(b,k){return(k=c.ShaderChunk[k])?q(k):b})}function m(b,a){let k=D(a),e=n.get(b);e||n.set(b,e=Object.create(null));if(e[k])return new e[k]; | ||
| let g=`_onBeforeCompile${k}`,h=function(d,e){b.onBeforeCompile.call(this,d,e);e=this.customProgramCacheKey()+"|"+d.vertexShader+"|"+d.fragmentShader;var c=v[e];c||(c=E(this,d,a,k),c=v[e]=c);d.vertexShader=c.vertexShader;d.fragmentShader=c.fragmentShader;l(d.uniforms,this.uniforms);a.timeUniform&&(d.uniforms[a.timeUniform]={get value(){return Date.now()-F}});if(this[g])this[g](d)},t=function(){return w(a.chained?b:b.clone())},w=function(d){const c=Object.create(d,G);Object.defineProperty(c,"baseMaterial", | ||
| {value:b});Object.defineProperty(c,"id",{value:H++});{var e=4294967295*Math.random()|0;let b=4294967295*Math.random()|0,a=4294967295*Math.random()|0,d=4294967295*Math.random()|0;e=(f[e&255]+f[e>>8&255]+f[e>>16&255]+f[e>>24&255]+"-"+f[b&255]+f[b>>8&255]+"-"+f[b>>16&15|64]+f[b>>24&255]+"-"+f[a&63|128]+f[a>>8&255]+"-"+f[a>>16&255]+f[a>>24&255]+f[d&255]+f[d>>8&255]+f[d>>16&255]+f[d>>24&255]).toUpperCase()}c.uuid=e;c.uniforms=l({},d.uniforms,a.uniforms);c.defines=l({},d.defines,a.defines);c.defines[`TROIKA_DERIVED_MATERIAL_${k}`]= | ||
| "";c.extensions=l({},d.extensions,a.extensions);c._listeners=void 0;return c},G={constructor:{value:t},isDerivedMaterial:{value:!0},isDerivedFrom:{writable:!0,configurable:!0,value:function(b){const a=this.baseMaterial;return b===a||a.isDerivedMaterial&&a.isDerivedFrom(b)||!1}},customProgramCacheKey:{writable:!0,configurable:!0,value:function(){return b.customProgramCacheKey()+"|"+k}},onBeforeCompile:{get(){return h},set(b){this[g]=b}},copy:{writable:!0,configurable:!0,value:function(a){b.copy.call(this, | ||
| a);b.isShaderMaterial||b.isDerivedMaterial||(l(this.extensions,a.extensions),l(this.defines,a.defines),l(this.uniforms,c.UniformsUtils.clone(a.uniforms)));return this}},clone:{writable:!0,configurable:!0,value:function(){const a=new b.constructor;return w(a).copy(this)}},getDepthMaterial:{writable:!0,configurable:!0,value:function(){let d=this._depthMaterial;d||(d=this._depthMaterial=m(b.isDerivedMaterial?b.getDepthMaterial():new c.MeshDepthMaterial({depthPacking:c.RGBADepthPacking}),a),d.defines.IS_DEPTH_MATERIAL= | ||
| "",d.uniforms=this.uniforms);return d}},getDistanceMaterial:{writable:!0,configurable:!0,value:function(){let d=this._distanceMaterial;d||(d=this._distanceMaterial=m(b.isDerivedMaterial?b.getDistanceMaterial():new c.MeshDistanceMaterial,a),d.defines.IS_DISTANCE_MATERIAL="",d.uniforms=this.uniforms);return d}},dispose:{writable:!0,configurable:!0,value(){const {_depthMaterial:a,_distanceMaterial:c}=this;a&&a.dispose();c&&c.dispose();b.dispose.call(this)}}};e[k]=t;return new t}function E(b,{vertexShader:a, | ||
| fragmentShader:c},e,g){let {vertexDefs:k,vertexMainIntro:f,vertexMainOutro:h,vertexTransform:l,fragmentDefs:d,fragmentMainIntro:m,fragmentMainOutro:p,fragmentColorTransform:u,customRewriter:r,timeUniform:n}=e;k=k||"";f=f||"";h=h||"";d=d||"";m=m||"";p=p||"";if(l||r)a=q(a);if(u||r)c=c.replace(/^[ \t]*#include <((?:tonemapping|encodings|colorspace|fog|premultiplied_alpha|dithering)_fragment)>/gm,"\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n"),c=q(c);r&&(c=r({vertexShader:a,fragmentShader:c}),a= | ||
| c.vertexShader,c=c.fragmentShader);if(u){let b=[];c=c.replace(/^\/\/!BEGIN_POST_CHUNK[^]+?^\/\/!END_POST_CHUNK/gm,a=>{b.push(a);return""});p=`${u}\n${b.join("\n")}\n${p}`}n&&(e=`\nuniform float ${n};\n`,k=e+k,d=e+d);l&&(k=`${k} | ||
| void troikaVertexTransform${g}(inout vec3 position, inout vec3 normal, inout vec2 uv) { | ||
@@ -18,20 +18,20 @@ ${l} | ||
| ${f} | ||
| `,b=`vec3 troika_position_${g}; | ||
| `,a=`vec3 troika_position_${g}; | ||
| vec3 troika_normal_${g}; | ||
| vec2 troika_uv_${g}; | ||
| ${b} | ||
| `.replace(/\b(position|normal|uv)\b/g,(a,b,c,e)=>/\battribute\s+vec[23]\s+$/.test(e.substr(0,c))?b:`troika_${b}_${g}`),a.map&&0<a.map.channel||(b=b.replace(/\bMAP_UV\b/g,`troika_uv_${g}`)));b=x(b,g,k,f,h);c=x(c,g,d,m,p);return{vertexShader:b,fragmentShader:c}}function x(a,b,c,e,g){if(e||g||c)a=a.replace(y,` | ||
| ${a} | ||
| `.replace(/\b(position|normal|uv)\b/g,(b,a,c,e)=>/\battribute\s+vec[23]\s+$/.test(e.substr(0,c))?a:`troika_${a}_${g}`),b.map&&0<b.map.channel||(a=a.replace(/\bMAP_UV\b/g,`troika_uv_${g}`)));a=x(a,g,k,f,h);c=x(c,g,d,m,p);return{vertexShader:a,fragmentShader:c}}function x(b,a,c,e,g){if(e||g||c)b=b.replace(y,` | ||
| ${c} | ||
| void troikaOrigMain${b}() {`),a+=` | ||
| void troikaOrigMain${a}() {`),b+=` | ||
| void main() { | ||
| ${e} | ||
| troikaOrigMain${b}(); | ||
| troikaOrigMain${a}(); | ||
| ${g} | ||
| }`;return a}function I(a,b){return"uniforms"===a?void 0:"function"===typeof b?b.toString():b}function D(a){a=JSON.stringify(a,I);let b=z.get(a);null==b&&z.set(a,b=++J);return b}let y=/\bvoid\s+main\s*\(\s*\)\s*{/g,f=[];for(let a=0;256>a;a++)f[a]=(16>a?"0":"")+a.toString(16);let l=Object.assign||function(){let a=arguments[0];for(let b=1,c=arguments.length;b<c;b++){let c=arguments[b];if(c)for(let b in c)Object.prototype.hasOwnProperty.call(c,b)&&(a[b]=c[b])}return a},F=Date.now(),n=new WeakMap,v=new Map, | ||
| }`;return b}function I(b,a){return"uniforms"===b?void 0:"function"===typeof a?a.toString():a}function D(b){b=JSON.stringify(b,I);let a=z.get(b);null==a&&z.set(b,a=++J);return a}let y=/\bvoid\s+main\s*\(\s*\)\s*{/g,f=[];for(let b=0;256>b;b++)f[b]=(16>b?"0":"")+b.toString(16);let l=Object.assign||function(){let b=arguments[0];for(let a=1,c=arguments.length;a<c;a++){let c=arguments[a];if(c)for(let a in c)Object.prototype.hasOwnProperty.call(c,a)&&(b[a]=c[a])}return b},F=Date.now(),n=new WeakMap,v=new Map, | ||
| H=1E10,J=0,z=new Map,K={MeshDepthMaterial:"depth",MeshDistanceMaterial:"distanceRGBA",MeshNormalMaterial:"normal",MeshBasicMaterial:"basic",MeshLambertMaterial:"lambert",MeshPhongMaterial:"phong",MeshToonMaterial:"toon",MeshStandardMaterial:"physical",MeshPhysicalMaterial:"physical",MeshMatcapMaterial:"matcap",LineBasicMaterial:"basic",LineDashedMaterial:"dashed",PointsMaterial:"points",ShadowMaterial:"shadow",SpriteMaterial:"sprite"},A=null,B=new c.MeshStandardMaterial({color:16777215,side:c.DoubleSide}); | ||
| class C extends c.Mesh{static getGeometry(){return A||(A=(new c.CylinderGeometry(1,1,1,6,64)).translate(0,.5,0))}constructor(){super(C.getGeometry(),B);this.pointA=new c.Vector3;this.controlA=new c.Vector3;this.controlB=new c.Vector3;this.pointB=new c.Vector3;this.radius=.01;this.dashArray=new c.Vector2;this.dashOffset=0;this.frustumCulled=!1}get material(){let a=this._derivedMaterial,b=this._baseMaterial||this._defaultMaterial||(this._defaultMaterial=B.clone());a&&a.baseMaterial===b||(a=this._derivedMaterial= | ||
| m(b,{chained:!0,uniforms:{pointA:{value:new c.Vector3},controlA:{value:new c.Vector3},controlB:{value:new c.Vector3},pointB:{value:new c.Vector3},radius:{value:.01},dashing:{value:new c.Vector3}},vertexDefs:"\nuniform vec3 pointA;\nuniform vec3 controlA;\nuniform vec3 controlB;\nuniform vec3 pointB;\nuniform float radius;\nvarying float bezierT;\n\nvec3 cubicBezier(vec3 p1, vec3 c1, vec3 c2, vec3 p2, float t) {\n float t2 = 1.0 - t;\n float b0 = t2 * t2 * t2;\n float b1 = 3.0 * t * t2 * t2;\n float b2 = 3.0 * t * t * t2;\n float b3 = t * t * t;\n return b0 * p1 + b1 * c1 + b2 * c2 + b3 * p2;\n}\n\nvec3 cubicBezierDerivative(vec3 p1, vec3 c1, vec3 c2, vec3 p2, float t) {\n float t2 = 1.0 - t;\n return -3.0 * p1 * t2 * t2 +\n c1 * (3.0 * t2 * t2 - 6.0 * t2 * t) +\n c2 * (6.0 * t2 * t - 3.0 * t * t) +\n 3.0 * p2 * t * t;\n}\n", | ||
| class C extends c.Mesh{static getGeometry(){return A||(A=(new c.CylinderGeometry(1,1,1,6,64)).translate(0,.5,0))}constructor(){super(C.getGeometry(),B);this.pointA=new c.Vector3;this.controlA=new c.Vector3;this.controlB=new c.Vector3;this.pointB=new c.Vector3;this.radius=.01;this.dashArray=new c.Vector2;this.dashOffset=0;this.frustumCulled=!1}get material(){let b=this._derivedMaterial,a=this._baseMaterial||this._defaultMaterial||(this._defaultMaterial=B.clone());b&&b.baseMaterial===a||(b=this._derivedMaterial= | ||
| m(a,{chained:!0,uniforms:{pointA:{value:new c.Vector3},controlA:{value:new c.Vector3},controlB:{value:new c.Vector3},pointB:{value:new c.Vector3},radius:{value:.01},dashing:{value:new c.Vector3}},vertexDefs:"\nuniform vec3 pointA;\nuniform vec3 controlA;\nuniform vec3 controlB;\nuniform vec3 pointB;\nuniform float radius;\nvarying float bezierT;\n\nvec3 cubicBezier(vec3 p1, vec3 c1, vec3 c2, vec3 p2, float t) {\n float t2 = 1.0 - t;\n float b0 = t2 * t2 * t2;\n float b1 = 3.0 * t * t2 * t2;\n float b2 = 3.0 * t * t * t2;\n float b3 = t * t * t;\n return b0 * p1 + b1 * c1 + b2 * c2 + b3 * p2;\n}\n\nvec3 cubicBezierDerivative(vec3 p1, vec3 c1, vec3 c2, vec3 p2, float t) {\n float t2 = 1.0 - t;\n return -3.0 * p1 * t2 * t2 +\n c1 * (3.0 * t2 * t2 - 6.0 * t2 * t) +\n c2 * (6.0 * t2 * t - 3.0 * t * t) +\n 3.0 * p2 * t * t;\n}\n", | ||
| vertexTransform:'\nfloat t = position.y;\nbezierT = t;\nvec3 bezierCenterPos = cubicBezier(pointA, controlA, controlB, pointB, t);\nvec3 bezierDir = normalize(cubicBezierDerivative(pointA, controlA, controlB, pointB, t));\n\n// Make "sideways" always perpendicular to the camera ray; this ensures that any twists\n// in the cylinder occur where you won\'t see them: \nvec3 viewDirection = normalMatrix * vec3(0.0, 0.0, 1.0);\nif (bezierDir == viewDirection) {\n bezierDir = normalize(cubicBezierDerivative(pointA, controlA, controlB, pointB, t == 1.0 ? t - 0.0001 : t + 0.0001));\n}\nvec3 sideways = normalize(cross(bezierDir, viewDirection));\nvec3 upish = normalize(cross(sideways, bezierDir));\n\n// Build a matrix for transforming this disc in the cylinder:\nmat4 discTx;\ndiscTx[0].xyz = sideways * radius;\ndiscTx[1].xyz = bezierDir * radius;\ndiscTx[2].xyz = upish * radius;\ndiscTx[3].xyz = bezierCenterPos;\ndiscTx[3][3] = 1.0;\n\n// Apply transform, ignoring original y\nposition = (discTx * vec4(position.x, 0.0, position.z, 1.0)).xyz;\nnormal = normalize(mat3(discTx) * normal);\n', | ||
| fragmentDefs:"\nuniform vec3 dashing;\nvarying float bezierT;\n",fragmentMainIntro:"\nif (dashing.x + dashing.y > 0.0) {\n float dashFrac = mod(bezierT - dashing.z, dashing.x + dashing.y);\n if (dashFrac > dashing.x) {\n discard;\n }\n}\n"}),b.addEventListener("dispose",function e(){b.removeEventListener("dispose",e);a.dispose()}));return a}set material(a){this._baseMaterial=a}get customDepthMaterial(){return this.material.getDepthMaterial()}get customDistanceMaterial(){return this.material.getDistanceMaterial()}onBeforeRender(){let {uniforms:a}= | ||
| this.material,{pointA:b,controlA:c,controlB:e,pointB:g,radius:f,dashArray:h,dashOffset:l}=this;a.pointA.value.copy(b);a.controlA.value.copy(c);a.controlB.value.copy(e);a.pointB.value.copy(g);a.radius.value=f;a.dashing.value.set(h.x,h.y,l||0)}raycast(){}}h.BezierMesh=C;h.createDerivedMaterial=m;h.expandShaderIncludes=q;h.getShaderUniformTypes=function(a){let b=/\buniform\s+(int|float|vec[234]|mat[34])\s+([A-Za-z_][\w]*)/g,c=Object.create(null),e;for(;null!==(e=b.exec(a));)c[e[2]]=e[1];return c};h.getShadersForMaterial= | ||
| function(a){let b=K[a.type];return b?c.ShaderLib[b]:a};h.invertMatrix4=function(a,b=new c.Matrix4){"function"===typeof b.invert?b.copy(a).invert():b.getInverse(a);return b};h.voidMainRegExp=y;Object.defineProperty(h,"__esModule",{value:!0})}) | ||
| fragmentDefs:"\nuniform vec3 dashing;\nvarying float bezierT;\n",fragmentMainIntro:"\nif (dashing.x + dashing.y > 0.0) {\n float dashFrac = mod(bezierT - dashing.z, dashing.x + dashing.y);\n if (dashFrac > dashing.x) {\n discard;\n }\n}\n"}),a.addEventListener("dispose",function e(){a.removeEventListener("dispose",e);b.dispose()}));return b}set material(b){this._baseMaterial=b}get customDepthMaterial(){return this.material.getDepthMaterial()}get customDistanceMaterial(){return this.material.getDistanceMaterial()}onBeforeRender(){let {uniforms:b}= | ||
| this.material,{pointA:a,controlA:c,controlB:e,pointB:g,radius:f,dashArray:h,dashOffset:l}=this;b.pointA.value.copy(a);b.controlA.value.copy(c);b.controlB.value.copy(e);b.pointB.value.copy(g);b.radius.value=f;b.dashing.value.set(h.x,h.y,l||0)}raycast(){}}h.BezierMesh=C;h.createDerivedMaterial=m;h.expandShaderIncludes=q;h.getShaderUniformTypes=function(b){let a=/\buniform\s+(int|float|vec[234]|mat[34])\s+([A-Za-z_][\w]*)/g,c=Object.create(null),e;for(;null!==(e=a.exec(b));)c[e[2]]=e[1];return c};h.getShadersForMaterial= | ||
| function(b){let a=K[b.type];return a?c.ShaderLib[a]:b};h.invertMatrix4=function(b,a=new c.Matrix4){"function"===typeof a.invert?a.copy(b).invert():a.getInverse(b);return a};h.voidMainRegExp=y;Object.defineProperty(h,"__esModule",{value:!0})}) |
| { | ||
| "name": "troika-three-utils", | ||
| "version": "0.49.0", | ||
| "version": "0.50.0", | ||
| "description": "Various utilities related to Three.js", | ||
@@ -19,3 +19,3 @@ "author": "Jason Johnston <jason.johnston@protectwise.com>", | ||
| }, | ||
| "gitHead": "c51cb70f0fbae38f2d4c19fd6869e74da0d49c33" | ||
| "gitHead": "57f2e7882ba85389f376bd62d7202355f7fe5d9e" | ||
| } |
@@ -39,37 +39,38 @@ import { voidMainRegExp } from './voidMainRegExp.js' | ||
| * @param {Object} options - How the base material should be modified. | ||
| * @param {Object} options.defines - Custom `defines` for the material | ||
| * @param {Object} options.extensions - Custom `extensions` for the material, e.g. `{derivatives: true}` | ||
| * @param {Object} options.uniforms - Custom `uniforms` for use in the modified shader. These can | ||
| * @param {Object=} options.defines - Custom `defines` for the material | ||
| * @param {Object=} options.extensions - Custom `extensions` for the material, e.g. `{derivatives: true}` | ||
| * @param {Object=} options.uniforms - Custom `uniforms` for use in the modified shader. These can | ||
| * be accessed and manipulated via the resulting material's `uniforms` property, just like | ||
| * in a ShaderMaterial. You do not need to repeat the base material's own uniforms here. | ||
| * @param {String} options.timeUniform - If specified, a uniform of this name will be injected into | ||
| * @param {String=} options.timeUniform - If specified, a uniform of this name will be injected into | ||
| * both shaders, and it will automatically be updated on each render frame with a number of | ||
| * elapsed milliseconds. The "zero" epoch time is not significant so don't rely on this as a | ||
| * true calendar time. | ||
| * @param {String} options.vertexDefs - Custom GLSL code to inject into the vertex shader's top-level | ||
| * @param {String=} options.vertexDefs - Custom GLSL code to inject into the vertex shader's top-level | ||
| * definitions, above the `void main()` function. | ||
| * @param {String} options.vertexMainIntro - Custom GLSL code to inject at the top of the vertex | ||
| * @param {String=} options.vertexMainIntro - Custom GLSL code to inject at the top of the vertex | ||
| * shader's `void main` function. | ||
| * @param {String} options.vertexMainOutro - Custom GLSL code to inject at the end of the vertex | ||
| * @param {String=} options.vertexMainOutro - Custom GLSL code to inject at the end of the vertex | ||
| * shader's `void main` function. | ||
| * @param {String} options.vertexTransform - Custom GLSL code to manipulate the `position`, `normal`, | ||
| * @param {String=} options.vertexTransform - Custom GLSL code to manipulate the `position`, `normal`, | ||
| * and/or `uv` vertex attributes. This code will be wrapped within a standalone function with | ||
| * those attributes exposed by their normal names as read/write values. | ||
| * @param {String} options.fragmentDefs - Custom GLSL code to inject into the fragment shader's top-level | ||
| * @param {String=} options.fragmentDefs - Custom GLSL code to inject into the fragment shader's top-level | ||
| * definitions, above the `void main()` function. | ||
| * @param {String} options.fragmentMainIntro - Custom GLSL code to inject at the top of the fragment | ||
| * @param {String=} options.fragmentMainIntro - Custom GLSL code to inject at the top of the fragment | ||
| * shader's `void main` function. | ||
| * @param {String} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * @param {String=} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * shader's `void main` function. You can manipulate `gl_FragColor` here but keep in mind it goes | ||
| * after any of ThreeJS's color postprocessing shader chunks (tonemapping, fog, etc.), so if you | ||
| * want those to apply to your changes use `fragmentColorTransform` instead. | ||
| * @param {String} options.fragmentColorTransform - Custom GLSL code to manipulate the `gl_FragColor` | ||
| * @param {String=} options.fragmentColorTransform - Custom GLSL code to manipulate the `gl_FragColor` | ||
| * output value. Will be injected near the end of the `void main` function, but before any | ||
| * of ThreeJS's color postprocessing shader chunks (tonemapping, fog, etc.), and before the | ||
| * `fragmentMainOutro`. | ||
| * @param {function<{vertexShader,fragmentShader}>:{vertexShader,fragmentShader}} options.customRewriter - A function | ||
| * @param {function({fragmentShader: string, vertexShader:string}): | ||
| * {fragmentShader: string, vertexShader:string}} options.customRewriter - A function | ||
| * for performing custom rewrites of the full shader code. Useful if you need to do something | ||
| * special that's not covered by the other builtin options. This function will be executed before | ||
| * any other transforms are applied. | ||
| * @param {boolean} options.chained - Set to `true` to prototype-chain the derived material to the base | ||
| * @param {boolean=} options.chained - Set to `true` to prototype-chain the derived material to the base | ||
| * material, rather than the default behavior of copying it. This allows the derived material to | ||
@@ -173,2 +174,11 @@ * automatically pick up changes made to the base material and its properties. This can be useful | ||
| isDerivedFrom: { | ||
| writable: true, | ||
| configurable: true, | ||
| value: function (testMaterial) { | ||
| const base = this.baseMaterial | ||
| return testMaterial === base || (base.isDerivedMaterial && base.isDerivedFrom(testMaterial)) || false | ||
| } | ||
| }, | ||
| customProgramCacheKey: { | ||
@@ -308,3 +318,3 @@ writable: true, | ||
| fragmentShader = fragmentShader.replace( | ||
| /^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| /^[ \t]*#include <((?:tonemapping|encodings|colorspace|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| '\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n' | ||
@@ -311,0 +321,0 @@ ) |
New alerts
License Policy Violation
LicenseThis 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
LicenseThis 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
- increased by1.78%
115673
- Lines of code
- increased by1.32%
2068
No dependency changes