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

fix darkroom: fix template operator() member-function call -> calcurate() free-function

This commit is contained in:
bolero-MURAKAMI 2013-09-24 15:08:36 +09:00
parent 3cb882ce91
commit dfcb6bcf31
25 changed files with 494 additions and 129 deletions

View file

@ -49,7 +49,7 @@ namespace sprout {
unit_type,
position_type,
position_type,
decltype(sprout::darkroom::materials::calc_material(
decltype(sprout::darkroom::materials::calculate_material(
std::declval<material_type const&>(),
std::declval<unit_type const&>(),
std::declval<unit_type const&>()
@ -84,17 +84,17 @@ namespace sprout {
: 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(
is_x() ? sprout::darkroom::materials::calculate_material(
mat_,
sprout::darkroom::coords::z(point_of_intersection),
sprout::darkroom::coords::y(point_of_intersection)
)
: is_y() ? sprout::darkroom::materials::calc_material(
: is_y() ? sprout::darkroom::materials::calculate_material(
mat_,
sprout::darkroom::coords::x(point_of_intersection),
sprout::darkroom::coords::z(point_of_intersection)
)
: sprout::darkroom::materials::calc_material(
: sprout::darkroom::materials::calculate_material(
mat_,
sprout::darkroom::coords::x(point_of_intersection),
sprout::darkroom::coords::y(point_of_intersection)