From 57b48e07196d669efa6168d6ea109f9e2dcb2a5f Mon Sep 17 00:00:00 2001 From: Pixelflinger Date: Thu, 21 Nov 2019 22:21:19 -0800 Subject: [PATCH] address reviewers comments - get rid of "thin layer thickness" property - make absorption a vec3 --- .../filabridge/include/filament/MaterialEnums.h | 5 ++--- libs/filamat/src/Enums.cpp | 1 - libs/filamat/src/shaders/CodeGenerator.cpp | 1 - libs/filamat/tests/test_filamat.cpp | 4 +--- shaders/src/material_inputs.fs | 17 +++++++++++++++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libs/filabridge/include/filament/MaterialEnums.h b/libs/filabridge/include/filament/MaterialEnums.h index d52e070bf4..9e97ce81b4 100644 --- a/libs/filabridge/include/filament/MaterialEnums.h +++ b/libs/filabridge/include/filament/MaterialEnums.h @@ -153,7 +153,7 @@ enum MaterialDomain : uint8_t { // can't really use std::underlying_type::type because the driver takes a uint32_t using AttributeBitset = utils::bitset32; -static constexpr size_t MATERIAL_PROPERTIES_COUNT = 24; +static constexpr size_t MATERIAL_PROPERTIES_COUNT = 23; enum class Property : uint8_t { BASE_COLOR, // float4, all shading models ROUGHNESS, // float, lit shading models only @@ -176,9 +176,8 @@ enum class Property : uint8_t { POST_LIGHTING_COLOR, // float4, all shading models CLIP_SPACE_TRANSFORM, // mat4, vertex shader only IOR, // float, index of refraction (activate refraction) - ABSORPTION, // float, how much light is absorbed by the material + ABSORPTION, // float3, how much light is absorbed by the material TRANSMISSION, // float, how much light is refracted through the material - THIN_LAYER_THICKNESS, // float, thin layer thickness // when adding new Properties, make sure to update MATERIAL_PROPERTIES_COUNT diff --git a/libs/filamat/src/Enums.cpp b/libs/filamat/src/Enums.cpp index 7918c9e86b..306a4a6620 100644 --- a/libs/filamat/src/Enums.cpp +++ b/libs/filamat/src/Enums.cpp @@ -44,7 +44,6 @@ std::unordered_map Enums::mStringToProperty = { { "ior", Property::IOR }, { "absorption", Property::ABSORPTION }, { "transmission", Property::TRANSMISSION }, - { "thin_layer_thickness",Property::THIN_LAYER_THICKNESS }, }; template <> diff --git a/libs/filamat/src/shaders/CodeGenerator.cpp b/libs/filamat/src/shaders/CodeGenerator.cpp index c81d36891b..b6c7564433 100644 --- a/libs/filamat/src/shaders/CodeGenerator.cpp +++ b/libs/filamat/src/shaders/CodeGenerator.cpp @@ -550,7 +550,6 @@ char const* CodeGenerator::getConstantName(MaterialBuilder::Property property) n case Property::IOR: return "IOR"; case Property::ABSORPTION: return "ABSORPTION"; case Property::TRANSMISSION: return "TRANSMISSION"; - case Property::THIN_LAYER_THICKNESS: return "THIN_LAYER_THICKNESS"; } } diff --git a/libs/filamat/tests/test_filamat.cpp b/libs/filamat/tests/test_filamat.cpp index 9b41ec145b..fbe6005a61 100644 --- a/libs/filamat/tests/test_filamat.cpp +++ b/libs/filamat/tests/test_filamat.cpp @@ -419,9 +419,8 @@ TEST_F(MaterialCompiler, StaticCodeAnalyzerIor) { void material(inout MaterialInputs material) { prepareMaterial(material); material.ior = 1.5; - material.absorption = 0.0; + material.absorption = vec3(0.0); material.transmission = 0.96; - material.thin_layer_thickness = 0.01; } )"); @@ -434,7 +433,6 @@ TEST_F(MaterialCompiler, StaticCodeAnalyzerIor) { expected[size_t(filamat::MaterialBuilder::Property::IOR)] = true; expected[size_t(filamat::MaterialBuilder::Property::ABSORPTION)] = true; expected[size_t(filamat::MaterialBuilder::Property::TRANSMISSION)] = true; - expected[size_t(filamat::MaterialBuilder::Property::THIN_LAYER_THICKNESS)] = true; EXPECT_TRUE(PropertyListsMatch(expected, properties)); } diff --git a/shaders/src/material_inputs.fs b/shaders/src/material_inputs.fs index b74ef95221..1f80f87119 100644 --- a/shaders/src/material_inputs.fs +++ b/shaders/src/material_inputs.fs @@ -60,9 +60,12 @@ struct MaterialInputs { #if defined(MATERIAL_HAS_IOR) float ior; - float absorption; +#if defined(MATERIAL_HAS_ABSORPTION) + vec3 absorption; +#endif +#if defined(MATERIAL_HAS_TRANSMISSION) float transmission; - float thin_layer_thickness; +#endif #endif }; @@ -118,4 +121,14 @@ void initMaterial(out MaterialInputs material) { #if defined(MATERIAL_HAS_POST_LIGHTING_COLOR) material.postLightingColor = vec4(0.0); #endif + +#if defined(MATERIAL_HAS_IOR) + material.ior = 1.5; +#if defined(MATERIAL_HAS_ABSORPTION) + material.absorption = vec3(0.0); +#endif +#if defined(MATERIAL_HAS_TRANSMISSION) + material.transmission = 0.96; +#endif +#endif }