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: fix template operator() member-function call -> calcurate() free-function

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
sprout/darkroom/objects/polygon/triangle.hpp
View file

@ -39,7 +39,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&>()
@ -72,7 +72,7 @@ namespace sprout {
: position_type(0, 0, 0)
,
normal_,//hit_side > 0 ? normal_ : sprout::darkroom::coords::negate(normal_),
sprout::darkroom::materials::calc_material(mat_, unit_type(0), unit_type(0)) // ???
sprout::darkroom::materials::calculate_material(mat_, unit_type(0), unit_type(0)) // ???
);
}
template<typename Ray>