feat(cloud-picture): ISceneGraphRepoDp->bsdfMaterialRepo->getDiffuseC…

…olor now return (r,g,b,a) instead of (r,g,b) (fix(cloud-picture): get_hit_shading_data.glsl->alpha now = diffuseMap.a * diffuseColor.a)
Wonder-Technology · Nov 12, 2020 · a7ea7df · a7ea7df
1 parent b3ac205
commit a7ea7df
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 25 deletions.
diff --git a/src/construct/domain_layer/dependency/interface/engine/SceneGraphRepoType.re b/src/construct/domain_layer/dependency/interface/engine/SceneGraphRepoType.re
@@ -28,6 +28,8 @@ type normalMatrix = Js.Typed_array.Float32Array.t;
 
 type color3 = (float, float, float);
 
+type color4 = (float, float, float, float);
+
 type intensity = float;
 
 type direction = (float, float, float);
@@ -44,7 +46,7 @@ type viewWorldToCameraMatrix = Js.Typed_array.Float32Array.t;
 
 type projectionMatrix = Js.Typed_array.Float32Array.t;
 
-type diffuse = color3;
+type diffuse = color4;
 
 type specularColor = color3;
 

diff --git a/...main_layer/domain/scene/scene_graph/service/bsdf_material/OperateBSDFMaterialDoService.re b/...main_layer/domain/scene/scene_graph/service/bsdf_material/OperateBSDFMaterialDoService.re
@@ -2,7 +2,7 @@ let getDiffuseColor = material =>
   DpContainer.unsafeGetBSDFMaterialRepoDp().getDiffuseColor(
     material->BSDFMaterialEntity.value,
   )
-  ->Color3VO.create
+  ->Color4VO.create
   ->DiffuseVO.create;
 
 let getSpecular = material =>

diff --git a/src/construct/domain_layer/domain/scene/scene_graph/value_object/Color4VO.re b/src/construct/domain_layer/domain/scene/scene_graph/value_object/Color4VO.re
@@ -0,0 +1,9 @@
+type t =
+  | Color4(SceneGraphRepoType.color4);
+
+let create = value => Color4(value);
+
+let value = color =>
+  switch (color) {
+  | Color4(value) => value
+  };
diff --git a/src/construct/domain_layer/domain/scene/scene_graph/value_object/DiffuseVO.re b/src/construct/domain_layer/domain/scene/scene_graph/value_object/DiffuseVO.re
@@ -1,5 +1,5 @@
 type t =
-  | Diffuse(Color3VO.t);
+  | Diffuse(Color4VO.t);
 
 let create = value => Diffuse(value);
 
@@ -8,4 +8,4 @@ let value = color =>
   | Diffuse(value) => value
   };
 
