mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sprout/darkroom/materials/material.hpp マテリアルの仕様変更

Browse source
This commit is contained in:
bolero-MURAKAMI 2011-12-13 04:01:10 +09:00
parent 3e028096fd
commit a4c71d0e9f
3 changed files with 114 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
sprout/darkroom/materials/material.hpp
View file

@ -35,32 +35,32 @@ namespace sprout {
// calc_color
// calc_reflection
//
template<typename Image, typename Position, typename Normal>
SPROUT_CONSTEXPR auto calc_color(Image&& t, Position const&, Normal const&) SPROUT_NOEXCEPT
-> decltype(t)
template<typename Image, typename Unit>
SPROUT_CONSTEXPR auto calc_color(Image&& t, Unit const& u, Unit const& v) SPROUT_NOEXCEPT
-> decltype(sprout::forward<Image>(t).template operator()(u, v))
{
return t;
return sprout::forward<Image>(t).template operator()(u, v);
}
template<typename Image, typename Position, typename Normal>
SPROUT_CONSTEXPR auto calc_reflection(Image&& t, Position const&, Normal const&) SPROUT_NOEXCEPT
-> decltype(t)
template<typename Image, typename Unit>
SPROUT_CONSTEXPR auto calc_reflection(Image&& t, Unit const& u, Unit const& v) SPROUT_NOEXCEPT
-> decltype(sprout::forward<Image>(t).template operator()(u, v))
{
return t;
return sprout::forward<Image>(t).template operator()(u, v);
}
//
// calc_material
//
template<typename Material, typename Position, typename Normal>
SPROUT_CONSTEXPR auto calc_material(Material const& mat, Position const& pos, Normal const& nor)
template<typename Material, typename Unit>
SPROUT_CONSTEXPR auto calc_material(Material const& mat, Unit const& u, Unit const& v)
-> decltype(sprout::tuples::make_tuple(
sprout::darkroom::materials::calc_color(sprout::darkroom::materials::color(mat), pos, nor),
sprout::darkroom::materials::calc_reflection(sprout::darkroom::materials::reflection(mat), pos, nor)
sprout::darkroom::materials::calc_color(sprout::darkroom::materials::color(mat), u, v),
sprout::darkroom::materials::calc_reflection(sprout::darkroom::materials::reflection(mat), u, v)
))
{
return sprout::tuples::make_tuple(
sprout::darkroom::materials::calc_color(sprout::darkroom::materials::color(mat), pos, nor),
sprout::darkroom::materials::calc_reflection(sprout::darkroom::materials::reflection(mat), pos, nor)
sprout::darkroom::materials::calc_color(sprout::darkroom::materials::color(mat), u, v),
sprout::darkroom::materials::calc_reflection(sprout::darkroom::materials::reflection(mat), u, v)
);
}
@ -77,6 +77,46 @@ namespace sprout {
// material
//
typedef sprout::tuples::tuple<sprout::darkroom::colors::rgb_f, double> material;
//
// uniform_element
//
template<typename Element>
class uniform_element {
public:
typedef Element result_type;
private:
result_type elem_;
public:
SPROUT_CONSTEXPR explicit uniform_element(result_type const& elem)
: elem_(elem)
{}
template<typename Unit>
SPROUT_CONSTEXPR result_type operator()(Unit const&, Unit const&) const {
return elem_;
}
};
//
// make_uniform
//
template<typename Element>
SPROUT_CONSTEXPR sprout::darkroom::materials::uniform_element<Element>
make_uniform(Element const& elem) {
return sprout::darkroom::materials::uniform_element<Element>(elem);
}
//
// make_uniform_material_image
//
template<typename Color, typename Reflection>
SPROUT_CONSTEXPR sprout::tuples::tuple<
sprout::darkroom::materials::uniform_element<Color>,
sprout::darkroom::materials::uniform_element<Reflection>
> make_uniform_material_image(Color const& col, Reflection const& ref) {
return sprout::tuples::make_tuple(
sprout::darkroom::materials::make_uniform(col),
sprout::darkroom::materials::make_uniform(ref)
);
}
} // namespace materials
} // namespace darkroom
} // namespace sprout

24
sprout/darkroom/objects/aa_plane.hpp
View file

