mirror of
https://github.com/bolero-MURAKAMI/Sprout
synced 2025-08-03 12:49:50 +00:00
fix darkroom: add alpha and refraction material parameter
This commit is contained in:
bolero-MURAKAMI
parent
4b5dd8ccc5
commit
014d339803
7 changed files with 263 additions and 81 deletions
|
|
@ -8,9 +8,12 @@
|
|||
#ifndef SPROUT_DARKROOM_MATERIALS_MATERIAL_HPP
|
||||
#define SPROUT_DARKROOM_MATERIALS_MATERIAL_HPP
|
||||
|
||||
#include <type_traits>
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/tuple/tuple.hpp>
|
||||
#include <sprout/tuple/indexes.hpp>
|
||||
#include <sprout/utility/forward.hpp>
|
||||
#include <sprout/type_traits/enabler_if.hpp>
|
||||
#include <sprout/darkroom/access/access.hpp>
|
||||
#include <sprout/darkroom/colors/rgb.hpp>
|
||||
#include <sprout/darkroom/materials/calculate.hpp>
|
||||
|
|
@ -19,10 +22,40 @@ namespace sprout {
|
|||
namespace darkroom {
|
||||
namespace materials {
|
||||
//
|
||||
// color
|
||||
// reflection
|
||||
// material
|
||||
//
|
||||
typedef sprout::tuples::tuple<sprout::darkroom::colors::rgb_f_t, double, double, double> material;
|
||||
|
||||
//
|
||||
// has_color
|
||||
// has_reflection
|
||||
// has_alpha
|
||||
// has_refraction
|
||||
//
|
||||
template<typename T>
|
||||
struct has_color
|
||||
: public sprout::integral_constant<bool, (sprout::darkroom::access::size<T>::value >= 1)>
|
||||
{};
|
||||
template<typename T>
|
||||
struct has_reflection
|
||||
: public sprout::integral_constant<bool, (sprout::darkroom::access::size<T>::value >= 2)>
|
||||
{};
|
||||
template<typename T>
|
||||
struct has_alpha
|
||||
: public sprout::integral_constant<bool, (sprout::darkroom::access::size<T>::value >= 3)>
|
||||
{};
|
||||
template<typename T>
|
||||
struct has_refraction
|
||||
: public sprout::integral_constant<bool, (sprout::darkroom::access::size<T>::value >= 4)>
|
||||
{};
|
||||
|
||||
//
|
||||
// color
|
||||
//
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<sprout::darkroom::materials::has_color<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
color(T&& t)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::darkroom::access::get<0>(sprout::forward<T>(t))))
|
||||
|
|
@ -30,7 +63,23 @@ namespace sprout {
|
|||
{
|
||||
return sprout::darkroom::access::get<0>(sprout::forward<T>(t));
|
||||
}
|
||||
template<typename T>
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<!sprout::darkroom::materials::has_color<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR typename sprout::darkroom::access::element<0, sprout::darkroom::materials::material>::type
|
||||
color(T&&)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR((typename sprout::darkroom::access::element<0, sprout::darkroom::materials::material>::type())))
|
||||
{
|
||||
return typename sprout::darkroom::access::element<0, sprout::darkroom::materials::material>::type();
|
||||
}
|
||||
//
|
||||
// reflection
|
||||
//
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<sprout::darkroom::materials::has_reflection<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
reflection(T&& t)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::darkroom::access::get<1>(sprout::forward<T>(t))))
|
||||
|
|
@ -38,37 +87,97 @@ namespace sprout {
|
|||
{
|
||||
return sprout::darkroom::access::get<1>(sprout::forward<T>(t));
|
||||
}
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<!sprout::darkroom::materials::has_reflection<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR typename sprout::darkroom::access::element<1, sprout::darkroom::materials::material>::type
|
||||
reflection(T&&)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR((typename sprout::darkroom::access::element<1, sprout::darkroom::materials::material>::type())))
|
||||
{
|
||||
return typename sprout::darkroom::access::element<1, sprout::darkroom::materials::material>::type();
|
||||
}
|
||||
//
|
||||
// alpha
|
||||
//
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<sprout::darkroom::materials::has_alpha<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
alpha(T&& t)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::darkroom::access::get<2>(sprout::forward<T>(t))))
|
||||
-> decltype(sprout::darkroom::access::get<2>(sprout::forward<T>(t)))
|
||||
{
|
||||
return sprout::darkroom::access::get<2>(sprout::forward<T>(t));
|
||||
}
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<!sprout::darkroom::materials::has_alpha<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR typename sprout::darkroom::access::element<2, sprout::darkroom::materials::material>::type
|
||||
alpha(T&&)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR((typename sprout::darkroom::access::element<2, sprout::darkroom::materials::material>::type())))
|
||||
{
|
||||
return typename sprout::darkroom::access::element<2, sprout::darkroom::materials::material>::type();
|
||||
}
|
||||
//
|
||||
// refraction
|
||||
//
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<sprout::darkroom::materials::has_refraction<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
refraction(T&& t)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR(sprout::darkroom::access::get<3>(sprout::forward<T>(t))))
|
||||
-> decltype(sprout::darkroom::access::get<3>(sprout::forward<T>(t)))
|
||||
{
|
||||
return sprout::darkroom::access::get<3>(sprout::forward<T>(t));
|
||||
}
|
||||
template<
|
||||
typename T,
|
||||
typename sprout::enabler_if<!sprout::darkroom::materials::has_refraction<typename std::decay<T>::type>::value>::type = sprout::enabler
|
||||
>
|
||||
inline SPROUT_CONSTEXPR typename sprout::darkroom::access::element<3, sprout::darkroom::materials::material>::type
|
||||
refraction(T&&)
|
||||
SPROUT_NOEXCEPT_EXPR(SPROUT_NOEXCEPT_EXPR((typename sprout::darkroom::access::element<3, sprout::darkroom::materials::material>::type())))
|
||||
{
|
||||
return typename sprout::darkroom::access::element<1, sprout::darkroom::materials::material>::type();
|
||||
}
|
||||
|
||||
//
|
||||
// calculate_material
|
||||
//
|
||||
namespace detail {
|
||||
template<typename Material, typename Unit, sprout::index_t... Indexes>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
calculate_material_impl(Material const& mat, Unit const& u, Unit const& v, sprout::index_tuple<Indexes...>)
|
||||
-> decltype(sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::calculate(sprout::darkroom::access::get<Indexes>(mat), u, v)...
|
||||
))
|
||||
{
|
||||
return sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::calculate(sprout::darkroom::access::get<Indexes>(mat), u, v)...
|
||||
);
|
||||
}
|
||||
} // namespace detail
|
||||
template<typename Material, typename Unit>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
calculate_material(Material const& mat, Unit const& u, Unit const& v)
|
||||
-> decltype(sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::calculate(sprout::darkroom::materials::color(mat), u, v),
|
||||
sprout::darkroom::materials::calculate(sprout::darkroom::materials::reflection(mat), u, v)
|
||||
))
|
||||
-> decltype(sprout::darkroom::materials::detail::calculate_material_impl(mat, u, v, sprout::tuples::tuple_indexes<Material>::make()))
|
||||
{
|
||||
return sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::calculate(sprout::darkroom::materials::color(mat), u, v),
|
||||
sprout::darkroom::materials::calculate(sprout::darkroom::materials::reflection(mat), u, v)
|
||||
);
|
||||
return sprout::darkroom::materials::detail::calculate_material_impl(mat, u, v, sprout::tuples::tuple_indexes<Material>::make());
|
||||
}
|
||||
|
||||
//
|
||||
// make_material_image
|
||||
//
|
||||
template<typename ColorImage, typename ReflectionImage>
|
||||
inline SPROUT_CONSTEXPR sprout::tuples::tuple<ColorImage, ReflectionImage>
|
||||
make_material_image(ColorImage const& col, ReflectionImage const& ref) {
|
||||
return sprout::tuples::make_tuple(col, ref);
|
||||
template<typename... Images>
|
||||
inline SPROUT_CONSTEXPR sprout::tuples::tuple<Images...>
|
||||
make_material_image(Images const&... images) {
|
||||
return sprout::tuples::make_tuple(images...);
|
||||
}
|
||||
|
||||
//
|
||||
// material
|
||||
//
|
||||
typedef sprout::tuples::tuple<sprout::darkroom::colors::rgb_f_t, double> material;
|
||||
} // namespace materials
|
||||
} // namespace darkroom
|
||||
} // namespace sprout
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
#include <cstdint>
|
||||
#include <sprout/config.hpp>
|
||||
#include <sprout/tuple/tuple.hpp>
|
||||
#include <sprout/index_tuple/make_index_tuple.hpp>
|
||||
#include <sprout/utility/pack.hpp>
|
||||
#include <sprout/type_traits/enabler_if.hpp>
|
||||
#include <sprout/math/fmod.hpp>
|
||||
|
||||
namespace sprout {
|
||||
|
|
@ -74,36 +77,56 @@ namespace sprout {
|
|||
//
|
||||
// make_plaid_material_image
|
||||
//
|
||||
template<typename Color, typename Reflection>
|
||||
inline SPROUT_CONSTEXPR sprout::tuples::tuple<
|
||||
sprout::darkroom::materials::plaid_element<Color>,
|
||||
sprout::darkroom::materials::plaid_element<Reflection>
|
||||
namespace detail {
|
||||
template<typename... Elements, sprout::index_t... Indexes>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
make_plaid_material_image_impl(
|
||||
sprout::index_tuple<Indexes...>,
|
||||
Elements const&... elems
|
||||
)
|
||||
-> decltype(sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::make_plaid(sprout::pack_get<Indexes * 2>(elems...), sprout::pack_get<Indexes * 2 + 1>(elems...))...
|
||||
))
|
||||
{
|
||||
return sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::make_plaid(sprout::pack_get<Indexes * 2>(elems...), sprout::pack_get<Indexes * 2 + 1>(elems...))...
|
||||
);
|
||||
}
|
||||
template<typename Unit, typename... Elements, sprout::index_t... Indexes>
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
make_plaid_material_image_impl(
|
||||
Unit const& scale,
|
||||
sprout::index_tuple<Indexes...>,
|
||||
Elements const&... elems
|
||||
)
|
||||
-> decltype(sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::make_plaid(sprout::pack_get<Indexes * 2>(elems...), sprout::pack_get<Indexes * 2 + 1>(elems...), scale)...
|
||||
))
|
||||
{
|
||||
return sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::make_plaid(sprout::pack_get<Indexes * 2>(elems...), sprout::pack_get<Indexes * 2 + 1>(elems...), scale)...
|
||||
);
|
||||
}
|
||||
} // namespace detail
|
||||
template<
|
||||
typename... Elements,
|
||||
typename sprout::enabler_if<sizeof...(Elements) % 2 == 0>::type = sprout::enabler
|
||||
>
|
||||
make_plaid_material_image(
|
||||
Color const& col1, Color const& col2,
|
||||
Reflection const& ref1, Reflection const& ref2
|
||||
)
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
make_plaid_material_image(Elements const&... elems)
|
||||
-> decltype(sprout::darkroom::materials::detail::make_plaid_material_image_impl(sprout::make_index_tuple<sizeof...(Elements) / 2>::make(), elems...))
|
||||
{
|
||||
return sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::make_plaid(col1, col2),
|
||||
sprout::darkroom::materials::make_plaid(ref1, ref2)
|
||||
);
|
||||
return sprout::darkroom::materials::detail::make_plaid_material_image_impl(sprout::make_index_tuple<sizeof...(Elements) / 2>::make(), elems...);
|
||||
}
|
||||
template<typename Color, typename Reflection, typename Unit>
|
||||
inline SPROUT_CONSTEXPR sprout::tuples::tuple<
|
||||
sprout::darkroom::materials::plaid_element<Color, Unit>,
|
||||
sprout::darkroom::materials::plaid_element<Reflection, Unit>
|
||||
template<
|
||||
typename Unit, typename... Elements,
|
||||
typename sprout::enabler_if<sizeof...(Elements) % 2 == 0>::type = sprout::enabler
|
||||
>
|
||||
make_plaid_material_image(
|
||||
Color const& col1, Color const& col2,
|
||||
Reflection const& ref1, Reflection const& ref2,
|
||||
Unit const& scale
|
||||
)
|
||||
inline SPROUT_CONSTEXPR auto
|
||||
make_plaid_material_image(Unit const& scale, Elements const&... elems)
|
||||
-> decltype(sprout::darkroom::materials::detail::make_plaid_material_image_impl(scale, sprout::make_index_tuple<sizeof...(Elements) / 2>::make(), elems...))
|
||||
{
|
||||
return sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::make_plaid(col1, col2, scale),
|
||||
sprout::darkroom::materials::make_plaid(ref1, ref2, scale)
|
||||
);
|
||||
return sprout::darkroom::materials::detail::make_plaid_material_image_impl(scale, sprout::make_index_tuple<sizeof...(Elements) / 2>::make(), elems...);
|
||||
}
|
||||
} // namespace materials
|
||||
} // namespace darkroom
|
||||
|
|
|
|||
|
|
@ -44,15 +44,13 @@ namespace sprout {
|
|||
//
|
||||
// make_uniform_material_image
|
||||
//
|
||||
template<typename Color, typename Reflection>
|
||||
template<typename... Elements>
|
||||
inline SPROUT_CONSTEXPR sprout::tuples::tuple<
|
||||
sprout::darkroom::materials::uniform_element<Color>,
|
||||
sprout::darkroom::materials::uniform_element<Reflection>
|
||||
sprout::darkroom::materials::uniform_element<Elements>...
|
||||
>
|
||||
make_uniform_material_image(Color const& col, Reflection const& ref) {
|
||||
make_uniform_material_image(Elements const&... elems) {
|
||||
return sprout::tuples::make_tuple(
|
||||
sprout::darkroom::materials::make_uniform(col),
|
||||
sprout::darkroom::materials::make_uniform(ref)
|
||||
sprout::darkroom::materials::make_uniform(elems)...
|
||||
);
|
||||
}
|
||||
} // namespace materials
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue