mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed type inconsistency in irawan.h

metadata
Wenzel Jakob 2017-07-28 22:07:59 +02:00
parent c510050e0b
commit f67824a2bf
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bsdfs/irawan.h
View File

@ -311,10 +311,12 @@ template <typename Iterator> struct YarnGrammar : qi::grammar<Iterator, Yarn(),
spec = ((lit("{") >> Float_ >> lit(",") >> Float_ >> lit(",") >> Float_ >> lit("}")) spec = ((lit("{") >> Float_ >> lit(",") >> Float_ >> lit(",") >> Float_ >> lit("}"))
[ ph::bind(&Spectrum::fromLinearRGB, _val, _1, _2, _3, Spectrum::EReflectance) ]) [ ph::bind(&Spectrum::fromLinearRGB, _val, _1, _2, _3, Spectrum::EReflectance) ])
| (identifier [ _val = ph::bind(&Properties::getSpectrum, ph::ref(props), _1)]); | (identifier [ _val = ph::bind((Spectrum (Properties::*)(const std::string &) const)
&Properties::getSpectrum, ph::ref(props), _1)]);
flt = (Float_ [ _val = _1 ]) flt = (Float_ [ _val = _1 ])
| (identifier [ _val = ph::bind(&Properties::getFloat, ph::ref(props), _1)]); | (identifier [ _val = ph::bind((Float (Properties::*)(const std::string &) const)
&Properties::getFloat, ph::ref(props), _1)]);
start = lit("yarn") start = lit("yarn")
>> lit("{") >> lit("{")
@ -364,7 +366,8 @@ template <typename Iterator> struct WeavePatternGrammar : qi::grammar<Iterator,
>> *(qi::alnum | char_('_')) ]; >> *(qi::alnum | char_('_')) ];
flt = (Float_ [ _val = _1 ]) flt = (Float_ [ _val = _1 ])
| (identifier [ _val = ph::bind(&Properties::getFloat, ph::ref(props), _1)]); | (identifier [ _val = ph::bind((Float (Properties::*)(const std::string &) const)
&Properties::getFloat, ph::ref(props), _1)]);
start = lit("weave") >> lit("{") >> ( start = lit("weave") >> lit("{") >> (
lit("name") >> lit("=") >> name [ ph::bind(&WeavePattern::name, _val) = _1 ] lit("name") >> lit("=") >> name [ ph::bind(&WeavePattern::name, _val) = _1 ]