Add support for linear colors (#15791)

BabylonJS · Nov 8, 2024 · 5fbce3b · 5fbce3b
1 parent ae0d771
commit 5fbce3b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/packages/dev/core/src/Layers/layer.ts b/packages/dev/core/src/Layers/layer.ts
@@ -94,6 +94,11 @@ export class Layer {
      */
     public renderOnlyInRenderTargetTextures = false;
 
+    /**
+     * Define if the colors of the layer should be generated in linear space (default: false)
+     */
+    public convertToLinearSpace = false;
+
     /**
      * Define if the layer is enabled (ie. should be displayed). Default: true
      */
@@ -263,8 +268,14 @@ export class Layer {
             defines = "#define ALPHATEST";
         }
 
-        if (this.texture && !this.texture.gammaSpace) {
-            defines += "\n#define LINEAR";
+        if (this.texture) {
+            if (this.texture.gammaSpace) {
+                if (this.convertToLinearSpace) {
+                    defines += "\n#define CONVERT_TO_LINEAR";
+                }
+            } else if (!this.convertToLinearSpace) {
+                defines += "\n#define CONVERT_TO_GAMMA";
+            }
         }
 
         if (this._previousDefines !== defines) {

diff --git a/packages/dev/core/src/Shaders/layer.fragment.fx b/packages/dev/core/src/Shaders/layer.fragment.fx
@@ -17,8 +17,10 @@ void main(void) {
 
 	vec4 baseColor = texture2D(textureSampler, vUV);
 
-#ifdef LINEAR
+#if defined(CONVERT_TO_GAMMA)
 	baseColor.rgb = toGammaSpace(baseColor.rgb);
+#elif defined(CONVERT_TO_LINEAR)
+	baseColor.rgb = toLinearSpace(baseColor.rgb);
 #endif
 
 #ifdef ALPHATEST

diff --git a/packages/dev/core/src/ShadersWGSL/layer.fragment.fx b/packages/dev/core/src/ShadersWGSL/layer.fragment.fx
@@ -18,8 +18,10 @@ fn main(input: FragmentInputs) -> FragmentOutputs {
 
 	var baseColor: vec4f = textureSample(textureSampler, textureSamplerSampler, input.vUV);
 
-#ifdef LINEAR
-	baseColor = vec4f(toGammaSpace(baseColor.rgb), baseColor.a);
+#if defined(CONVERT_TO_GAMMA)
+	baseColor = toGammaSpace(baseColor);
+#elif defined(CONVERT_TO_LINEAR)
+	baseColor = toLinearSpaceVec4(baseColor);
 #endif
 
 #ifdef ALPHATEST