mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flake model bugfixes

metadata
Wenzel Jakob 2010-11-30 21:56:21 +01:00
parent 4625fa6241
commit 052f5f0bb8
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mitsuba/core/shvector4d.h
View File

@ -27,7 +27,7 @@ MTS_NAMESPACE_BEGIN
* \brief Stores a 4D function f(wi, wo) (such as a BRDF or phase function)
* using a 2D table of spherical harmonics expansions.
*
* Discretizaiton occurs in the 'wi' space. Lookups interpolate amongst
* Discretization occurs in the 'wi' space. Lookups interpolate amongst
* the 4 adjacent samples.
*/
struct SHVector4D {

14
src/medium/heterogeneous-flake.cpp
View File

@ -581,7 +581,7 @@ Spectrum FlakePhaseFunction::f(const MediumSamplingRecord &mRec, const Vector &_
if (orientation.lengthSquared() == 0)
return Spectrum(0.0f);
Frame frame(orientation);
Frame frame(normalize(orientation));
Vector wi = frame.toLocal(_wi);
Vector wo = frame.toLocal(_wo);
#if defined(FLAKE_SAMPLE_APPROXIMATION)
@ -608,8 +608,13 @@ Spectrum FlakePhaseFunction::sample(const MediumSamplingRecord &mRec, const Vect
ESampledType &sampledType, Float &pdf, const Point2 &_sample) const {
sampledType = PhaseFunction::ENormal;
#if 1
Vector orientation = m_medium->lookupOrientation(mRec.p);
if (orientation.lengthSquared() == 0) {
pdf = 0.0f;
return Spectrum(0.0f);
}
/* Importance sampling using the interpolated phase function */
Frame frame(m_medium->lookupOrientation(mRec.p));
Frame frame(normalize(orientation));
Point2 sample(_sample);
Vector wi = frame.toLocal(_wi);
@ -635,7 +640,10 @@ Spectrum FlakePhaseFunction::sample(const MediumSamplingRecord &mRec, const Vect
}
Float FlakePhaseFunction::pdf(const MediumSamplingRecord &mRec, const Vector &_wi, const Vector &_wo) const {
Frame frame(m_medium->lookupOrientation(mRec.p));
Vector orientation = m_medium->lookupOrientation(mRec.p);
if (orientation.lengthSquared() == 0)
return 0.0f;
Frame frame(normalize(orientation));
SHVector temp(m_phaseExpansion->getBands());
Vector wi = frame.toLocal(_wi);
Vector wo = frame.toLocal(_wo);