@ -44,8 +44,8 @@ namespace sprout {
position_type,
decltype(sprout::darkroom::materials::calc_material(
std::declval<material_type const&>(),
std::declval<position_type const&>(),
std::declval<position_type const&>()
std::declval<unit_type const&>(),
std::declval<unit_type const&>()
))
> type;
};
@ -71,15 +71,26 @@ namespace sprout {
position_type const& normal
) const
{
using std::fmod;
return typename intersection<Ray>::type(
does_intersect,
distance,
point_of_intersection,
normal,
sprout::darkroom::materials::calc_material(
is_x() ? sprout::darkroom::materials::calc_material( // ! Tile
mat_,
point_of_intersection,
normal
fmod(sprout::darkroom::coords::z(point_of_intersection), 0.5),
fmod(sprout::darkroom::coords::y(point_of_intersection), 0.5)
)
: is_y() ? sprout::darkroom::materials::calc_material(
mat_,
fmod(sprout::darkroom::coords::x(point_of_intersection), 0.5),
fmod(sprout::darkroom::coords::z(point_of_intersection), 0.5)
)
: sprout::darkroom::materials::calc_material(
mat_,
fmod(sprout::darkroom::coords::x(point_of_intersection), 0.5),
fmod(sprout::darkroom::coords::y(point_of_intersection), 0.5)
)
);
}
@ -95,10 +106,9 @@ namespace sprout {
does_intersect,
distance,
point_of_intersection,
(is_x() ? position_type(hit_side > 0 ? 1 : -1, 0, 0)
is_x() ? position_type(hit_side > 0 ? 1 : -1, 0, 0)
: is_y() ? position_type(0, hit_side > 0 ? 1 : -1, 0)
: position_type(0, 0, hit_side > 0 ? 1 : -1)
)
);
}
template<typename Ray>

55
sprout/darkroom/objects/sphere.hpp
View file

@ -35,8 +35,8 @@ namespace sprout {
position_type,
decltype(sprout::darkroom::materials::calc_material(
std::declval<material_type const&>(),
std::declval<position_type const&>(),
std::declval<position_type const&>()
std::declval<unit_type const&>(),
std::declval<unit_type const&>()
))
> type;
};
@ -52,6 +52,8 @@ namespace sprout {
SPROUT_STATIC_CONSTEXPR std::size_t point_of_intersection = 0;
SPROUT_STATIC_CONSTEXPR std::size_t normal = 1;
};
private:
SPROUT_STATIC_CONSTEXPR unit_type pi = 3.1415926535897932384626433832795;
private:
position_type pos_;
radius_type rad_;
@ -133,6 +135,40 @@ namespace sprout {
)
;
}
template<typename Ray, typename Point>
SPROUT_CONSTEXPR typename intersection<Ray>::type intersect_6(
Ray const& ray,
zwo_type const& zwo,
drei_type const& drei,
Point const& poi
) const
{
using std::atan2;
using std::sqrt;
return typename intersection<Ray>::type(
sprout::tuples::get<zw::does_intersect>(zwo),
sprout::tuples::get<zw::distance>(zwo),
sprout::tuples::get<dr::point_of_intersection>(drei),
sprout::tuples::get<dr::normal>(drei),
sprout::darkroom::materials::calc_material( // ! Spherical
mat_,
atan2(
sprout::darkroom::coords::x(poi),
sprout::darkroom::coords::z(poi)
)
/ (2 * pi)
,
atan2(
sqrt(
sprout::darkroom::coords::x(poi) * sprout::darkroom::coords::x(poi)
+ sprout::darkroom::coords::y(poi) * sprout::darkroom::coords::y(poi)
),
sprout::darkroom::coords::z(poi)
)
/ (2 * pi)
)
);
}
template<typename Ray>
SPROUT_CONSTEXPR typename intersection<Ray>::type intersect_5(
Ray const& ray,
@ -140,16 +176,11 @@ namespace sprout {
drei_type const& drei
) const
{
return typename intersection<Ray>::type(
sprout::tuples::get<zw::does_intersect>(zwo),
sprout::tuples::get<zw::distance>(zwo),
sprout::tuples::get<dr::point_of_intersection>(drei),
sprout::tuples::get<dr::normal>(drei),
sprout::darkroom::materials::calc_material(
mat_,
sprout::tuples::get<dr::point_of_intersection>(drei),
sprout::tuples::get<dr::normal>(drei)
)
return intersect_6(
ray,
zwo,
drei,
sprout::tuples::get<dr::point_of_intersection>(drei)
);
}
template<typename Ray>