Align OpenPBR material parameters

StuckiSimon · Aug 28, 2024 · 19170c2 · 19170c2
1 parent d213769
commit 19170c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/strahl-lib/src/buffers/material-buffer.ts b/strahl-lib/src/buffers/material-buffer.ts
@@ -49,18 +49,17 @@ export function generateMaterialBuffer(
         specularColor: m.oSpecularColor,
         specularRoughness: m.oSpecularRoughness,
         specularAnisotropy: m.oSpecularRoughnessAnisotropy,
-        specularIor: m.oSpecularIOR,
+        specularIor: m.oSpecularIor,
         coatWeight: m.oCoatWeight,
         coatColor: m.oCoatColor,
         coatRoughness: m.oCoatRoughness,
         coatRoughnessAnisotropy: m.oCoatRoughnessAnisotropy,
-        // todo: Align casing for IOR parameter
         coatIor: m.oCoatIor,
         coatDarkening: m.oCoatDarkening,
         emissionLuminance: m.oEmissionLuminance,
         emissionColor: m.oEmissionColor,
         thinFilmThickness: m.oThinFilmThickness,
-        thinFilmIOR: m.oThinFilmIOR,
+        thinFilmIor: m.oThinFilmIor,
       };
     }),
   );

diff --git a/strahl-lib/src/openpbr-material.ts b/strahl-lib/src/openpbr-material.ts
@@ -10,7 +10,8 @@ export class OpenPBRMaterial {
   oSpecularColor: Color = [1.0, 1.0, 1.0];
   oSpecularRoughness: number = 0.3;
   oSpecularRoughnessAnisotropy: number = 0.0;
-  oSpecularIOR: number = 1.5;
+  oSpecularIor: number = 1.5;
+  // NOTE: Coat workflow is not yet supported by the renderer
   oCoatWeight: number = 0.0;
   oCoatColor: Color = [1.0, 1.0, 1.0];
   oCoatRoughness: number = 0.0;
@@ -19,9 +20,9 @@ export class OpenPBRMaterial {
   oCoatDarkening: number = 1.0;
   oEmissionLuminance: number = 0.0;
   oEmissionColor: Color = [1.0, 1.0, 1.0];
-  // todo: add oThinFilmWeight
+  // NOTE: Thin-film workflow is not yet supported by the renderer
   oThinFilmThickness: number = 0.5;
-  oThinFilmIOR: number = 1.5;
+  oThinFilmIor: number = 1.5;
 }
 
 /**

diff --git a/strahl-lib/src/shaders/denoise-pass-shader.ts b/strahl-lib/src/shaders/denoise-pass-shader.ts
@@ -33,7 +33,7 @@ struct Material {
   emissionLuminance: f32,
   emissionColor: Color,
   thinFilmThickness: f32,
-  thinFilmIOR: f32,
+  thinFilmIor: f32,
 }
 
 struct UniformData {

diff --git a/strahl-lib/src/shaders/tracer-shader.ts b/strahl-lib/src/shaders/tracer-shader.ts
@@ -29,7 +29,7 @@ struct Material {
   emissionLuminance: f32,
   emissionColor: Color,
   thinFilmThickness: f32,
-  thinFilmIOR: f32,
+  thinFilmIor: f32,
 }
 
 struct UniformData {
@@ -212,7 +212,7 @@ struct FresnelData {
   F90: vec3f,
   exponent: f32,
   thinFilmThickness: f32,
-  thinFilmIOR: f32,
+  thinFilmIor: f32,
   refraction: bool,
 }