Merge pull request #1458 from actnwit/fix/forward-render-pipeline-ton…

…emap fix: forward render pipeline tonemap
actnwit · Jul 6, 2024 · ea98d26 · ea98d26
2 parents e5423da + 92fc68c
commit ea98d26
Show file tree

Hide file tree

Showing 54 changed files with 4 additions and 3 deletions.
diff --git a/config/test/jest-puppeteer.config.js b/config/test/jest-puppeteer.config.js
@@ -3,11 +3,12 @@ module.exports = {
     command: 'node server.js',
     port: 8082, // jest-puppeteer waits until this port respond before starting the tests. 5000 is the default port of serve
     usedPortAction: 'error', // If the port is used, stop everything
-    launchTimeout: 10000, // Wait 5 secs max before timing out
+    launchTimeout: 10000,
   },
   launch: {
     headless: 'new',
     devtools: false,
+    protocolTimeout: 2000000,
     // dumpio: true,
     // executablePath: "/Applications/Chromium.app/Contents/MacOS/Chromium", // Try this if you got error in Mac
     // executablePath: "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome", // Try this if you got error in Mac

diff --git a/...snapshots__/test-js-regression-test-data-texture-instanced-drawing-2-1-snap.png b/...snapshots__/test-js-regression-test-data-texture-instanced-drawing-2-1-snap.png
diff --git a/...kseerTest/__image_snapshots__/test-js-regression-test-effekseer-test-1-snap.png b/...kseerTest/__image_snapshots__/test-js-regression-test-effekseer-test-1-snap.png
diff --git a/samples/test_e2e/FXAA/__image_snapshots__/test-js-regression-test-fxaa-1-snap.png b/samples/test_e2e/FXAA/__image_snapshots__/test-js-regression-test-fxaa-1-snap.png
diff --git a/...ussianBlur/__image_snapshots__/test-js-regression-test-gaussian-blur-1-snap.png b/...ussianBlur/__image_snapshots__/test-js-regression-test-gaussian-blur-1-snap.png
diff --git a/...Importer/__image_snapshots__/test-js-regression-test-gltf-2-importer-1-snap.png b/...Importer/__image_snapshots__/test-js-regression-test-gltf-2-importer-1-snap.png
diff --git a/...e_snapshots__/test-js-regression-test-gltf-importer-alpha-blend-mode-1-snap.png b/...e_snapshots__/test-js-regression-test-gltf-importer-alpha-blend-mode-1-snap.png
diff --git a/..._/test-js-regression-test-gltf-importer-animation-in-second-bin-file-1-snap.png b/..._/test-js-regression-test-gltf-importer-animation-in-second-bin-file-1-snap.png
diff --git a/...ge_snapshots__/test-js-regression-test-gltf-importer-draco-extension-1-snap.png b/...ge_snapshots__/test-js-regression-test-gltf-importer-draco-extension-1-snap.png
diff --git a/...s-gltf-importer-forward-render-pipeline-a-beautiful-game-datatexture-1-snap.png b/...s-gltf-importer-forward-render-pipeline-a-beautiful-game-datatexture-1-snap.png
diff --git a/...st-js-gltf-importer-forward-render-pipeline-a-beautiful-game-uniform-1-snap.png b/...st-js-gltf-importer-forward-render-pipeline-a-beautiful-game-uniform-1-snap.png
diff --git a/...est-js-gltf-importer-forward-render-pipeline-a-beautiful-game-webgpu-1-snap.png b/...est-js-gltf-importer-forward-render-pipeline-a-beautiful-game-webgpu-1-snap.png
diff --git a/...f-importer-forward-render-pipeline-alpha-blend-mode-test-datatexture-1-snap.png b/...f-importer-forward-render-pipeline-alpha-blend-mode-test-datatexture-1-snap.png
diff --git a/...-gltf-importer-forward-render-pipeline-alpha-blend-mode-test-uniform-1-snap.png b/...-gltf-importer-forward-render-pipeline-alpha-blend-mode-test-uniform-1-snap.png
diff --git a/...s-gltf-importer-forward-render-pipeline-alpha-blend-mode-test-webgpu-1-snap.png b/...s-gltf-importer-forward-render-pipeline-alpha-blend-mode-test-webgpu-1-snap.png
diff --git a/...ltf-importer-forward-render-pipeline-animated-morph-cube-datatexture-1-snap.png b/...ltf-importer-forward-render-pipeline-animated-morph-cube-datatexture-1-snap.png
diff --git a/...js-gltf-importer-forward-render-pipeline-animated-morph-cube-uniform-1-snap.png b/...js-gltf-importer-forward-render-pipeline-animated-morph-cube-uniform-1-snap.png
diff --git a/...-js-gltf-importer-forward-render-pipeline-animated-morph-cube-webgpu-1-snap.png b/...-js-gltf-importer-forward-render-pipeline-animated-morph-cube-webgpu-1-snap.png
diff --git a/...tf-importer-forward-render-pipeline-anisotropy-barn-lamp-datatexture-1-snap.png b/...tf-importer-forward-render-pipeline-anisotropy-barn-lamp-datatexture-1-snap.png
diff --git a/...s-gltf-importer-forward-render-pipeline-anisotropy-barn-lamp-uniform-1-snap.png b/...s-gltf-importer-forward-render-pipeline-anisotropy-barn-lamp-uniform-1-snap.png
diff --git a/...js-gltf-importer-forward-render-pipeline-anisotropy-barn-lamp-webgpu-1-snap.png b/...js-gltf-importer-forward-render-pipeline-anisotropy-barn-lamp-webgpu-1-snap.png
diff --git a/...tf-importer-forward-render-pipeline-anisotropy-disc-test-datatexture-1-snap.png b/...tf-importer-forward-render-pipeline-anisotropy-disc-test-datatexture-1-snap.png
diff --git a/...s-gltf-importer-forward-render-pipeline-anisotropy-disc-test-uniform-1-snap.png b/...s-gltf-importer-forward-render-pipeline-anisotropy-disc-test-uniform-1-snap.png
diff --git a/...js-gltf-importer-forward-render-pipeline-anisotropy-disc-test-webgpu-1-snap.png b/...js-gltf-importer-forward-render-pipeline-anisotropy-disc-test-webgpu-1-snap.png
diff --git a/...rter-forward-render-pipeline-iridescent-dish-with-olives-datatexture-1-snap.png b/...rter-forward-render-pipeline-iridescent-dish-with-olives-datatexture-1-snap.png
diff --git a/...importer-forward-render-pipeline-iridescent-dish-with-olives-uniform-1-snap.png b/...importer-forward-render-pipeline-iridescent-dish-with-olives-uniform-1-snap.png
diff --git a/...-importer-forward-render-pipeline-iridescent-dish-with-olives-webgpu-1-snap.png b/...-importer-forward-render-pipeline-iridescent-dish-with-olives-webgpu-1-snap.png
diff --git a/...mage_snapshots__/test-js-regression-test-gltf-importer-ibl-1-webgl-2-1-snap.png b/...mage_snapshots__/test-js-regression-test-gltf-importer-ibl-1-webgl-2-1-snap.png
diff --git a/...bl-1/__image_snapshots__/test-js-regression-test-gltf-importer-ibl-1-1-snap.png b/...bl-1/__image_snapshots__/test-js-regression-test-gltf-importer-ibl-1-1-snap.png
diff --git a/...bl-2/__image_snapshots__/test-js-regression-test-gltf-importer-ibl-2-1-snap.png b/...bl-2/__image_snapshots__/test-js-regression-test-gltf-importer-ibl-2-1-snap.png
diff --git a/...mage_snapshots__/test-js-regression-test-gltf-importer-ibl-clearcoat-1-snap.png b/...mage_snapshots__/test-js-regression-test-gltf-importer-ibl-clearcoat-1-snap.png
diff --git a/...shots__/test-js-regression-test-gltf-importer-ibl-metallic-roughness-1-snap.png b/...shots__/test-js-regression-test-gltf-importer-ibl-metallic-roughness-1-snap.png
diff --git a/...V/__image_snapshots__/test-js-regression-test-gltf-importer-multi-uv-1-snap.png b/...V/__image_snapshots__/test-js-regression-test-gltf-importer-multi-uv-1-snap.png
diff --git a/...image_snapshots__/test-js-regression-test-gltf-importer-orbit-moving-1-snap.png b/...image_snapshots__/test-js-regression-test-gltf-importer-orbit-moving-1-snap.png
diff --git a/...ge_snapshots__/test-js-regression-test-gltf-importer-skinning-mat-44-1-snap.png b/...ge_snapshots__/test-js-regression-test-gltf-importer-skinning-mat-44-1-snap.png
diff --git a/...e_snapshots__/test-js-regression-test-gltf-importer-skinning-vec-4-1-1-snap.png b/...e_snapshots__/test-js-regression-test-gltf-importer-skinning-vec-4-1-1-snap.png
diff --git a/...e_snapshots__/test-js-regression-test-gltf-importer-skinning-vec-4-2-1-snap.png b/...e_snapshots__/test-js-regression-test-gltf-importer-skinning-vec-4-2-1-snap.png
diff --git a/...ge_snapshots__/test-js-regression-test-gltf-importer-sparse-accessor-1-snap.png b/...ge_snapshots__/test-js-regression-test-gltf-importer-sparse-accessor-1-snap.png
diff --git a/...e_snapshots__/test-js-regression-test-gltf-importer-specify-no-light-1-snap.png b/...e_snapshots__/test-js-regression-test-gltf-importer-specify-no-light-1-snap.png
diff --git a/...e_snapshots__/test-js-regression-test-gltf-importer-texture-settings-1-snap.png b/...e_snapshots__/test-js-regression-test-gltf-importer-texture-settings-1-snap.png
diff --git a/..._snapshots__/test-js-regression-test-gltf-importer-texture-transform-1-snap.png b/..._snapshots__/test-js-regression-test-gltf-importer-texture-transform-1-snap.png
diff --git a/...js-regression-test-gltf-importer-walk-through-fixed-direction-moving-1-snap.png b/...js-regression-test-gltf-importer-walk-through-fixed-direction-moving-1-snap.png
diff --git a/...tfImporter/__image_snapshots__/test-js-regression-test-gltf-importer-1-snap.png b/...tfImporter/__image_snapshots__/test-js-regression-test-gltf-importer-1-snap.png
diff --git a/.../test_e2e/MatCap/__image_snapshots__/test-js-regression-test-mat-cap-1-snap.png b/.../test_e2e/MatCap/__image_snapshots__/test-js-regression-test-mat-cap-1-snap.png
diff --git a/...e2e/MultiPass/__image_snapshots__/test-js-regression-test-multi-pass-1-snap.png b/...e2e/MultiPass/__image_snapshots__/test-js-regression-test-multi-pass-1-snap.png
diff --git a/...gTest/__image_snapshots__/test-js-regression-test-pixel-picking-test-1-snap.png b/...gTest/__image_snapshots__/test-js-regression-test-pixel-picking-test-1-snap.png
diff --git a/...2e/Primitives/__image_snapshots__/test-js-regression-test-primitives-1-snap.png b/...2e/Primitives/__image_snapshots__/test-js-regression-test-primitives-1-snap.png
diff --git a/...de/__image_snapshots__/test-js-regression-test-shadow-map-debug-mode-1-snap.png b/...de/__image_snapshots__/test-js-regression-test-shadow-map-debug-mode-1-snap.png
diff --git a/...ance/__image_snapshots__/test-js-regression-test-shadow-map-variance-1-snap.png b/...ance/__image_snapshots__/test-js-regression-test-shadow-map-variance-1-snap.png
diff --git a/...s/test_e2e/Simple/__image_snapshots__/test-js-regression-test-simple-1-snap.png b/...s/test_e2e/Simple/__image_snapshots__/test-js-regression-test-simple-1-snap.png
diff --git a/...MAnimation/__image_snapshots__/test-js-regression-test-vrm-animation-1-snap.png b/...MAnimation/__image_snapshots__/test-js-regression-test-vrm-animation-1-snap.png
diff --git a/...VRMImporter/__image_snapshots__/test-js-regression-test-vrm-importer-1-snap.png b/...VRMImporter/__image_snapshots__/test-js-regression-test-vrm-importer-1-snap.png
diff --git a/src/foundation/helpers/MaterialHelper.ts b/src/foundation/helpers/MaterialHelper.ts
@@ -987,7 +987,7 @@ function createToneMappingMaterial({ additionalName = '', maxInstancesNumber = 1
   });
   materialNode.isSingleOperation = true;
   const material = createMaterial(materialName, materialNode, maxInstancesNumber);
-  material.addShaderDefine('RN_USE_KHRONOS_PBR_NEUTRAL');
+  material.addShaderDefine('RN_USE_GT_TONEMAP');
 
   return material;
 }

diff --git a/src/foundation/renderer/pipelines/ForwardRenderPipeline.ts b/src/foundation/renderer/pipelines/ForwardRenderPipeline.ts
@@ -114,7 +114,7 @@ export class ForwardRenderPipeline extends RnObject {
   private __oDiffuseCubeTexture: IOption<CubeTexture> = new None();
   private __oSpecularCubeTexture: IOption<CubeTexture> = new None();
   private __oSamplerForBackBuffer: IOption<Sampler> = new None();
-  private __toneMappingType = ToneMappingType.KhronosPbrNeutral;
+  private __toneMappingType = ToneMappingType.GT_ToneMap;
 
   constructor() {
     super();