Added grain direction and made originOffset a uniform

Author: SeeleyLogan

examples/jsm/materials/ProceduralWood.js

@@ -280,7 +280,7 @@ const wood = TSL.Fn( ( [
 	darkGrainColor,
 	lightGrainColor
 ] ) => {
-
+	
 	const center = woodCenter( p, centerSize );
 	const mainWarp = spaceWarp( spaceWarp( p, center, largeWarpScale, largeGrainStretch ), smallWarpStrength, smallWarpScale, 0.17 );
 	const detailWarp = spaceWarp( mainWarp, fineWarpStrength, fineWarpScale, 0.17 );
@@ -296,6 +296,7 @@ const wood = TSL.Fn( ( [
 const woodParams = {
 	teak: {
         originOffset: { x: -0.4, y: 0, z: 0 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.11, largeWarpScale: 0.32, largeGrainStretch: 0.24, smallWarpStrength: 0.059,
 		smallWarpScale: 2, fineWarpStrength: 0.006, fineWarpScale: 32.8, ringCount: 34,
 		ringBias: 0.03, ringSizeVariance: 0.03, ringVarianceScale: 4.4, barkThickness: 0.3,
@@ -304,6 +305,7 @@ const woodParams = {
 	},
 	walnut: {
         originOffset: { x: -0.4, y: 0, z: 0 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.07, largeWarpScale: 0.42, largeGrainStretch: 0.34, smallWarpStrength: 0.016,
 		smallWarpScale: 10.3, fineWarpStrength: 0.028, fineWarpScale: 12.7, ringCount: 32,
 		ringBias: 0.08, ringSizeVariance: 0.03, ringVarianceScale: 5.5, barkThickness: 0.98,
@@ -312,6 +314,7 @@ const woodParams = {
 	},
 	white_oak: {
         originOffset: { x: -0.4, y: 0, z: 0 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.23, largeWarpScale: 0.21, largeGrainStretch: 0.21, smallWarpStrength: 0.034,
 		smallWarpScale: 2.44, fineWarpStrength: 0.01, fineWarpScale: 14.3, ringCount: 34,
 		ringBias: 0.82, ringSizeVariance: 0.16, ringVarianceScale: 1.4, barkThickness: 0.7,
@@ -320,6 +323,7 @@ const woodParams = {
 	},
 	pine: {
         originOffset: { x: -0.4, y: 0, z: -0.2 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.23, largeWarpScale: 0.21, largeGrainStretch: 0.18, smallWarpStrength: 0.041,
 		smallWarpScale: 2.44, fineWarpStrength: 0.006, fineWarpScale: 23.2, ringCount: 24,
 		ringBias: 0.1, ringSizeVariance: 0.07, ringVarianceScale: 5, barkThickness: 0.35,
@@ -328,6 +332,7 @@ const woodParams = {
 	},
 	poplar: {
         originOffset: { x: -0.4, y: 0, z: 0.2 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.43, largeWarpScale: 0.33, largeGrainStretch: 0.18, smallWarpStrength: 0.04,
 		smallWarpScale: 4.3, fineWarpStrength: 0.004, fineWarpScale: 33.6, ringCount: 37,
 		ringBias: 0.07, ringSizeVariance: 0.03, ringVarianceScale: 3.8, barkThickness: 0.3,
@@ -336,6 +341,7 @@ const woodParams = {
 	},
 	maple: {
         originOffset: { x: -0.4, y: 0.3, z: -0.2 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.4, largeWarpScale: 0.38, largeGrainStretch: 0.25, smallWarpStrength: 0.067,
 		smallWarpScale: 2.5, fineWarpStrength: 0.005, fineWarpScale: 33.6, ringCount: 35,
 		ringBias: 0.1, ringSizeVariance: 0.07, ringVarianceScale: 4.6, barkThickness: 0.61,
@@ -344,6 +350,7 @@ const woodParams = {
 	},
 	red_oak: {
         originOffset: { x: -0.4, y: 0, z: 0.4 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.21, largeWarpScale: 0.24, largeGrainStretch: 0.25, smallWarpStrength: 0.044,
 		smallWarpScale: 2.54, fineWarpStrength: 0.01, fineWarpScale: 14.5, ringCount: 34,
 		ringBias: 0.92, ringSizeVariance: 0.03, ringVarianceScale: 5.6, barkThickness: 1.01,
@@ -352,6 +359,7 @@ const woodParams = {
 	},
 	cherry: {
         originOffset: { x: -0.4, y: 0.3, z: 0 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.33, largeWarpScale: 0.11, largeGrainStretch: 0.33, smallWarpStrength: 0.024,
 		smallWarpScale: 2.48, fineWarpStrength: 0.01, fineWarpScale: 15.3, ringCount: 36,
 		ringBias: 0.02, ringSizeVariance: 0.04, ringVarianceScale: 6.5, barkThickness: 0.09,
@@ -360,6 +368,7 @@ const woodParams = {
 	},
 	cedar: {
         originOffset: { x: -0.4, y: 0.1, z: 0.1 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.11, largeWarpScale: 0.39, largeGrainStretch: 0.12, smallWarpStrength: 0.061,
 		smallWarpScale: 1.9, fineWarpStrength: 0.006, fineWarpScale: 4.8, ringCount: 25,
 		ringBias: 0.01, ringSizeVariance: 0.07, ringVarianceScale: 6.7, barkThickness: 0.1,
@@ -368,6 +377,7 @@ const woodParams = {
 	},
 	mahogany: {
         originOffset: { x: -0.4, y: 0.2, z: 0 },
+        grainRotation: { x: 0, y: 0, z: 0 },
 		centerSize: 1.25, largeWarpScale: 0.26, largeGrainStretch: 0.29, smallWarpStrength: 0.044,
 		smallWarpScale: 2.54, fineWarpStrength: 0.01, fineWarpScale: 15.3, ringCount: 38,
 		ringBias: 0.01, ringSizeVariance: 0.33, ringVarianceScale: 1.2, barkThickness: 0.07,
@@ -405,7 +415,7 @@ export function GetWoodPreset( genus, finish ) {
 
 	}
 
-	return { ...params, genus, finish, clearcoat, clearcoatRoughness, clearcoatDarken };
+	return { ...params, originOffset: new THREE.Vector3().copy( params.originOffset ), grainRotation: new THREE.Vector3().copy( params.grainRotation ), genus, finish, clearcoat, clearcoatRoughness, clearcoatDarken };
 
 }
 
@@ -430,9 +440,11 @@ uniforms.cellScale = TSL.uniform( params.cellScale ).onObjectUpdate( ( { materia
 uniforms.cellSize = TSL.uniform( params.cellSize ).onObjectUpdate( ( { material } ) => material.cellSize );
 uniforms.darkGrainColor = TSL.uniform( new THREE.Color( params.darkGrainColor ) ).onObjectUpdate( ( { material }, self ) => self.value.set( material.darkGrainColor ) );
 uniforms.lightGrainColor = TSL.uniform( new THREE.Color( params.lightGrainColor ) ).onObjectUpdate( ( { material }, self ) => self.value.set( material.lightGrainColor ) );
+uniforms.originOffset = TSL.uniform( new THREE.Vector3().copy( params.originOffset ) ).onObjectUpdate( ( { material } ) => material.originOffset );
+uniforms.grainRotation = TSL.uniform( new THREE.Vector3().copy( params.grainRotation ) ).onObjectUpdate( ( { material } ) => material.grainRotation );
 
 const colorNode = wood(
-	TSL.positionLocal.add( TSL.vec3( params.originOffset.x, params.originOffset.y, params.originOffset.z ) ),
+	TSL.rotate( TSL.positionLocal.add( uniforms.originOffset ), uniforms.grainRotation ),
 	uniforms.centerSize,
 	uniforms.largeWarpScale,
 	uniforms.largeGrainStretch,
@@ -453,7 +465,7 @@ const colorNode = wood(
 	uniforms.lightGrainColor
 ).mul( params.clearcoatDarken );
 
-export class WoodNodeMaterial extends THREE.MeshPhysicalNodeMaterial {
+export class WoodNodeMaterial extends THREE.MeshPhysicalMaterial {
 
 	static get type() {
 
@@ -492,4 +504,3 @@ export class WoodNodeMaterial extends THREE.MeshPhysicalNodeMaterial {
 	}
 
 }
-