Merge pull request #155 from shadielhajj/bugfix

patriciogonzalezvivo · Jul 6, 2024 · 0d4aec1 · 0d4aec1
2 parents 9429528 + cd17147
commit 0d4aec1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/color/mixOklab.hlsl b/color/mixOklab.hlsl
@@ -29,8 +29,8 @@ float3 mixOklab( float3 colA, float3 colB, float h ) {
     colB = srgb2rgb(colB);
     #endif
 
-    float3 lmsA = pow( mul(RGB2OKLAB_B, colA), float3(0.33333) );
-    float3 lmsB = pow( mul(RGB2OKLAB_B, colB), float3(0.33333) );
+    float3 lmsA = pow(mul(RGB2OKLAB_B, colA), float3(0.33333, 0.33333, 0.33333));
+    float3 lmsB = pow(mul(RGB2OKLAB_B, colB), float3(0.33333, 0.33333, 0.33333));
     float3 lms = lerp( lmsA, lmsB, h );
 
     // cone to rgb
@@ -44,6 +44,6 @@ float3 mixOklab( float3 colA, float3 colB, float h ) {
 }
 
 float4 mixOklab( float4 colA, float4 colB, float h ) {
-    return float4( mixOklab(colA.rgb, colB.rgb, h), mix(colA.a, colB.a, h) );
+    return float4( mixOklab(colA.rgb, colB.rgb, h), lerp(colA.a, colB.a, h) );
 }
 #endif
diff --git a/color/space/rgb2oklab.hlsl b/color/space/rgb2oklab.hlsl
@@ -24,7 +24,7 @@ const float3x3 RGB2OKLAB_B = float3x3(
 #define FNC_RGB2OKLAB
 float3 rgb2oklab(float3 rgb) {
     float3 lms = mul(RGB2OKLAB_B, rgb);
-    return mul(RGB2OKLAB_A, sign(lms)*pow(abs(lms), float3(0.3333333333333)));
+    return mul(RGB2OKLAB_A, sign(lms) * pow(abs(lms), float3(0.3333333333333, 0.3333333333333, 0.3333333333333)));
 
 }
 float4 rgb2oklab(float4 rgb) { return float4(rgb2oklab(rgb.rgb), rgb.a); }

diff --git a/lighting/pbrClearCoat.hlsl b/lighting/pbrClearCoat.hlsl
@@ -1,6 +1,8 @@
 #include "material.hlsl"
 #include "fresnelReflection.hlsl"
 #include "light/point.hlsl"
+#include "light/new.hlsl"
+#include "light/resolve.hlsl"
 #include "light/directional.hlsl"
 #include "envMap.hlsl"