-let getPrimitiveValue = color => color->value->Color3VO.value;
+let getPrimitiveValue = color => color->value->Color4VO.value;
diff --git a/.../domain_layer/domain/pipeline/pipeline/entity/jobs/update/UpdatePathTracingCPJobEntity.re b/.../domain_layer/domain/pipeline/pipeline/entity/jobs/update/UpdatePathTracingCPJobEntity.re
@@ -569,17 +569,17 @@ let _buildAndSetBSDFMaterialBufferData = (device, allRenderBSDFMaterials) => {
               ),
             ) => {
             ListResult.mergeResults([
-              TypeArrayCPRepoUtils.setFloat3(offset + 0, diffuse, bufferData),
-              TypeArrayCPRepoUtils.setFloat1(
-                offset + 3,
-                alphaCutoff,
-                bufferData,
-              ),
+              TypeArrayCPRepoUtils.setFloat4(offset + 0, diffuse, bufferData),
               TypeArrayCPRepoUtils.setFloat3(
                 offset + 4,
                 specularColor,
                 bufferData,
               ),
+              TypeArrayCPRepoUtils.setFloat1(
+                offset + 7,
+                alphaCutoff,
+                bufferData,
+              ),
               TypeArrayCPRepoUtils.setFloat4(
                 offset + 8,
                 (metalness, roughness, specular, transmission),

diff --git a/src/run/domain_layer/domain/shader/ray_tracing/get_hit_shading_data.glsl b/src/run/domain_layer/domain/shader/ray_tracing/get_hit_shading_data.glsl
@@ -25,9 +25,9 @@ struct PointIndexData {
 };
 
 struct BSDFMaterial {
-  vec4 diffuseAndAlphaCutoff;
+  vec4 diffuse;
 
-  vec4 specularColor;
+  vec4 specularColorAndAlphaCutoff;
 
   float metalness;
   float roughness;
@@ -243,7 +243,7 @@ HitShadingData getHitShadingData(uint instanceIndex, uint primitiveIndex) {
 
   HitShadingData data;
 
-  float alphaCutoff = mat.diffuseAndAlphaCutoff.w;
+  float alphaCutoff = mat.specularColorAndAlphaCutoff.w;
   float alpha = 1.0;
 
   if (_hasMap(diffuseMapLayerIndex)) {
@@ -254,13 +254,13 @@ HitShadingData getHitShadingData(uint instanceIndex, uint primitiveIndex) {
                      diffuseMapLayerIndex));
 
     data.materialDiffuse =
-        convertSRGBToLinear(diffuseMapData.rgb) * mat.diffuseAndAlphaCutoff.xyz;
+        convertSRGBToLinear(diffuseMapData.rgb) * mat.diffuse.rgb;
 
-    alpha = diffuseMapData.a;
+    alpha = diffuseMapData.a * mat.diffuse.a;
   } else {
-    data.materialDiffuse = mat.diffuseAndAlphaCutoff.xyz;
+    data.materialDiffuse = mat.diffuse.rgb;
 
-    alpha = 1.0;
+    alpha = mat.diffuse.a;
   }
 
   if (_hasMap(specularMapLayerIndex)) {
@@ -270,12 +270,12 @@ HitShadingData getHitShadingData(uint instanceIndex, uint primitiveIndex) {
                          mat.specularMapScale,
                      specularMapLayerIndex));
 
-    data.materialSpecularColor =
-        convertSRGBToLinear(specularMap.rgb) * vec3(mat.specularColor);
+    data.materialSpecularColor = convertSRGBToLinear(specularMap.rgb) *
+                                 mat.specularColorAndAlphaCutoff.xyz;
 
     data.materialSpecular = specularMap.a * mat.specular;
   } else {
-    data.materialSpecularColor = vec3(mat.specularColor);
+    data.materialSpecularColor = mat.specularColorAndAlphaCutoff.xyz;
     data.materialSpecular = mat.specular;
   }
 

diff --git a/test/run/integration/updatePathTracingCPJob_test.re b/test/run/integration/updatePathTracingCPJob_test.re
@@ -1281,7 +1281,6 @@ let _ =
               ((geometry1, geometry2), (material1, material2)),
             ) =
               _prepare();
-            // let _ = BSDFMaterialCPTool.setMapData(material1, material2);
             TextureArrayCPTool.setMapBetweenAllUsedImageIdToLayerIndex();
             let (textureArrayLayerWidth, textureArrayLayerHeight) = (8, 8);
             WebGPUDependencyTool.build(
@@ -1301,7 +1300,7 @@ let _ =
                        1.,
                        0.,
                        0.,
-                       0.,
+                       1.,
                        0.5,
                        0.,
                        0.,
@@ -1349,7 +1348,7 @@ let _ =
                        0.5,
                        1.,
                        0.,
-                       0.,
+                       0.5,
                        2.,
                        1.5,
                        1.,

diff --git a/test/run/tool/BSDFMaterialCPTool.re b/test/run/tool/BSDFMaterialCPTool.re
@@ -4,8 +4,8 @@ let buildRepoWithTwoMaterialsAndMapData = sandbox => {
   let material1 = 2->Obj.magic;
   let material2 = 3->Obj.magic;
 
-  let diffuseColor1 = (1., 0., 0.);
-  let diffuseColor2 = (0., 1., 0.);
+  let diffuseColor1 = (1., 0., 0., 1.);
+  let diffuseColor2 = (0., 1., 0., 0.5);
   let alphaCutoff1 = 0.0;
   let alphaCutoff2 = 0.5;
   let specular1 = 0.5;