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

add sprout/math/comparison.hpp

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-07-06 23:10:49 +09:00
parent d51bd06eda
commit 1c65d59971
20 changed files with 379 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,8 +143,6 @@ namespace sprout {
Vec const& normal
) const
{
using sprout::atan2;
using sprout::sqrt;
return typename intersection<Ray>::type(
sprout::tuples::get<zw::does_intersect>(zwo),
sprout::tuples::get<zw::distance>(zwo),
@ -152,15 +150,15 @@ namespace sprout {
sprout::tuples::get<dr::normal>(drei),
sprout::darkroom::materials::calc_material( // ! Spherical
mat_,
atan2(
sprout::atan2(
sprout::darkroom::coords::z(normal),
sprout::darkroom::coords::x(normal)
)
/ sprout::math::pi<unit_type>()
,
atan2(
sprout::atan2(
sprout::darkroom::coords::y(normal),
sqrt(
sprout::sqrt(
sprout::darkroom::coords::x(normal) * sprout::darkroom::coords::x(normal)
+ sprout::darkroom::coords::z(normal) * sprout::darkroom::coords::z(normal)
)
@ -206,14 +204,13 @@ namespace sprout {
unit_type const& det_sq
) const
{
using sprout::sqrt;
return intersect_4(
ray,
zweitens(
ray,
det_sq > 0,
b,
sqrt(det_sq)
sprout::sqrt(det_sq)
)
);
}