From b605c5e9377995dc415e770aa8c41146bb2a68f4 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Fri, 29 Jul 2011 01:56:36 +0200
Subject: [PATCH] A few more cosines to get straight

---
 src/bsdfs/coating.cpp | 19 ++++++++++---------
 src/bsdfs/hk.cpp      |  3 +--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/bsdfs/coating.cpp b/src/bsdfs/coating.cpp
index 8f8cf2e3..6a2ab7e8 100644
--- a/src/bsdfs/coating.cpp
+++ b/src/bsdfs/coating.cpp
@@ -255,8 +255,9 @@ public:
 			if (measure == ESolidAngle) {
 				Float eta = m_extIOR / m_intIOR;
 				/* Solid angle compression & irradiance conversion factors */
-				result *= eta * eta * std::abs(Frame::cosTheta(bRec.wi)
-				     / Frame::cosTheta(bRecInt.wi));
+				result *= eta * eta * 
+					  Frame::cosTheta(bRec.wi) * Frame::cosTheta(bRec.wo)
+				   / (Frame::cosTheta(bRecInt.wi) * Frame::cosTheta(bRecInt.wo));
 			}
 
 			return result;
@@ -295,8 +296,8 @@ public:
 
 			if (measure == ESolidAngle) {
 				Float eta = m_extIOR / m_intIOR;
-				pdf *= eta * eta * std::abs(Frame::cosTheta(bRec.wo)
-			          / Frame::cosTheta(bRecInt.wo));
+				pdf *= eta * eta * Frame::cosTheta(bRec.wo)
+			          / Frame::cosTheta(bRecInt.wo);
 			}
 
 
@@ -371,13 +372,13 @@ public:
 			result *= (1 - R12) * (1 - R21);
 
 			if (BSDF::getMeasure(bRec.sampledType) == ESolidAngle) {
-				Float eta = m_extIOR / m_intIOR, etaSqr = eta*eta;
 				/* Solid angle compression & irradiance conversion factors */
-			
+				Float eta = m_extIOR / m_intIOR, etaSqr = eta*eta;
+				Float temp = Frame::cosTheta(bRec.wo) / Frame::cosTheta(woPrime);
+	
 				result *= etaSqr *
-					std::abs(Frame::cosTheta(bRec.wi) / Frame::cosTheta(wiPrime));
-				pdf *= etaSqr *
-					std::abs(Frame::cosTheta(bRec.wo) / Frame::cosTheta(woPrime));
+					Frame::cosTheta(bRec.wi) / Frame::cosTheta(wiPrime) * temp;
+				pdf *= etaSqr * temp;
 			}
 
 
diff --git a/src/bsdfs/hk.cpp b/src/bsdfs/hk.cpp
index df12b946..b5ddd238 100644
--- a/src/bsdfs/hk.cpp
+++ b/src/bsdfs/hk.cpp
@@ -215,9 +215,8 @@ public:
 						((-tauD/std::abs(cosThetaI)).exp() - (-tauD/std::abs(cosThetaO)).exp());
 				}
 			}
+			return result * std::abs(cosThetaO);
 		}
-
-
 		return result;
 	}