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

added the 'flipNormals' parameter to the cylinder for consistency

metadata
Wenzel Jakob 2012-10-03 19:07:15 -04:00
parent 874e1fa086
commit d116214dd1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shapes/cylinder.cpp
View File

@ -39,6 +39,10 @@ MTS_NAMESPACE_BEGIN
* \parameter{radius}{\Float}{ * \parameter{radius}{\Float}{
* Radius of the cylinder in object-space units \default{1} * Radius of the cylinder in object-space units \default{1}
* } * }
* \parameter{flipNormals}{\Boolean}{
* Is the cylinder inverted, i.e. should the normal vectors
* be flipped? \default{\code{false}, i.e. the normals point outside}
* }
* \parameter{toWorld}{\Transform}{ * \parameter{toWorld}{\Transform}{
* Specifies an optional linear object-to-world transformation. * Specifies an optional linear object-to-world transformation.
* Note that non-uniform scales are not permitted! * Note that non-uniform scales are not permitted!
@ -73,6 +77,7 @@ private:
Transform m_objectToWorld; Transform m_objectToWorld;
Transform m_worldToObject; Transform m_worldToObject;
Float m_radius, m_length, m_invSurfaceArea; Float m_radius, m_length, m_invSurfaceArea;
bool m_flipNormals;
public: public:
Cylinder(const Properties &props) : Shape(props) { Cylinder(const Properties &props) : Shape(props) {
Float radius = props.getFloat("radius", 1.0f); Float radius = props.getFloat("radius", 1.0f);
@ -88,6 +93,9 @@ public:
if (props.hasProperty("toWorld")) if (props.hasProperty("toWorld"))
m_objectToWorld = props.getTransform("toWorld") * m_objectToWorld; m_objectToWorld = props.getTransform("toWorld") * m_objectToWorld;
/// Are the cylinder normals pointing inwards? default: no
m_flipNormals = props.getBoolean("flipNormals", false);
// Remove the scale from the object-to-world transform // Remove the scale from the object-to-world transform
m_radius = m_objectToWorld(Vector(1,0,0)).length(); m_radius = m_objectToWorld(Vector(1,0,0)).length();
m_length = m_objectToWorld(Vector(0,0,1)).length(); m_length = m_objectToWorld(Vector(0,0,1)).length();
@ -104,6 +112,7 @@ public:
m_objectToWorld = Transform(stream); m_objectToWorld = Transform(stream);
m_radius = stream->readFloat(); m_radius = stream->readFloat();
m_length = stream->readFloat(); m_length = stream->readFloat();
m_flipNormals = stream->readBool();
m_worldToObject = m_objectToWorld.inverse(); m_worldToObject = m_objectToWorld.inverse();
m_invSurfaceArea = 1/(2*M_PI*m_radius*m_length); m_invSurfaceArea = 1/(2*M_PI*m_radius*m_length);
} }
@ -113,6 +122,7 @@ public:
m_objectToWorld.serialize(stream); m_objectToWorld.serialize(stream);
stream->writeFloat(m_radius); stream->writeFloat(m_radius);
stream->writeFloat(m_length); stream->writeFloat(m_length);
stream->writeBool(m_flipNormals);
} }
bool rayIntersect(const Ray &_ray, Float mint, Float maxt, Float &t, void *temp) const { bool rayIntersect(const Ray &_ray, Float mint, Float maxt, Float &t, void *temp) const {
@ -204,6 +214,8 @@ public:
its.dpdu = m_objectToWorld(dpdu); its.dpdu = m_objectToWorld(dpdu);
its.dpdv = m_objectToWorld(dpdv); its.dpdv = m_objectToWorld(dpdv);
its.geoFrame.n = Normal(normalize(m_objectToWorld(cross(dpdu, dpdv)))); its.geoFrame.n = Normal(normalize(m_objectToWorld(cross(dpdu, dpdv))));
if (m_flipNormals)
its.geoFrame.n *= -1;
its.geoFrame.s = normalize(its.dpdu); its.geoFrame.s = normalize(its.dpdu);
its.geoFrame.t = normalize(its.dpdv); its.geoFrame.t = normalize(its.dpdv);
its.shFrame = its.geoFrame; its.shFrame = its.geoFrame;
@ -219,6 +231,9 @@ public:
Point p(cosTheta*m_radius, sinTheta*m_radius, sample.x * m_length); Point p(cosTheta*m_radius, sinTheta*m_radius, sample.x * m_length);
Normal n(cosTheta, sinTheta, 0.0f); Normal n(cosTheta, sinTheta, 0.0f);
if (m_flipNormals)
n *= -1;
pRec.p = m_objectToWorld(p); pRec.p = m_objectToWorld(p);
pRec.n = normalize(m_objectToWorld(n)); pRec.n = normalize(m_objectToWorld(n));
pRec.pdf = m_invSurfaceArea; pRec.pdf = m_invSurfaceArea;