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

heightfield: support for transformations, flipNormals parameter

metadata
Wenzel Jakob 2013-09-11 14:59:13 +02:00
parent d9fdeee16b
commit 3ed7a518a3
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/shapes/heightfield.cpp
View File

@ -144,11 +144,6 @@ public:
int iDeltaX = signumToInt(ray.d.x), int iDeltaX = signumToInt(ray.d.x),
iDeltaY = signumToInt(ray.d.y); iDeltaY = signumToInt(ray.d.y);
if (iDeltaX == 0 && iDeltaY == 0) {
/* TODO: special case for perpendicular rays */
return false;
}
int stackIdx = 0; int stackIdx = 0;
stack[stackIdx].level = m_levelCount-1; stack[stackIdx].level = m_levelCount-1;
stack[stackIdx].x = 0; stack[stackIdx].x = 0;
@ -228,9 +223,12 @@ public:
if (!solveQuadratic(A, B, C, t0, t1)) if (!solveQuadratic(A, B, C, t0, t1))
continue; continue;
if (t0 >= -Epsilon && t0 <= tMax + Epsilon) Float min = std::max(-Epsilon, mint - nearT);
Float max = std::min(tMax + Epsilon, maxt - nearT);
if (t0 >= min && t0 <= max)
t = t0; t = t0;
else if (t1 >= -Epsilon && t1 <= tMax + Epsilon) else if (t1 >= min && t1 <= max)
t = t1; t = t1;
else else
continue; continue;
@ -244,7 +242,6 @@ public:
t += nearT; t += nearT;
} }
numTraversals += nTraversals; numTraversals += nTraversals;
return true; return true;
} }
} }
@ -264,11 +261,12 @@ public:
f10 = m_data[y * width + x + 1], f10 = m_data[y * width + x + 1],
f11 = m_data[(y+1) * width + x + 1]; f11 = m_data[(y+1) * width + x + 1];
its.p = Point(temp.p.x + temp.x, temp.p.y + temp.y, temp.p.z); Point pLocal(temp.p.x + temp.x, temp.p.y + temp.y, temp.p.z);
its.uv = Point2(its.p.x / m_levelSize[0].x, its.p.y / m_levelSize[0].y); its.p = m_objectToWorld(pLocal);
its.dpdu = Vector(1, 0, (1.0f - temp.p.y) * (f10 - f00) + temp.p.y * (f11 - f01)) * m_levelSize[0].x; its.uv = Point2(pLocal.x / m_levelSize[0].x, pLocal.y / m_levelSize[0].y);
its.dpdv = Vector(0, 1, (1.0f - temp.p.x) * (f01 - f00) + temp.p.x * (f11 - f10)) * m_levelSize[0].y; its.dpdu = m_objectToWorld(Vector(1, 0, (1.0f - temp.p.y) * (f10 - f00) + temp.p.y * (f11 - f01)) * m_levelSize[0].x);
its.dpdv = m_objectToWorld(Vector(0, 1, (1.0f - temp.p.x) * (f01 - f00) + temp.p.x * (f11 - f10)) * m_levelSize[0].y);
its.geoFrame.s = normalize(its.dpdu); its.geoFrame.s = normalize(its.dpdu);
its.geoFrame.t = normalize(its.dpdv - dot(its.dpdv, its.geoFrame.s) * its.geoFrame.s); its.geoFrame.t = normalize(its.dpdv - dot(its.dpdv, its.geoFrame.s) * its.geoFrame.s);
@ -281,17 +279,22 @@ public:
n10 = m_normals[y * width + x + 1], n10 = m_normals[y * width + x + 1],
n11 = m_normals[(y+1) * width + x + 1]; n11 = m_normals[(y+1) * width + x + 1];
its.shFrame.n = normalize( its.shFrame.n = normalize(m_objectToWorld(Normal(
(1 - temp.p.x) * ((1-temp.p.y) * n00 + temp.p.y * n01) (1 - temp.p.x) * ((1-temp.p.y) * n00 + temp.p.y * n01)
+ temp.p.x * ((1-temp.p.y) * n10 + temp.p.y * n11)); + temp.p.x * ((1-temp.p.y) * n10 + temp.p.y * n11))));
its.shFrame.s = normalize(its.geoFrame.s - dot(its.geoFrame.s, its.shFrame.n) * its.shFrame.n); its.shFrame.s = normalize(its.geoFrame.s - dot(its.geoFrame.s, its.shFrame.n) * its.shFrame.n);
its.shFrame.t = cross(its.shFrame.n, its.shFrame.s); its.shFrame.t = cross(its.shFrame.n, its.shFrame.s);
} else { } else {
its.shFrame = its.geoFrame; its.shFrame = its.geoFrame;
} }
its.shape = this;
if (m_flipNormals) {
its.shFrame.n *= -1;
its.geoFrame.n *= -1;
}
its.shape = this;
its.wi = its.toLocal(-ray.d); its.wi = its.toLocal(-ray.d);
its.hasUVPartials = false; its.hasUVPartials = false;
its.instance = NULL; its.instance = NULL;
@ -331,6 +334,10 @@ public:
m_data = (Float *) allocAligned(size); m_data = (Float *) allocAligned(size);
bitmap->convert(m_data, Bitmap::ELuminance, Bitmap::EFloat); bitmap->convert(m_data, Bitmap::ELuminance, Bitmap::EFloat);
m_objectToWorld = m_objectToWorld * Transform::translate(Vector(-1, -1, 0)) * Transform::scale(Vector(
(Float) 2 / (m_dataSize.x-1),
(Float) 2 / (m_dataSize.y-1), 1));
buildInternal(); buildInternal();
} else { } else {
Shape::addChild(name, child); Shape::addChild(name, child);
@ -457,7 +464,9 @@ public:
oss << "HeightField[" << endl oss << "HeightField[" << endl
<< " size = " << m_dataSize.toString() << "," << endl << " size = " << m_dataSize.toString() << "," << endl
<< " shadingNormals = " << m_shadingNormals << "," << endl << " shadingNormals = " << m_shadingNormals << "," << endl
<< " flipNormals = " << m_flipNormals << "," << endl
<< " objectToWorld = " << indent(m_objectToWorld.toString()) << "," << endl << " objectToWorld = " << indent(m_objectToWorld.toString()) << "," << endl
<< " aabb = " << indent(getAABB().toString()) << "," << endl
<< " bsdf = " << indent(m_bsdf.toString()) << "," << endl; << " bsdf = " << indent(m_bsdf.toString()) << "," << endl;
if (isMediumTransition()) if (isMediumTransition())
oss << " interiorMedium = " << indent(m_interiorMedium.toString()) << "," << endl oss << " interiorMedium = " << indent(m_interiorMedium.toString()) << "," << endl