attributeArray -> attributesArray

gkjohnson · gkjohnson · commit 64e62ff6f727 · 2022-11-22T22:58:47.000+09:00
diff --git a/example/areaLight.js b/example/areaLight.js
@@ -204,7 +204,7 @@ async function init() {
 		const material = ptRenderer.material;
 
 		material.bvh.updateFrom( bvh );
-		material.attributeArray.updateFrom(
+		material.attributesArray.updateFrom(
 			geometry.attributes.normal,
 			geometry.attributes.tangent,
 			geometry.attributes.uv,
diff --git a/example/basic.js b/example/basic.js
@@ -90,7 +90,7 @@ async function init() {
 			const material = pathTracer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.attributeArray.updateFrom(
+			material.attributesArray.updateFrom(
 				geometry.attributes.normal,
 				geometry.attributes.tangent,
 				geometry.attributes.uv,
diff --git a/example/depthOfField.js b/example/depthOfField.js
@@ -150,7 +150,7 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.attributeArray.updateFrom(
+			material.attributesArray.updateFrom(
 				geometry.attributes.normal,
 				geometry.attributes.tangent,
 				geometry.attributes.uv,
diff --git a/example/index.js b/example/index.js
@@ -693,7 +693,7 @@ async function updateModel() {
 		const material = ptRenderer.material;
 
 		material.bvh.updateFrom( bvh );
-		material.attributeArray.updateFrom(
+		material.attributesArray.updateFrom(
 			geometry.attributes.normal,
 			geometry.attributes.tangent,
 			geometry.attributes.uv,
diff --git a/example/interior.js b/example/interior.js
@@ -149,7 +149,7 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.attributeArray.updateFrom(
+			material.attributesArray.updateFrom(
 				geometry.attributes.normal,
 				geometry.attributes.tangent,
 				geometry.attributes.uv,
diff --git a/example/materialBall.js b/example/materialBall.js
@@ -279,7 +279,7 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.attributeArray.updateFrom(
+			material.attributesArray.updateFrom(
 				geometry.attributes.normal,
 				geometry.attributes.tangent,
 				geometry.attributes.uv,
diff --git a/example/materialDatabase.js b/example/materialDatabase.js
@@ -164,7 +164,7 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.attributeArray.updateFrom(
+			material.attributesArray.updateFrom(
 				geometry.attributes.normal,
 				geometry.attributes.tangent,
 				geometry.attributes.uv,
diff --git a/example/skinnedMesh.js b/example/skinnedMesh.js
@@ -250,7 +250,7 @@ function regenerateScene() {
 	const material = ptRenderer.material;
 
 	material.bvh.updateFrom( bvh );
-	material.attributeArray.updateFrom(
+	material.attributesArray.updateFrom(
 		geometry.attributes.normal,
 		geometry.attributes.tangent,
 		geometry.attributes.uv,
diff --git a/example/spotLights.js b/example/spotLights.js
@@ -252,7 +252,7 @@ async function init() {
 			const material = ptRenderer.material;
 
 			material.bvh.updateFrom( bvh );
-			material.attributeArray.updateFrom(
+			material.attributesArray.updateFrom(
 				geometry.attributes.normal,
 				geometry.attributes.tangent,
 				geometry.attributes.uv,
diff --git a/example/viewerTest.js b/example/viewerTest.js
@@ -428,7 +428,7 @@ async function updateModel() {
 		const material = ptRenderer.material;
 
 		material.bvh.updateFrom( bvh );
-		material.attributeArray.updateFrom(
+		material.attributesArray.updateFrom(
 			geometry.attributes.normal,
 			geometry.attributes.tangent,
 			geometry.attributes.uv,
diff --git a/src/materials/PhysicalPathTracingMaterial.js b/src/materials/PhysicalPathTracingMaterial.js
@@ -57,7 +57,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 				physicalCamera: { value: new PhysicalCameraUniform() },
 
 				bvh: { value: new MeshBVHUniformStruct() },
-				attributeArray: { value: new ComboAttributesTextureArray() },
+				attributesArray: { value: new ComboAttributesTextureArray() },
 				materialIndexAttribute: { value: new UIntVertexAttributeTexture() },
 				materials: { value: new MaterialsTexture() },
 				textures: { value: new RenderTarget2DArray().texture },
@@ -132,7 +132,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 				uniform int bounces;
 				uniform mat4 cameraWorldMatrix;
 				uniform mat4 invProjectionMatrix;
-				uniform sampler2DArray attributeArray;
+				uniform sampler2DArray attributesArray;
 				uniform usampler2D materialIndexAttribute;
 				uniform BVH bvh;
 				uniform float environmentIntensity;
@@ -198,8 +198,8 @@ 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( attributeArray, ATTR_UV, barycoord, faceIndices.xyz ).xy;
-							vec4 vertexColor = textureSampleBarycoord( attributeArray, ATTR_COLOR, barycoord, faceIndices.xyz );
+							vec2 uv = textureSampleBarycoord( attributesArray, ATTR_UV, barycoord, faceIndices.xyz ).xy;
+							vec4 vertexColor = textureSampleBarycoord( attributesArray, ATTR_COLOR, barycoord, faceIndices.xyz );
 
 							uint materialIndex = uTexelFetch1D( materialIndexAttribute, faceIndices.x ).r;
 							Material material = readMaterialInfo( materials, materialIndex );
@@ -537,8 +537,8 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 						}
 
 						// uv coord for textures
-						vec2 uv = textureSampleBarycoord( attributeArray, ATTR_UV, barycoord, faceIndices.xyz ).xy;
-						vec4 vertexColor = textureSampleBarycoord( attributeArray, ATTR_COLOR, barycoord, faceIndices.xyz );
+						vec2 uv = textureSampleBarycoord( attributesArray, ATTR_UV, barycoord, faceIndices.xyz ).xy;
+						vec4 vertexColor = textureSampleBarycoord( attributesArray, ATTR_COLOR, barycoord, faceIndices.xyz );
 
 						// albedo
 						vec4 albedo = vec4( material.color, material.opacity );
@@ -595,7 +595,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 
 						// fetch the interpolated smooth normal
 						vec3 normal = normalize( textureSampleBarycoord(
-							attributeArray,
+							attributesArray,
 							ATTR_NORMAL,
 							barycoord,
 							faceIndices.xyz
@@ -642,7 +642,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 						if ( material.normalMap != - 1 ) {
 
 							vec4 tangentSample = textureSampleBarycoord(
-								attributeArray,
+								attributesArray,
 								ATTR_TANGENT,
 								barycoord,
 								faceIndices.xyz
@@ -690,7 +690,7 @@ export class PhysicalPathTracingMaterial extends MaterialBase {
 						if ( material.clearcoatNormalMap != - 1 ) {
 
 							vec4 tangentSample = textureSampleBarycoord(
-								attributeArray,
+								attributesArray,
 								ATTR_TANGENT,
 								barycoord,
 								faceIndices.xyz
