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.22.0 to 0.23.0
@@ -6,2 +6,13 @@ # Change Log | ||
| # [0.23.0](https://github.com/protectwise/troika/compare/v0.22.0...v0.23.0) (2020-04-16) | ||
| ### Bug Fixes | ||
| * **troika-three-utils:** fragmentColorTransform is now inserted prior to postprocessing chunks ([97cd9ac](https://github.com/protectwise/troika/commit/97cd9ac3276c353597a374f1c7d2c7f23993aa7f)), closes [#20](https://github.com/protectwise/troika/issues/20) | ||
| # [0.22.0](https://github.com/protectwise/troika/compare/v0.21.0...v0.22.0) (2020-04-02) | ||
@@ -8,0 +19,0 @@ |
@@ -78,6 +78,9 @@ import { ShaderChunk, UniformsUtils, MeshDepthMaterial, RGBADepthPacking, MeshDistanceMaterial, ShaderLib, DataTexture, Vector3, MeshStandardMaterial, DoubleSide, Mesh, CylinderBufferGeometry, Vector2 } from 'three'; | ||
| * @param {String} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * shader's `void main` function. | ||
| * 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` | ||
| * output value. Will be injected after all other `void main` logic has executed but just before | ||
| * the `fragmentMainOutro`. TODO allow injecting in other places? | ||
| * 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 | ||
@@ -273,2 +276,10 @@ * for performing custom rewrites of the full shader code. Useful if you need to do something | ||
| if (fragmentColorTransform || customRewriter) { | ||
| // We need to be able to find postprocessing chunks after include expansion in order to | ||
| // put them after the fragmentColorTransform, so mark them with comments first. Even if | ||
| // this particular derivation doesn't have a fragmentColorTransform, other derivations may, | ||
| // so we still mark them. | ||
| fragmentShader = fragmentShader.replace( | ||
| /^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| '\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n' | ||
| ); | ||
| fragmentShader = expandShaderIncludes(fragmentShader); | ||
@@ -284,5 +295,14 @@ } | ||
| // Treat fragmentColorTransform as an outro | ||
| // The fragmentColorTransform needs to go before any postprocessing chunks, so extract | ||
| // those and re-insert them into the outro in the correct place: | ||
| if (fragmentColorTransform) { | ||
| fragmentMainOutro = `${fragmentColorTransform}\n${fragmentMainOutro}`; | ||
| let postChunks = []; | ||
| fragmentShader = fragmentShader.replace( | ||
| /^\/\/!BEGIN_POST_CHUNK[^]+?^\/\/!END_POST_CHUNK/gm, // [^]+? = non-greedy match of any chars including newlines | ||
| match => { | ||
| postChunks.push(match); | ||
| return '' | ||
| } | ||
| ); | ||
| fragmentMainOutro = `${fragmentColorTransform}\n${postChunks.join('\n')}\n${fragmentMainOutro}`; | ||
| } | ||
@@ -289,0 +309,0 @@ |
@@ -84,6 +84,9 @@ (function (global, factory) { | ||
| * @param {String} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * shader's `void main` function. | ||
| * 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` | ||
| * output value. Will be injected after all other `void main` logic has executed but just before | ||
| * the `fragmentMainOutro`. TODO allow injecting in other places? | ||
| * 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 | ||
@@ -284,2 +287,10 @@ * for performing custom rewrites of the full shader code. Useful if you need to do something | ||
| if (fragmentColorTransform || customRewriter) { | ||
| // We need to be able to find postprocessing chunks after include expansion in order to | ||
| // put them after the fragmentColorTransform, so mark them with comments first. Even if | ||
| // this particular derivation doesn't have a fragmentColorTransform, other derivations may, | ||
| // so we still mark them. | ||
| fragmentShader = fragmentShader.replace( | ||
| /^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| '\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n' | ||
| ); | ||
| fragmentShader = expandShaderIncludes(fragmentShader); | ||
@@ -295,5 +306,14 @@ } | ||
| // Treat fragmentColorTransform as an outro | ||
| // The fragmentColorTransform needs to go before any postprocessing chunks, so extract | ||
| // those and re-insert them into the outro in the correct place: | ||
| if (fragmentColorTransform) { | ||
| fragmentMainOutro = fragmentColorTransform + "\n" + fragmentMainOutro; | ||
| var postChunks = []; | ||
| fragmentShader = fragmentShader.replace( | ||
| /^\/\/!BEGIN_POST_CHUNK[^]+?^\/\/!END_POST_CHUNK/gm, // [^]+? = non-greedy match of any chars including newlines | ||
| function (match) { | ||
| postChunks.push(match); | ||
| return '' | ||
| } | ||
| ); | ||
| fragmentMainOutro = fragmentColorTransform + "\n" + (postChunks.join('\n')) + "\n" + fragmentMainOutro; | ||
| } | ||
@@ -300,0 +320,0 @@ |
| 'use strict';(function(g,e){"object"===typeof exports&&"undefined"!==typeof module?e(exports,require("three")):"function"===typeof define&&define.amd?define(["exports","three"],e):(g=g||self,e(g.troika_three_utils={},g.THREE))})(this,function(g,e){function t(a){return a.replace(/^[ \t]*#include +<([\w\d./]+)>/gm,function(a,c){return(c=e.ShaderChunk[c])?t(c):a})}function u(a,b){function c(c){a.onBeforeCompile.call(this,c);var d=this[g]||(this[g]={vertex:{},fragment:{}}),f=d.vertex;d=d.fragment;if(f.source!== | ||
| c.vertexShader||d.source!==c.fragmentShader){var e=C(c,b,p);f.source=c.vertexShader;f.result=e.vertexShader;d.source=c.fragmentShader;d.result=e.fragmentShader}c.vertexShader=f.result;c.fragmentShader=d.result;l(c.uniforms,this.uniforms);b.timeUniform&&(c.uniforms[b.timeUniform]={get value(){return Date.now()-D}});if(this[h])this[h](c)}function d(){a.constructor.apply(this,arguments);this._listeners=void 0}var f=JSON.stringify(b,E),q=w.get(a);q||(q=Object.create(null),w.set(a,q));if(q[f])return q[f].clone(); | ||
| var p=++F,g="_derivedShaders"+p,h="_onBeforeCompile"+p,n,m;d.prototype=Object.create(a,{constructor:{value:d},isDerivedMaterial:{value:!0},baseMaterial:{value:a},onBeforeCompile:{get:function(){return c},set:function(a){this[h]=a}},copy:{value:function(b){a.copy.call(this,b);a.isShaderMaterial||a.isDerivedMaterial||(this.extensions=l({},b.extensions),this.defines=l({},b.defines),this.uniforms=e.UniformsUtils.clone(b.uniforms));return this}},getDepthMaterial:{value:function(){var c=this._depthMaterial; | ||
| c.vertexShader||d.source!==c.fragmentShader){var e=C(c,b,q);f.source=c.vertexShader;f.result=e.vertexShader;d.source=c.fragmentShader;d.result=e.fragmentShader}c.vertexShader=f.result;c.fragmentShader=d.result;l(c.uniforms,this.uniforms);b.timeUniform&&(c.uniforms[b.timeUniform]={get value(){return Date.now()-D}});if(this[h])this[h](c)}function d(){a.constructor.apply(this,arguments);this._listeners=void 0}var f=JSON.stringify(b,E),r=w.get(a);r||(r=Object.create(null),w.set(a,r));if(r[f])return r[f].clone(); | ||
| var q=++F,g="_derivedShaders"+q,h="_onBeforeCompile"+q,n,m;d.prototype=Object.create(a,{constructor:{value:d},isDerivedMaterial:{value:!0},baseMaterial:{value:a},onBeforeCompile:{get:function(){return c},set:function(a){this[h]=a}},copy:{value:function(b){a.copy.call(this,b);a.isShaderMaterial||a.isDerivedMaterial||(this.extensions=l({},b.extensions),this.defines=l({},b.defines),this.uniforms=e.UniformsUtils.clone(b.uniforms));return this}},getDepthMaterial:{value:function(){var c=this._depthMaterial; | ||
| c||(m||(m=u(a.isDerivedMaterial?a.getDepthMaterial():new e.MeshDepthMaterial({depthPacking:e.RGBADepthPacking}),b),m.defines.IS_DEPTH_MATERIAL=""),c=this._depthMaterial=m.clone(),c.uniforms=this.uniforms);return c}},getDistanceMaterial:{value:function(){var c=this._distanceMaterial;c||(n||(n=u(a.isDerivedMaterial?a.getDistanceMaterial():new e.MeshDistanceMaterial,b),n.defines.IS_DISTANCE_MATERIAL=""),c=this._distanceMaterial=n.clone(),c.uniforms=this.uniforms);return c}},dispose:{value:function(){var b= | ||
| this._depthMaterial,c=this._distanceMaterial;b&&b.dispose();c&&c.dispose();a.dispose.call(this)}}});var k=new d;k.copy(a);k.uniforms=l(e.UniformsUtils.clone(a.uniforms||{}),b.uniforms);k.defines=l({},a.defines,b.defines);k.defines.TROIKA_DERIVED_MATERIAL=p;k.extensions=l({},a.extensions,b.extensions);q[f]=k;return k.clone()}function C(a,b,c){var d=a.vertexShader,f=a.fragmentShader;a=b.vertexDefs;var e=b.vertexMainIntro,g=b.vertexMainOutro,h=b.vertexTransform,v=b.fragmentDefs,n=b.fragmentMainIntro, | ||
| m=b.fragmentMainOutro,k=b.fragmentColorTransform,l=b.customRewriter;b=b.timeUniform;a=a||"";e=e||"";g=g||"";v=v||"";n=n||"";m=m||"";if(h||l)d=t(d);if(k||l)f=t(f);l&&(f=l({vertexShader:d,fragmentShader:f}),d=f.vertexShader,f=f.fragmentShader);k&&(m=k+"\n"+m);b&&(k="\nuniform float "+b+";\n",a+=k,v+=k);h&&(a=a+"\nvec3 troika_position_"+c+";\nvec3 troika_normal_"+c+";\nvec2 troika_uv_"+c+";\nvoid troikaVertexTransform"+c+"(inout vec3 position, inout vec3 normal, inout vec2 uv) {\n "+h+"\n}\n",e="\ntroika_position_"+ | ||
| c+" = vec3(position);\ntroika_normal_"+c+" = vec3(normal);\ntroika_uv_"+c+" = vec2(uv);\ntroikaVertexTransform"+c+"(troika_position_"+c+", troika_normal_"+c+", troika_uv_"+c+");\n"+e+"\n",d=d.replace(/\b(position|normal|uv)\b/g,function(a,b,d,f){return/\battribute\s+vec[23]\s+$/.test(f.substr(0,d))?b:"troika_"+b+"_"+c}));d=x(d,c,a,e,g);f=x(f,c,v,n,m);return{vertexShader:d,fragmentShader:f}}function x(a,b,c,d,f){if(d||f||c)a=a.replace(y,"\n"+c+"\nvoid troikaOrigMain"+b+"() {"),a+="\nvoid main() {\n "+ | ||
| d+"\n troikaOrigMain"+b+"();\n "+f+"\n}";return a}function E(a,b){return"uniforms"===a?void 0:"function"===typeof b?b.toString():b}function z(a,b,c){a*=255;var d=a%1*255,f=d%1*255;var e=Math.round(f%1*255)&255;b[c]=a&255;b[c+1]=d&255;b[c+2]=f&255;b[c+3]=e;return b}var y=/\bvoid\s+main\s*\(\s*\)\s*{/g,l=Object.assign||function(){for(var a=arguments,b=arguments[0],c=1,d=arguments.length;c<d;c++){var f=a[c];if(f)for(var e in f)f.hasOwnProperty(e)&&(b[e]=f[e])}return b},F=0,D=Date.now(),w=new WeakMap, | ||
| G={MeshDepthMaterial:"depth",MeshDistanceMaterial:"distanceRGBA",MeshNormalMaterial:"normal",MeshBasicMaterial:"basic",MeshLambertMaterial:"lambert",MeshPhongMaterial:"phong",MeshToonMaterial:"phong",MeshStandardMaterial:"physical",MeshPhysicalMaterial:"physical",MeshMatcapMaterial:"matcap",LineBasicMaterial:"basic",LineDashedMaterial:"dashed",PointsMaterial:"points",ShadowMaterial:"shadow",SpriteMaterial:"sprite"},h=function(a){this.name=a;this.textureUniform="dataTex_"+a;this.textureSizeUniform= | ||
| "dataTexSize_"+a;this.multiplierUniform="dataMultiplier_"+a;this.dataSizeUniform="dataSize_"+a;this.readFunction="readData_"+a;this._raw=new Float32Array(0);this._texture=new e.DataTexture(new Uint8Array(0),0,1);this._length=0;this._multiplier=1},r={length:{configurable:!0}};r.length.set=function(a){if(a!==this._length){var b=Math.pow(2,Math.ceil(Math.log2(a))),c=this._raw;b<c.length?this._raw=c.subarray(0,b):b>c.length&&(this._raw=new Float32Array(b),this._raw.set(c));this._length=a}};r.length.get= | ||
| function(){return this._length};h.prototype.push=function(a){return this.set(this.length++,a)};h.prototype.setArray=function(a){this.length=a.length;this._raw.set(a);this._needsRepack=!0};h.prototype.get=function(a){return this._raw[a]};h.prototype.set=function(a,b){a+1>this._length&&(this.length=a+1);b!==this._raw[a]&&(this._raw[a]=b,z(b/this._multiplier,this._texture.image.data,4*a),this._needsMultCheck=!0)};h.prototype.clone=function(){var a=new h(this.name);a.setArray(this._raw);return a};h.prototype.getShaderUniforms= | ||
| function(){var a,b=this;return a={},a[this.textureUniform]={get value(){b._sync();return b._texture}},a[this.textureSizeUniform]={get value(){b._sync();return b._texture.image.width}},a[this.dataSizeUniform]={get value(){b._sync();return b.length}},a[this.multiplierUniform]={get value(){b._sync();return b._multiplier}},a};h.prototype.getShaderHeaderCode=function(){var a=this.textureUniform,b=this.textureSizeUniform,c=this.multiplierUniform;return"\nuniform sampler2D "+a+";\nuniform float "+b+";\nuniform float "+ | ||
| this.dataSizeUniform+";\nuniform float "+c+";\n\nfloat "+this.readFunction+"(float index) {\n vec2 texUV = vec2((index + 0.5) / "+b+", 0.5);\n vec4 pixel = texture2D("+a+", texUV);\n return dot(pixel, 1.0 / vec4(1.0, 255.0, 65025.0, 16581375.0)) * "+c+";\n}\n"};h.prototype._sync=function(){var a=this._texture,b=this._raw,c=this._needsRepack;b.length!==a.image.width&&(a.image={data:new Uint8Array(4*b.length),width:b.length,height:1},c=!0);if(c||this._needsMultCheck){var d=this._raw.reduce(function(a, | ||
| b){return Math.max(a,b)},0);d=Math.pow(2,Math.ceil(Math.log2(d)));d!==this._multiplier&&(this._multiplier=d,c=!0);a.needsUpdate=!0;this._needsMultCheck=!1}if(c){c=0;d=b.length;for(var f=this._multiplier;c<d;c++)z(b[c]/f,a.image.data,4*c);this._needsRepack=!1}};Object.defineProperties(h.prototype,r);var A=null,B=new e.MeshStandardMaterial({color:16777215,side:e.DoubleSide});r=function(a){function b(){a.call(this,b.getGeometry(),B);this.pointA=new e.Vector3;this.controlA=new e.Vector3;this.controlB= | ||
| new e.Vector3;this.pointB=new e.Vector3;this.radius=.01;this.dashArray=new e.Vector2;this.dashOffset=0;this.frustumCulled=!1}a&&(b.__proto__=a);b.prototype=Object.create(a&&a.prototype);b.prototype.constructor=b;var c={material:{configurable:!0},customDepthMaterial:{configurable:!0},customDistanceMaterial:{configurable:!0}};b.getGeometry=function(){return A||(A=(new e.CylinderBufferGeometry(1,1,1,6,64)).translate(0,.5,0))};c.material.get=function(){var a=this._derivedMaterial,b=this._baseMaterial|| | ||
| B;a&&a.baseMaterial===b||(a&&a.dispose(),a=this._derivedMaterial=u(b,{uniforms:{pointA:{value:new e.Vector3},controlA:{value:new e.Vector3},controlB:{value:new e.Vector3},pointB:{value:new e.Vector3},radius:{value:.01},dashing:{value:new e.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", | ||
| this._depthMaterial,c=this._distanceMaterial;b&&b.dispose();c&&c.dispose();a.dispose.call(this)}}});var k=new d;k.copy(a);k.uniforms=l(e.UniformsUtils.clone(a.uniforms||{}),b.uniforms);k.defines=l({},a.defines,b.defines);k.defines.TROIKA_DERIVED_MATERIAL=q;k.extensions=l({},a.extensions,b.extensions);r[f]=k;return k.clone()}function C(a,b,c){var d=a.vertexShader,f=a.fragmentShader;a=b.vertexDefs;var e=b.vertexMainIntro,g=b.vertexMainOutro,h=b.vertexTransform,v=b.fragmentDefs,n=b.fragmentMainIntro, | ||
| m=b.fragmentMainOutro,k=b.fragmentColorTransform,l=b.customRewriter;b=b.timeUniform;a=a||"";e=e||"";g=g||"";v=v||"";n=n||"";m=m||"";if(h||l)d=t(d);if(k||l)f=f.replace(/^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm,"\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n"),f=t(f);l&&(f=l({vertexShader:d,fragmentShader:f}),d=f.vertexShader,f=f.fragmentShader);if(k){var p=[];f=f.replace(/^\/\/!BEGIN_POST_CHUNK[^]+?^\/\/!END_POST_CHUNK/gm,function(a){p.push(a); | ||
| return""});m=k+"\n"+p.join("\n")+"\n"+m}b&&(k="\nuniform float "+b+";\n",a+=k,v+=k);h&&(a=a+"\nvec3 troika_position_"+c+";\nvec3 troika_normal_"+c+";\nvec2 troika_uv_"+c+";\nvoid troikaVertexTransform"+c+"(inout vec3 position, inout vec3 normal, inout vec2 uv) {\n "+h+"\n}\n",e="\ntroika_position_"+c+" = vec3(position);\ntroika_normal_"+c+" = vec3(normal);\ntroika_uv_"+c+" = vec2(uv);\ntroikaVertexTransform"+c+"(troika_position_"+c+", troika_normal_"+c+", troika_uv_"+c+");\n"+e+"\n",d=d.replace(/\b(position|normal|uv)\b/g, | ||
| function(a,b,d,f){return/\battribute\s+vec[23]\s+$/.test(f.substr(0,d))?b:"troika_"+b+"_"+c}));d=x(d,c,a,e,g);f=x(f,c,v,n,m);return{vertexShader:d,fragmentShader:f}}function x(a,b,c,d,f){if(d||f||c)a=a.replace(y,"\n"+c+"\nvoid troikaOrigMain"+b+"() {"),a+="\nvoid main() {\n "+d+"\n troikaOrigMain"+b+"();\n "+f+"\n}";return a}function E(a,b){return"uniforms"===a?void 0:"function"===typeof b?b.toString():b}function z(a,b,c){a*=255;var d=a%1*255,f=d%1*255;var e=Math.round(f%1*255)&255;b[c]=a&255; | ||
| b[c+1]=d&255;b[c+2]=f&255;b[c+3]=e;return b}var y=/\bvoid\s+main\s*\(\s*\)\s*{/g,l=Object.assign||function(){for(var a=arguments,b=arguments[0],c=1,d=arguments.length;c<d;c++){var f=a[c];if(f)for(var e in f)f.hasOwnProperty(e)&&(b[e]=f[e])}return b},F=0,D=Date.now(),w=new WeakMap,G={MeshDepthMaterial:"depth",MeshDistanceMaterial:"distanceRGBA",MeshNormalMaterial:"normal",MeshBasicMaterial:"basic",MeshLambertMaterial:"lambert",MeshPhongMaterial:"phong",MeshToonMaterial:"phong",MeshStandardMaterial:"physical", | ||
| MeshPhysicalMaterial:"physical",MeshMatcapMaterial:"matcap",LineBasicMaterial:"basic",LineDashedMaterial:"dashed",PointsMaterial:"points",ShadowMaterial:"shadow",SpriteMaterial:"sprite"},h=function(a){this.name=a;this.textureUniform="dataTex_"+a;this.textureSizeUniform="dataTexSize_"+a;this.multiplierUniform="dataMultiplier_"+a;this.dataSizeUniform="dataSize_"+a;this.readFunction="readData_"+a;this._raw=new Float32Array(0);this._texture=new e.DataTexture(new Uint8Array(0),0,1);this._length=0;this._multiplier= | ||
| 1},p={length:{configurable:!0}};p.length.set=function(a){if(a!==this._length){var b=Math.pow(2,Math.ceil(Math.log2(a))),c=this._raw;b<c.length?this._raw=c.subarray(0,b):b>c.length&&(this._raw=new Float32Array(b),this._raw.set(c));this._length=a}};p.length.get=function(){return this._length};h.prototype.push=function(a){return this.set(this.length++,a)};h.prototype.setArray=function(a){this.length=a.length;this._raw.set(a);this._needsRepack=!0};h.prototype.get=function(a){return this._raw[a]};h.prototype.set= | ||
| function(a,b){a+1>this._length&&(this.length=a+1);b!==this._raw[a]&&(this._raw[a]=b,z(b/this._multiplier,this._texture.image.data,4*a),this._needsMultCheck=!0)};h.prototype.clone=function(){var a=new h(this.name);a.setArray(this._raw);return a};h.prototype.getShaderUniforms=function(){var a,b=this;return a={},a[this.textureUniform]={get value(){b._sync();return b._texture}},a[this.textureSizeUniform]={get value(){b._sync();return b._texture.image.width}},a[this.dataSizeUniform]={get value(){b._sync(); | ||
| return b.length}},a[this.multiplierUniform]={get value(){b._sync();return b._multiplier}},a};h.prototype.getShaderHeaderCode=function(){var a=this.textureUniform,b=this.textureSizeUniform,c=this.multiplierUniform;return"\nuniform sampler2D "+a+";\nuniform float "+b+";\nuniform float "+this.dataSizeUniform+";\nuniform float "+c+";\n\nfloat "+this.readFunction+"(float index) {\n vec2 texUV = vec2((index + 0.5) / "+b+", 0.5);\n vec4 pixel = texture2D("+a+", texUV);\n return dot(pixel, 1.0 / vec4(1.0, 255.0, 65025.0, 16581375.0)) * "+ | ||
| c+";\n}\n"};h.prototype._sync=function(){var a=this._texture,b=this._raw,c=this._needsRepack;b.length!==a.image.width&&(a.image={data:new Uint8Array(4*b.length),width:b.length,height:1},c=!0);if(c||this._needsMultCheck){var d=this._raw.reduce(function(a,b){return Math.max(a,b)},0);d=Math.pow(2,Math.ceil(Math.log2(d)));d!==this._multiplier&&(this._multiplier=d,c=!0);a.needsUpdate=!0;this._needsMultCheck=!1}if(c){c=0;d=b.length;for(var f=this._multiplier;c<d;c++)z(b[c]/f,a.image.data,4*c);this._needsRepack= | ||
| !1}};Object.defineProperties(h.prototype,p);var A=null,B=new e.MeshStandardMaterial({color:16777215,side:e.DoubleSide});p=function(a){function b(){a.call(this,b.getGeometry(),B);this.pointA=new e.Vector3;this.controlA=new e.Vector3;this.controlB=new e.Vector3;this.pointB=new e.Vector3;this.radius=.01;this.dashArray=new e.Vector2;this.dashOffset=0;this.frustumCulled=!1}a&&(b.__proto__=a);b.prototype=Object.create(a&&a.prototype);b.prototype.constructor=b;var c={material:{configurable:!0},customDepthMaterial:{configurable:!0}, | ||
| customDistanceMaterial:{configurable:!0}};b.getGeometry=function(){return A||(A=(new e.CylinderBufferGeometry(1,1,1,6,64)).translate(0,.5,0))};c.material.get=function(){var a=this._derivedMaterial,b=this._baseMaterial||B;a&&a.baseMaterial===b||(a&&a.dispose(),a=this._derivedMaterial=u(b,{uniforms:{pointA:{value:new e.Vector3},controlA:{value:new e.Vector3},controlB:{value:new e.Vector3},pointB:{value:new e.Vector3},radius:{value:.01},dashing:{value:new e.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 p(){b.removeEventListener("dispose",p);a.dispose()}));return a};c.material.set=function(a){this._baseMaterial=a};c.customDepthMaterial.get=function(){return this.material.getDepthMaterial()};c.customDistanceMaterial.get= | ||
| function(){return this.material.getDistanceMaterial()};b.prototype.onBeforeRender=function(a){a=this.material.uniforms;var b=this.controlA,c=this.controlB,d=this.pointB,e=this.radius,g=this.dashArray,h=this.dashOffset;a.pointA.value.copy(this.pointA);a.controlA.value.copy(b);a.controlB.value.copy(c);a.pointB.value.copy(d);a.radius.value=e;a.dashing.value.set(g.x,g.y,h||0)};b.prototype.raycast=function(a,b){};Object.defineProperties(b.prototype,c);return b}(e.Mesh);g.BezierMesh=r;g.ShaderFloatArray= | ||
| 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 q(){b.removeEventListener("dispose",q);a.dispose()}));return a};c.material.set=function(a){this._baseMaterial=a};c.customDepthMaterial.get=function(){return this.material.getDepthMaterial()};c.customDistanceMaterial.get= | ||
| function(){return this.material.getDistanceMaterial()};b.prototype.onBeforeRender=function(a){a=this.material.uniforms;var b=this.controlA,c=this.controlB,d=this.pointB,e=this.radius,g=this.dashArray,h=this.dashOffset;a.pointA.value.copy(this.pointA);a.controlA.value.copy(b);a.controlB.value.copy(c);a.pointB.value.copy(d);a.radius.value=e;a.dashing.value.set(g.x,g.y,h||0)};b.prototype.raycast=function(a,b){};Object.defineProperties(b.prototype,c);return b}(e.Mesh);g.BezierMesh=p;g.ShaderFloatArray= | ||
| h;g.createDerivedMaterial=u;g.expandShaderIncludes=t;g.getShaderUniformTypes=function(a){for(var b=/\buniform\s+(int|float|vec[234])\s+([A-Za-z_][\w]*)/g,c=Object.create(null),d;null!==(d=b.exec(a));)c[d[2]]=d[1];return c};g.getShadersForMaterial=function(a){var b=G[a.type];return b?e.ShaderLib[b]:a};g.voidMainRegExp=y;Object.defineProperty(g,"__esModule",{value:!0})}) |
| { | ||
| "name": "troika-three-utils", | ||
| "version": "0.22.0", | ||
| "version": "0.23.0", | ||
| "description": "Various utilities related to Three.js", | ||
@@ -17,3 +17,3 @@ "author": "Jason Johnston <jason.johnston@protectwise.com>", | ||
| "module:src": "src/index.js", | ||
| "gitHead": "c3ff4002b468f00bc7c4775578e0ad9d950ff52d" | ||
| "gitHead": "c58983745861fe3fc4a5ec15a24addce603061c9" | ||
| } |
@@ -59,6 +59,9 @@ import { voidMainRegExp } from './voidMainRegExp.js' | ||
| * @param {String} options.fragmentMainOutro - Custom GLSL code to inject at the end of the fragment | ||
| * shader's `void main` function. | ||
| * 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` | ||
| * output value. Will be injected after all other `void main` logic has executed but just before | ||
| * the `fragmentMainOutro`. TODO allow injecting in other places? | ||
| * 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 | ||
@@ -254,2 +257,10 @@ * for performing custom rewrites of the full shader code. Useful if you need to do something | ||
| if (fragmentColorTransform || customRewriter) { | ||
| // We need to be able to find postprocessing chunks after include expansion in order to | ||
| // put them after the fragmentColorTransform, so mark them with comments first. Even if | ||
| // this particular derivation doesn't have a fragmentColorTransform, other derivations may, | ||
| // so we still mark them. | ||
| fragmentShader = fragmentShader.replace( | ||
| /^[ \t]*#include <((?:tonemapping|encodings|fog|premultiplied_alpha|dithering)_fragment)>/gm, | ||
| '\n//!BEGIN_POST_CHUNK $1\n$&\n//!END_POST_CHUNK\n' | ||
| ) | ||
| fragmentShader = expandShaderIncludes(fragmentShader) | ||
@@ -265,5 +276,14 @@ } | ||
| // Treat fragmentColorTransform as an outro | ||
| // The fragmentColorTransform needs to go before any postprocessing chunks, so extract | ||
| // those and re-insert them into the outro in the correct place: | ||
| if (fragmentColorTransform) { | ||
| fragmentMainOutro = `${fragmentColorTransform}\n${fragmentMainOutro}` | ||
| let postChunks = [] | ||
| fragmentShader = fragmentShader.replace( | ||
| /^\/\/!BEGIN_POST_CHUNK[^]+?^\/\/!END_POST_CHUNK/gm, // [^]+? = non-greedy match of any chars including newlines | ||
| match => { | ||
| postChunks.push(match) | ||
| return '' | ||
| } | ||
| ) | ||
| fragmentMainOutro = `${fragmentColorTransform}\n${postChunks.join('\n')}\n${fragmentMainOutro}` | ||
| } | ||
@@ -270,0 +290,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 by3.74%
121976
- Lines of code
- increased by2.49%
2506
No dependency changes