Use attribute sampler array

gkjohnson · gkjohnson · commit af9d22e985fb · 2022-11-22T22:31:27.000+09:00
diff --git a/example/areaLight.js b/example/areaLight.js
@@ -204,9 +204,12 @@ async function init() {
 		const material = ptRenderer.material;
 
 		material.bvh.updateFrom( bvh );
-		material.normalAttribute.updateFrom( geometry.attributes.normal );
-		material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-		material.uvAttribute.updateFrom( geometry.attributes.uv );
+		material.attributeArray.updateFrom(
+			geometry.attributes.normal,
+			geometry.attributes.tangent,
+			geometry.attributes.uv,
+			geometry.attributes.color,
+		);
 		material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 		material.textures.setTextures( renderer, 2048, 2048, textures );
 		material.materials.updateFrom( materials, textures );
diff --git a/example/basic.js b/example/basic.js
@@ -90,9 +90,12 @@ async function init() {
 			const material = pathTracer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.normalAttribute.updateFrom( geometry.attributes.normal );
-			material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-			material.uvAttribute.updateFrom( geometry.attributes.uv );
+			material.attributeArray.updateFrom(
+				geometry.attributes.normal,
+				geometry.attributes.tangent,
+				geometry.attributes.uv,
+				geometry.attributes.color,
+			);
 			material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 			material.textures.setTextures( renderer, 2048, 2048, textures );
 			material.materials.updateFrom( materials, textures );
diff --git a/example/depthOfField.js b/example/depthOfField.js
@@ -150,9 +150,12 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.normalAttribute.updateFrom( geometry.attributes.normal );
-			material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-			material.uvAttribute.updateFrom( geometry.attributes.uv );
+			material.attributeArray.updateFrom(
+				geometry.attributes.normal,
+				geometry.attributes.tangent,
+				geometry.attributes.uv,
+				geometry.attributes.color,
+			);
 			material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 			material.textures.setTextures( renderer, 2048, 2048, textures );
 			material.materials.updateFrom( materials, textures );
diff --git a/example/index.js b/example/index.js
@@ -693,11 +693,13 @@ async function updateModel() {
 		const material = ptRenderer.material;
 
 		material.bvh.updateFrom( bvh );
-		material.normalAttribute.updateFrom( geometry.attributes.normal );
-		material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-		material.uvAttribute.updateFrom( geometry.attributes.uv );
+		material.attributeArray.updateFrom(
+			geometry.attributes.normal,
+			geometry.attributes.tangent,
+			geometry.attributes.uv,
+			geometry.attributes.color,
+		);
 		material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
-		material.colorAttribute.updateFrom( geometry.attributes.color );
 		material.textures.setTextures( renderer, 2048, 2048, textures );
 		material.materials.updateFrom( materials, textures );
 
diff --git a/example/interior.js b/example/interior.js
@@ -149,9 +149,12 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.normalAttribute.updateFrom( geometry.attributes.normal );
-			material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-			material.uvAttribute.updateFrom( geometry.attributes.uv );
+			material.attributeArray.updateFrom(
+				geometry.attributes.normal,
+				geometry.attributes.tangent,
+				geometry.attributes.uv,
+				geometry.attributes.color,
+			);
 			material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 			material.textures.setTextures( renderer, 2048, 2048, textures );
 			material.materials.updateFrom( materials, textures );
diff --git a/example/materialBall.js b/example/materialBall.js
@@ -279,9 +279,12 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.normalAttribute.updateFrom( geometry.attributes.normal );
-			material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-			material.uvAttribute.updateFrom( geometry.attributes.uv );
+			material.attributeArray.updateFrom(
+				geometry.attributes.normal,
+				geometry.attributes.tangent,
+				geometry.attributes.uv,
+				geometry.attributes.color,
+			);
 			material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 			material.textures.setTextures( renderer, 2048, 2048, textures );
 			material.materials.updateFrom( materials, textures );
diff --git a/example/materialDatabase.js b/example/materialDatabase.js
@@ -164,9 +164,12 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.normalAttribute.updateFrom( geometry.attributes.normal );
-			material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-			material.uvAttribute.updateFrom( geometry.attributes.uv );
+			material.attributeArray.updateFrom(
+				geometry.attributes.normal,
+				geometry.attributes.tangent,
+				geometry.attributes.uv,
+				geometry.attributes.color,
+			);
 			material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 			material.textures.setTextures( renderer, 2048, 2048, textures );
 			material.materials.updateFrom( materials, textures );
diff --git a/example/skinnedMesh.js b/example/skinnedMesh.js
@@ -250,9 +250,12 @@ function regenerateScene() {
 	const material = ptRenderer.material;
 
 	material.bvh.updateFrom( bvh );
-	material.normalAttribute.updateFrom( geometry.attributes.normal );
-	material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-	material.uvAttribute.updateFrom( geometry.attributes.uv );
+	material.attributeArray.updateFrom(
+		geometry.attributes.normal,
+		geometry.attributes.tangent,
+		geometry.attributes.uv,
+		geometry.attributes.color,
+	);
 	material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 	material.textures.setTextures( renderer, 2048, 2048, textures );
 	material.materials.updateFrom( materials, textures );
diff --git a/example/spotLights.js b/example/spotLights.js
@@ -252,9 +252,12 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.normalAttribute.updateFrom( geometry.attributes.normal );
-			material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-			material.uvAttribute.updateFrom( geometry.attributes.uv );
+			material.attributeArray.updateFrom(
+				geometry.attributes.normal,
+				geometry.attributes.tangent,
+				geometry.attributes.uv,
+				geometry.attributes.color,
+			);
 			material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
 			material.textures.setTextures( renderer, 2048, 2048, textures );
 			material.materials.updateFrom( materials, textures );
diff --git a/example/viewerTest.js b/example/viewerTest.js
@@ -428,11 +428,13 @@ async function updateModel() {
 		const material = ptRenderer.material;
 
 		material.bvh.updateFrom( bvh );
-		material.normalAttribute.updateFrom( geometry.attributes.normal );
-		material.tangentAttribute.updateFrom( geometry.attributes.tangent );
-		material.uvAttribute.updateFrom( geometry.attributes.uv );
+		material.attributeArray.updateFrom(
+			geometry.attributes.normal,
+			geometry.attributes.tangent,
+			geometry.attributes.uv,
+			geometry.attributes.color,
+		);
 		material.materialIndexAttribute.updateFrom( geometry.attributes.materialIndex );
-		material.colorAttribute.updateFrom( geometry.attributes.color );
 		material.textures.setTextures( renderer, 2048, 2048, textures );
 		material.materials.updateFrom( materials, textures );
 		material.envMapInfo.updateFrom( envMap );
diff --git a/src/materials/PhysicalPathTracingMaterial.js b/src/materials/PhysicalPathTracingMaterial.js
@@ -15,6 +15,7 @@ import { PhysicalCameraUniform } from '../uniforms/PhysicalCameraUniform.js';
 import { EquirectHdrInfoUniform } from '../uniforms/EquirectHdrInfoUniform.js';
 import { LightsInfoUniformStruct } from '../uniforms/LightsInfoUniformStruct.js';
 import { IESProfilesTexture } from '../uniforms/IESProfilesTexture.js';
+import { ComboAttributesTextureArray } from '../uniforms/ComboAttributesTextureArray.js';
 
 export class PhysicalPathTracingMaterial extends MaterialBase {
 
@@ -55,10 +56,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 				physicalCamera: { value: new PhysicalCameraUniform() },
 
 				bvh: { value: new MeshBVHUniformStruct() },
-				normalAttribute: { value: new FloatVertexAttributeTexture() },
-				tangentAttribute: { value: new FloatVertexAttributeTexture() },
-				uvAttribute: { value: new FloatVertexAttributeTexture() },
-				colorAttribute: { value: new FloatVertexAttributeTexture() },
+				attributeArray: { value: new ComboAttributesTextureArray() },
 				materialIndexAttribute: { value: new UIntVertexAttributeTexture() },
 				materials: { value: new MaterialsTexture() },
 				textures: { value: new RenderTarget2DArray().texture },
@@ -132,10 +130,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 				uniform int bounces;
 				uniform mat4 cameraWorldMatrix;
 				uniform mat4 invProjectionMatrix;
-				uniform sampler2D normalAttribute;
-				uniform sampler2D tangentAttribute;
-				uniform sampler2D uvAttribute;
-				uniform sampler2D colorAttribute;
+				uniform sampler2DArray attributeArray;
 				uniform usampler2D materialIndexAttribute;
 				uniform BVH bvh;
 				uniform float environmentIntensity;
@@ -201,8 +196,9 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 							// Should be able to work using the material BSDF functions which will take into account specularity, etc.
 							// TODO: should we account for emissive surfaces here?
 
-							vec2 uv = textureSampleBarycoord( uvAttribute, barycoord, faceIndices.xyz ).xy;
-							vec4 vertexColor = textureSampleBarycoord( colorAttribute, barycoord, faceIndices.xyz );
+							vec2 uv = textureSampleBarycoord( attributeArray, ATTR_UV, barycoord, faceIndices.xyz ).xy;
+							vec4 vertexColor = textureSampleBarycoord( attributeArray, ATTR_COLOR, barycoord, faceIndices.xyz );
+
 							uint materialIndex = uTexelFetch1D( materialIndexAttribute, faceIndices.x ).r;
 							Material material = readMaterialInfo( materials, materialIndex );
 
@@ -539,8 +535,8 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 						}
 
 						// uv coord for textures
-						vec2 uv = textureSampleBarycoord( uvAttribute, barycoord, faceIndices.xyz ).xy;
-						vec4 vertexColor = textureSampleBarycoord( colorAttribute, barycoord, faceIndices.xyz );
+						vec2 uv = textureSampleBarycoord( attributeArray, ATTR_UV, barycoord, faceIndices.xyz ).xy;
+						vec4 vertexColor = textureSampleBarycoord( attributeArray, ATTR_COLOR, barycoord, faceIndices.xyz );
 
 						// albedo
 						vec4 albedo = vec4( material.color, material.opacity );
@@ -597,7 +593,8 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 
 						// fetch the interpolated smooth normal
 						vec3 normal = normalize( textureSampleBarycoord(
-							normalAttribute,
+							attributeArray,
+							ATTR_NORMAL,
 							barycoord,
 							faceIndices.xyz
 						).xyz );
@@ -643,7 +640,8 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 						if ( material.normalMap != - 1 ) {
 
 							vec4 tangentSample = textureSampleBarycoord(
-								tangentAttribute,
+								attributeArray,
+								ATTR_TANGENT,
 								barycoord,
 								faceIndices.xyz
 							);
@@ -690,7 +688,8 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 						if ( material.clearcoatNormalMap != - 1 ) {
 
 							vec4 tangentSample = textureSampleBarycoord(
-								tangentAttribute,
+								attributeArray,
+								ATTR_TANGENT,
 								barycoord,
 								faceIndices.xyz
 							);
diff --git a/src/uniforms/ComboAttributesTextureArray.js b/src/uniforms/ComboAttributesTextureArray.js
@@ -1,6 +1,6 @@
 import { FloatAttributeTextureArray } from './FloatAttributeTextureArray.js';
 
-export class GeometryAttributesTextureArray extends FloatAttributeTextureArray {
+export class ComboAttributesTextureArray extends FloatAttributeTextureArray {
 
 	setNormalAttribute( attr ) {
 
diff --git a/src/uniforms/FloatAttributeTextureArray.js b/src/uniforms/FloatAttributeTextureArray.js
@@ -1,12 +1,31 @@
-import { DataArrayTexture } from 'three';
+import { DataArrayTexture, FloatType, RGBAFormat } from 'three';
 import { FloatVertexAttributeTexture } from 'three-mesh-bvh';
 
+function copyArrayToArray( fromArray, fromStride, toArray, offset ) {
+
+	const count = fromArray.length / fromStride;
+	for ( let i = 0; i < count; i ++ ) {
+
+		const i4 = 4 * i;
+		const is = fromStride * i;
+		toArray[ offset + i4 + 0 ] = fromArray[ is + 0 ];
+		toArray[ offset + i4 + 1 ] = fromStride >= 2 ? fromArray[ is + 1 ] : 0;
+		toArray[ offset + i4 + 2 ] = fromStride >= 3 ? fromArray[ is + 2 ] : 0;
+		toArray[ offset + i4 + 3 ] = fromStride >= 4 ? fromArray[ is + 3 ] : 0;
+
+	}
+
+}
+
 export class FloatAttributeTextureArray extends DataArrayTexture {
 
 	constructor() {
 
 		super();
 		this._textures = [];
+		this.type = FloatType;
+		this.format = RGBAFormat;
+		this.internalFormat = 'RGBA32F';
 
 	}
 
@@ -19,8 +38,8 @@ export class FloatAttributeTextureArray extends DataArrayTexture {
 		const { width, height, data } = this.image;
 		const length = width * height * 4;
 		const offset = length * index;
-		const floatView = new Float32Array( data.buffer, offset * 4, length );
-		floatView.set( tex.image.data );
+
+		copyArrayToArray( tex.image.data, attr.itemSize, data, offset );
 
 		this.dispose();
 		this.needsUpdate = true;
@@ -47,7 +66,6 @@ export class FloatAttributeTextureArray extends DataArrayTexture {
 		while ( textures.length < attrsLength ) {
 
 			const tex = new FloatVertexAttributeTexture();
-			tex.overrideItemSize = 4;
 			textures.push( tex );
 
 		}
@@ -82,14 +100,24 @@ export class FloatAttributeTextureArray extends DataArrayTexture {
 
 		}
 
+		// debugger;
+
 		// copy the other texture data into the data array texture
 		for ( let i = 0, l = attrsLength; i < l; i ++ ) {
 
 			const tex = textures[ i ];
 			const length = width * height * 4;
 			const offset = length * i;
-			const floatView = new Float32Array( data.buffer, offset * 4, length );
-			floatView.set( tex.image.data );
+
+			let itemSize = attrs[ i ].itemSize;
+			if ( itemSize === 3 ) {
+
+				itemSize = 4;
+
+			}
+
+			if ( itemSize === 2 ) debugger;
+			copyArrayToArray( tex.image.data, itemSize, data, offset );
 
 		}
 
