feat(architecture): fix baseShaderPath:remove cloud_picture/

Wonder-Technology · Nov 9, 2020 · 3a23f3b · 3a23f3b
1 parent 8a213f5
commit 3a23f3b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/.cz-config.js b/.cz-config.js
@@ -15,6 +15,7 @@ module.exports = {
   ],
 
   scopes: [
+      { name: "architecture" },
       { name: "scene" },
       { name: "gameObject" },
       { name: "transform" },
@@ -32,7 +33,6 @@ module.exports = {
     refactor: [
       { name: "duplication" },
       { name: "rename" },
-      { name: "architecture" },
       { name: "too-much" },
       { name: "dead-code" },
       { name: "type" },

diff --git a/...run/domain_layer/domain/pipeline/pipeline/entity/jobs/init/InitAccumulationCPJobEntity.re b/...run/domain_layer/domain/pipeline/pipeline/entity/jobs/init/InitAccumulationCPJobEntity.re
@@ -110,7 +110,7 @@ let _createAndSetBindGroup =
 };
 
 let _createAndSetPipeline = (device, swapChainFormat, bindGroupLayout) => {
-  let baseShaderPath = "src/run/cloud_picture/domain_layer/domain/shader/accumulation";
+  let baseShaderPath = "src/run/domain_layer/domain/shader/accumulation";
 
   let vertexShaderModule =
     WebGPUCoreDpRunAPI.unsafeGet().device.createShaderModule(

diff --git a/src/run/domain_layer/domain/pipeline/pipeline/entity/jobs/init/InitPathTracingCPJobEntity.re b/src/run/domain_layer/domain/pipeline/pipeline/entity/jobs/init/InitPathTracingCPJobEntity.re
@@ -74,7 +74,7 @@ let _buildDirectionLightBufferData = (device, sceneGameObject) => {
 };
 
 let _createShaderBindingTable = device => {
-  let baseShaderPath = "src/run/cloud_picture/domain_layer/domain/shader/ray_tracing";
+  let baseShaderPath = "src/run/domain_layer/domain/shader/ray_tracing";
 
   let rayGenShaderModule =
     WebGPUCoreDpRunAPI.unsafeGet().device.createShaderModule(

diff --git a/test/run/integration/initAccumulationCPJob_test.re b/test/run/integration/initAccumulationCPJob_test.re
@@ -256,7 +256,7 @@ let _ =
     describe("create pipeline and set to po", () => {
       testPromise("create all shader modules", () => {
         let (window, device, swapChainFormat) = _prepare();
-        let baseShaderPath = "src/run/cloud_picture/domain_layer/domain/shader/accumulation";
+        let baseShaderPath = "src/run/domain_layer/domain/shader/accumulation";
         let buffer = WebGPUDependencyTool.createBufferObject();
         let vertexGLSL = "a1";
         let fragmentGLSL = "a2";
@@ -268,8 +268,7 @@ let _ =
           ->SinonTool.createTwoArgsEmptyStubData;
         WebGPUDependencyTool.build(
           ~sandbox,
-          ~createShaderModule=
-            createShaderModuleStubData->SinonTool.getDpFunc,
+          ~createShaderModule=createShaderModuleStubData->SinonTool.getDpFunc,
           ~loadGLSL,
           (),
         )
@@ -287,10 +286,7 @@ let _ =
                   createShaderModuleStubData
                   ->SinonTool.getStub
                   ->getCall(1, _)
-                  ->SinonTool.calledWithArg2(
-                      {"code": fragmentGLSL},
-                      device,
-                    ),
+                  ->SinonTool.calledWithArg2({"code": fragmentGLSL}, device),
                 ),
                 (
                   loadGLSL
@@ -348,8 +344,7 @@ let _ =
           ->SinonTool.createTwoArgsEmptyStubData;
         WebGPUDependencyTool.build(
           ~sandbox,
-          ~createShaderModule=
-            createShaderModuleStubData->SinonTool.getDpFunc,
+          ~createShaderModule=createShaderModuleStubData->SinonTool.getDpFunc,
           ~createBindGroupLayout=
             createBindGroupLayoutStubData->SinonTool.getDpFunc,
           ~createPipelineLayout=

diff --git a/test/run/integration/initPathTracingCPJob_test.re b/test/run/integration/initPathTracingCPJob_test.re
@@ -58,7 +58,7 @@ let _ =
     describe("create shader binding table and set to po", () => {
       testPromise("create all shader modules", () => {
         let ((device, _), _) = _prepare(sandbox);
-        let baseShaderPath = "src/run/cloud_picture/domain_layer/domain/shader/ray_tracing";
+        let baseShaderPath = "src/run/domain_layer/domain/shader/ray_tracing";
         let buffer = WebGPUDependencyTool.createBufferObject();
         let rayGenGLSL = "a1";
         let rayRChitGLSL = "a2";