From 503d7ab6c78fa85fe57eb81036cca620a37742e5 Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Thu, 23 Jun 2011 05:34:16 +0200 Subject: [PATCH] fixes to the previous commit --- src/bsdfs/dielectric.cpp | 4 ++-- src/bsdfs/phong.cpp | 8 ++++---- src/bsdfs/roughglass.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/bsdfs/dielectric.cpp b/src/bsdfs/dielectric.cpp index ea66a71b..43449f4b 100644 --- a/src/bsdfs/dielectric.cpp +++ b/src/bsdfs/dielectric.cpp @@ -45,7 +45,7 @@ public: m_componentCount = 2; m_type = new unsigned int[m_componentCount]; - m_type[0] = EDeltaReflection | EFrontSide; + m_type[0] = EDeltaReflection | EFrontSide | EBackSide; m_type[1] = EDeltaTransmission | EFrontSide | EBackSide; m_combinedType = m_type[0] | m_type[1]; m_usesRayDifferentials = false; @@ -60,7 +60,7 @@ public: m_componentCount = 2; m_type = new unsigned int[m_componentCount]; - m_type[0] = EDeltaReflection | EFrontSide; + m_type[0] = EDeltaReflection | EFrontSide | EBackSide; m_type[1] = EDeltaTransmission | EFrontSide | EBackSide; m_combinedType = m_type[0] | m_type[1]; m_usesRayDifferentials = false; diff --git a/src/bsdfs/phong.cpp b/src/bsdfs/phong.cpp index 80ab54a3..7710f8f6 100644 --- a/src/bsdfs/phong.cpp +++ b/src/bsdfs/phong.cpp @@ -46,8 +46,8 @@ public: m_componentCount = 2; m_type = new unsigned int[m_componentCount]; - m_type[0] = EDeltaReflection | EFrontSide; - m_type[1] = EDeltaTransmission | EFrontSide; + m_type[0] = EDiffuseReflection | EFrontSide; + m_type[1] = EGlossyReflection | EFrontSide; m_combinedType = m_type[0] | m_type[1]; m_usesRayDifferentials = false; } @@ -64,8 +64,8 @@ public: m_componentCount = 2; m_type = new unsigned int[m_componentCount]; - m_type[0] = EDeltaReflection | EFrontSide; - m_type[1] = EDeltaTransmission | EFrontSide; + m_type[0] = EDiffuseReflection | EFrontSide; + m_type[1] = EGlossyReflection | EFrontSide; m_combinedType = m_type[0] | m_type[1]; m_usesRayDifferentials = m_diffuseReflectance->usesRayDifferentials() || diff --git a/src/bsdfs/roughglass.cpp b/src/bsdfs/roughglass.cpp index ccb57893..c7f66c6b 100644 --- a/src/bsdfs/roughglass.cpp +++ b/src/bsdfs/roughglass.cpp @@ -40,8 +40,8 @@ public: m_componentCount = 2; m_type = new unsigned int[m_componentCount]; - m_type[0] = EDeltaReflection | EFrontSide | EBackSide; - m_type[1] = EDeltaTransmission | EFrontSide | EBackSide; + m_type[0] = EGlossyReflection | EFrontSide | EBackSide; + m_type[1] = EGlossyTransmission | EFrontSide | EBackSide; m_combinedType = m_type[0] | m_type[1]; m_usesRayDifferentials = false; } @@ -56,8 +56,8 @@ public: m_componentCount = 2; m_type = new unsigned int[m_componentCount]; - m_type[0] = EDeltaReflection | EFrontSide | EBackSide; - m_type[1] = EDeltaTransmission | EFrontSide | EBackSide; + m_type[0] = EGlossyReflection | EFrontSide | EBackSide; + m_type[1] = EGlossyTransmission | EFrontSide | EBackSide; m_combinedType = m_type[0] | m_type[1]; m_usesRayDifferentials = false; }