King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00
Code Issues Releases Wiki Activity

fix darkroom parallel_light

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-08-15 03:32:43 +09:00
parent dc1e85923b
commit e9910b090d
3 changed files with 25 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,18 +64,21 @@ namespace sprout {
return direction_value_ == aa_plane_direction::z;
}
template<typename Ray>
SPROUT_CONSTEXPR typename intersection<Ray>::type intersect_6(
SPROUT_CONSTEXPR typename intersection<Ray>::type intersect_5(
int hit_side,
bool does_intersect,
unit_type distance,
position_type const& point_of_intersection,
position_type const& normal
position_type const& point_of_intersection
) const
{
return typename intersection<Ray>::type(
does_intersect,
distance,
point_of_intersection,
normal,
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)
,
is_x() ? sprout::darkroom::materials::calc_material(
mat_,
sprout::darkroom::coords::z(point_of_intersection),
@ -94,23 +97,6 @@ namespace sprout {
);
}
template<typename Ray>
SPROUT_CONSTEXPR typename intersection<Ray>::type intersect_5(
int hit_side,
bool does_intersect,
unit_type distance,
position_type const& point_of_intersection
) const
{
return intersect_6<Ray>(
does_intersect,
distance,
point_of_intersection,
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>
SPROUT_CONSTEXPR typename intersection<Ray>::type intersect_4(
Ray const& ray,
int hit_side,