tsl-textures 2.5.1 → 3.0.1

package/src/tiger-fur.js

@@ -4,14 +4,15 @@
 
 
 import { Color } from "three";
-import { exp, mix, positionGeometry, vec3 } from 'three/tsl';
-import { noise, prepare, TSLFn } from './tsl-utils.js';
+import { exp, Fn, mix, positionGeometry, vec3 } from 'three/tsl';
+import { noise } from './tsl-utils.js';
 
 
 
 var defaults = {
 	$name: 'Tiger fur',
 
+	position: positionGeometry,
 	scale: 2,
 	lengths: 4,
 	blur: 0.3,
@@ -26,24 +27,50 @@ var defaults = {
 
 
 
-var tigerFur = TSLFn( ( params )=>{
+var tigerFurRaw = Fn( ([ position, scale, lengths, blur, strength, hairs, color, bottomColor, seed ])=>{
 
-	params = prepare( params, defaults );
+	var xscale = scale.div( 2 ).add( 1 ).toVar();
+	var pos = position.mul( exp( xscale ) ).add( seed ).toVar( );
 
-	var scale = params.scale.div( 2 ).add( 1 ).toVar();
-	var pos = positionGeometry.mul( exp( scale ) ).add( params.seed ).toVar( );
-
-	var len = params.lengths.add( 5 ).reciprocal().toVar();
-	var hairs = params.hairs.mul( 0.3 ).toVar();
-	var k = noise( pos.mul( scale, vec3( 1, len, len ) ) );
+	var len = lengths.add( 5 ).reciprocal().toVar();
+	var hairs = hairs.mul( 0.3 ).toVar();
+	var k = noise( pos.mul( xscale, vec3( 1, len, len ) ) );
 	k = k.add( noise( pos.mul( vec3( 25, 1, 1 ) ) ).add( 1 ).mul( hairs ) );
-	k = k.add( params.strength.sub( 0.5 ) ).smoothstep( params.blur.negate(), params.blur ).oneMinus();
+	k = k.add( strength.sub( 0.5 ) ).smoothstep( blur.negate(), blur ).oneMinus();
+
+	var n = position.y.add( hairs.sub( 0.5 ) ).smoothstep( -1, 0.5 );
+
+	return mix( bottomColor, color, n ).mul( k );
+
+} ).setLayout( {
+	name: 'tigerFurRaw',
+	type: 'vec3',
+	inputs: [
+		{ name: 'position', type: 'vec3' },
+		{ name: 'scale', type: 'float' },
+		{ name: 'lengths', type: 'float' },
+		{ name: 'blur', type: 'float' },
+		{ name: 'strength', type: 'float' },
+		{ name: 'hairs', type: 'float' },
+		{ name: 'color', type: 'vec3' },
+		{ name: 'bottomColor', type: 'vec3' },
+		{ name: 'seed', type: 'float' },
+	] }
+);
+
+
+
+function tigerFur( params={} ) {
+
+	var { position, scale, lengths, blur, strength, hairs, color, bottomColor, seed } = { ...defaults, ...params };
+
+	return tigerFurRaw( position, scale, lengths, blur, strength, hairs, color, bottomColor, seed );
+
+}
 
-	var n = positionGeometry.y.add( hairs.sub( 0.5 ) ).smoothstep( -1, 0.5 );
 
-	return mix( params.bottomColor, params.color, n ).mul( k );
 
-}, defaults );
+tigerFur.defaults = defaults;
 
 
 

package/src/translator.js

@@ -4,8 +4,8 @@
 
 
 import { Vector2, Vector3 } from "three";
-import { cross, Fn, normalLocal, positionGeometry, sub, tangentLocal, transformNormalToView, vec4 } from 'three/tsl';
-import { matTrans, prepare, selectPlanar, TSLFn } from './tsl-utils.js';
+import { cross, Fn, normalLocal, positionGeometry, tangentLocal } from 'three/tsl';
+import { approximateNormal, selectPlanar } from './tsl-utils.js';
 
 
 
@@ -24,49 +24,92 @@ var defaults = {
 
 
 
-var surfacePos = Fn( ([ pos, params ])=>{
+var surfacePos = Fn( ([ pos, distance, selectorAngles, selectorCenter, selectorWidth ])=>{
 
-	var zone = selectPlanar( pos, params.selectorAngles, params.selectorCenter, params.selectorWidth );
+	var zone = selectPlanar( pos, selectorAngles, selectorCenter, selectorWidth );
 
-	var T = matTrans( params.distance.mul( zone ) );
+	return pos.add( distance.mul( zone ) );
 
-	return T.mul( vec4( pos, 1 ) ).xyz;
+} ).setLayout( {
+	name: 'surfacePos',
+	type: 'vec3',
+	inputs: [
+		{ name: 'pos', type: 'vec3' },
+		{ name: 'distance', type: 'vec3' },
+		{ name: 'selectorAngles', type: 'vec2' },
+		{ name: 'selectorCenter', type: 'vec3' },
+		{ name: 'selectorWidth', type: 'float' },
+	]
+} );
+
+
+
+var translatorRaw = Fn( ([ distance, selectorAngles, selectorCenter, selectorWidth ])=>{
 
+	return surfacePos( positionGeometry, distance, selectorAngles, selectorCenter, selectorWidth );
+
+} ).setLayout( {
+	name: 'translatorRaw',
+	type: 'vec3',
+	inputs: [
+		{ name: 'distance', type: 'vec3' },
+		{ name: 'selectorAngles', type: 'vec2' },
+		{ name: 'selectorCenter', type: 'vec3' },
+		{ name: 'selectorWidth', type: 'float' },
+	]
 } );
 
 
 
-var translator = TSLFn( ( params )=>{
+var translatorNormalRaw = Fn( ([ distance, selectorAngles, selectorCenter, selectorWidth ])=>{
 
-	params = prepare( params, defaults );
+	var EPS = 0.01;
 
-	return surfacePos( positionGeometry, params );
+	var position = positionGeometry,
+		normal = normalLocal.normalize().toVar(),
+		tangent = tangentLocal.normalize().mul( EPS ).toVar(),
+		bitangent = cross( normal, tangent ).normalize().mul( EPS ).toVar();
+
+	var pos = surfacePos( position, distance, selectorAngles, selectorCenter, selectorWidth );
+	var posU = surfacePos( position.add( tangent ), distance, selectorAngles, selectorCenter, selectorWidth );
+	var posV = surfacePos( position.add( bitangent ), distance, selectorAngles, selectorCenter, selectorWidth );
+
+	return approximateNormal( pos, posU, posV );
+
+} ).setLayout( {
+	name: 'translatorNormalRaw',
+	type: 'vec3',
+	inputs: [
+		{ name: 'distance', type: 'vec3' },
+		{ name: 'selectorAngles', type: 'vec2' },
+		{ name: 'selectorCenter', type: 'vec3' },
+		{ name: 'selectorWidth', type: 'float' },
+	]
+} );
 
-}, defaults );
 
 
+function translator( params={} ) {
 
-translator.normal = TSLFn( ( params ) => {
+	var { distance, selectorAngles, selectorCenter, selectorWidth } = { ...defaults, ...params };
 
-	params = prepare( params, defaults );
+	return translatorRaw( distance, selectorAngles, selectorCenter, selectorWidth );
 
-	var eps = 0.01;
+}
 
-	var position = positionGeometry,
-		normal = normalLocal.normalize().toVar(),
-		tangent = tangentLocal.normalize().mul( eps ).toVar(),
-		bitangent = cross( normal, tangent ).normalize().mul( eps ).toVar();
 
-	var pos = surfacePos( position, params );
-	var posU = surfacePos( position.add( tangent ), params );
-	var posV = surfacePos( position.add( bitangent ), params );
 
-	var dU = sub( posU, pos ),
-		dV = sub( posV, pos );
+translator.normal = function ( params={} ) {
+
+	var { distance, selectorAngles, selectorCenter, selectorWidth } = { ...defaults, ...params };
+
+	return translatorNormalRaw( distance, selectorAngles, selectorCenter, selectorWidth );
+
+};
+
 
-	return transformNormalToView( cross( dU, dV ).normalize() );
 
-}, defaults );
+translator.defaults = defaults;
 
 
 

package/src/tsl-textures.js

@@ -1,4 +1,5 @@
 
+window.__TSL_TEXTURES__ = 3.0;
 
 export * from './tsl-utils.js';
 
@@ -22,6 +23,7 @@ export { karstRock } from './karst-rock.js';
 export { marble } from './marble.js';
 //export { melter } from './melter.js';
 export { neonLights } from './neon-lights.js';
+export { perlinNoise } from './perlin-noise.js';
 export { photosphere } from './photosphere.js';
 export { planet } from './planet.js';
 export { polkaDots } from './polka-dots.js';
@@ -35,7 +37,6 @@ export { satin } from './satin.js';
 export { scaler } from './scaler.js';
 export { scepterHead } from './scepter-head.js';
 export { scream } from './scream.js';
-export { simplexNoise } from './simplex-noise.js';
 export { stars } from './stars.js';
 export { staticNoise } from './static-noise.js';
 export { supersphere } from './supersphere.js';