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

spot light bugfix from Milos

metadata
Wenzel Jakob 2011-07-08 04:10:26 +02:00
parent 27da91c157
commit 5a714c3bc6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/luminaires/spot.cpp
View File

@ -56,7 +56,7 @@ public:
m_cosBeamWidth = std::cos(m_beamWidth); m_cosBeamWidth = std::cos(m_beamWidth);
m_cosCutoffAngle = std::cos(m_cutoffAngle); m_cosCutoffAngle = std::cos(m_cutoffAngle);
m_position = m_luminaireToWorld(Point(0, 0, 0)); m_position = m_luminaireToWorld(Point(0, 0, 0));
m_uvFactor = std::tan(m_beamWidth/2); m_uvFactor = std::tan(m_cutoffAngle);
m_invTransitionWidth = 1.0f / (m_cutoffAngle - m_beamWidth); m_invTransitionWidth = 1.0f / (m_cutoffAngle - m_beamWidth);
} }
@ -91,8 +91,8 @@ public:
if (m_texture->getClass() != MTS_CLASS(ConstantSpectrumTexture)) { if (m_texture->getClass() != MTS_CLASS(ConstantSpectrumTexture)) {
Intersection its; Intersection its;
its.hasUVPartials = false; its.hasUVPartials = false;
its.uv.x = 0.5f + localDir.x / (localDir.z / m_uvFactor); its.uv.x = 0.5f + 0.5f * localDir.x / (localDir.z * m_uvFactor);
its.uv.y = 0.5f + localDir.y / (localDir.z / m_uvFactor); its.uv.y = 0.5f + 0.5f * localDir.y / (localDir.z * m_uvFactor);
result *= m_texture->getValue(its); result *= m_texture->getValue(its);
} }
@ -228,7 +228,7 @@ public:
<< " float cosTheta = localDir.z;" << endl << " float cosTheta = localDir.z;" << endl
<< " if (cosTheta < " << evalName << "_cosCutoffAngle)" << endl << " if (cosTheta < " << evalName << "_cosCutoffAngle)" << endl
<< " return vec3(0.0);" << endl << " return vec3(0.0);" << endl
<< " vec2 uv = 0.5 + (localDir.xy / localDir.z * " << evalName << "_uvFactor);" << endl << " vec2 uv = 0.5 + 0.5 * (localDir.xy / localDir.z * " << evalName << "_uvFactor);" << endl
<< " vec3 color = " << depNames[0] << "(uv);" << endl << " vec3 color = " << depNames[0] << "(uv);" << endl
<< " if (cosTheta > " << evalName << "_cosBeamWidth)" << endl << " if (cosTheta > " << evalName << "_cosBeamWidth)" << endl
<< " return color;" << endl << " return color;" << endl