Commit 32060517 authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

some cleanup

parent f2befadb
......@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along
// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file Color.cpp
//! \file Color.cpp
//! \author Lukas Werner
//
//======================================================================================================================
......
......@@ -13,6 +13,7 @@
// You should have received a copy of the GNU General Public License along
// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file Color.h
//! \author Lukas Werner
//
//======================================================================================================================
......@@ -25,6 +26,7 @@
namespace walberla {
namespace pe {
namespace raytracing {
class Color: public Vector3<real_t> {
public:
/*!\name Constructors */
......@@ -75,6 +77,7 @@ public:
static Color colorFromHSV(real_t hue, real_t saturation, real_t value);
};
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -37,6 +37,7 @@
namespace walberla {
namespace pe {
namespace raytracing {
inline bool intersects(const SphereID sphere, const Ray& ray, real_t& t, Vec3& n);
inline bool intersects(const PlaneID plane, const Ray& ray, real_t& t, Vec3& n);
inline bool intersects(const BoxID box, const Ray& ray, real_t& t, Vec3& n);
......@@ -461,6 +462,7 @@ inline bool intersects(const AABB& aabb, const Ray& ray, real_t& t, real_t paddi
t = t_;
return true;
}
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -28,6 +28,7 @@
namespace walberla {
namespace pe {
namespace raytracing {
/*!\brief The Lighting struct defines the properties of a point light in the scene.
*/
struct Lighting {
......@@ -71,6 +72,7 @@ struct Lighting {
ambientColor = config.getParameter<Color>("ambientColor", Color(0.5,0.5,0.5));
}
};
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -23,6 +23,7 @@
namespace walberla {
namespace pe {
namespace raytracing {
/*!\brief Global output operator for rays.
*
* \param os Reference to the output stream.
......@@ -35,6 +36,6 @@ std::ostream& operator<<(std::ostream& os, const Ray& ray) {
<< ", c: (" << ray.getImageX() << "/" << ray.getImageY() << ")>";
}
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -219,6 +219,7 @@ public:
}
//@}
};
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -421,6 +421,6 @@ void Raytracer::output(const std::vector<BodyIntersectionInfo>& intersectionsBuf
if (tt != NULL) tt->stop("Output");
}
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -37,9 +37,6 @@
#include <stddef.h>
using namespace walberla::pe;
using namespace walberla::timing;
namespace walberla {
namespace pe {
namespace raytracing {
......@@ -706,6 +703,7 @@ inline Color Raytracer::getColor(const BodyID body, const Ray& ray, real_t t, co
return color;
}
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -30,6 +30,7 @@
namespace walberla {
namespace pe {
namespace raytracing {
inline ShadingParameters defaultBodyTypeDependentShadingParams (const BodyID body);
inline ShadingParameters processRankDependentShadingParams (const BodyID body);
inline ShadingParameters defaultShadingParams (const BodyID body);
......@@ -169,6 +170,7 @@ inline ShadingParameters violetShadingParams (const BodyID body) {
real_t(0));
return s;
}
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
......@@ -27,6 +27,7 @@
namespace walberla {
namespace pe {
namespace raytracing {
struct ShadingParameters {
Color diffuseColor; //!< Primary color of the material.
Color ambientColor; //!< Color the material has even when its not directly lit.
......@@ -80,7 +81,8 @@ struct ShadingParameters {
return *this;
}
};
}
}
}
} //namespace raytracing
} //namespace pe
} //namespace walberla
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment