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 whitted_style

Browse source 
fix cbind
This commit is contained in:
bolero-MURAKAMI 2012-08-13 23:55:30 +09:00
parent 744146ae38
commit 6b1efc8a15
8 changed files with 128 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sprout/darkroom/materials/interpolation.hpp
View file

@ -32,17 +32,17 @@ namespace sprout {
return sprout::darkroom::colors::add(
sprout::darkroom::colors::mul(
sprout::darkroom::colors::add(
sprout::darkroom::colors::mul(c00, u),
sprout::darkroom::colors::mul(c01, 1 - u)
sprout::darkroom::colors::mul(c00, 1 - u),
sprout::darkroom::colors::mul(c01, u)
),
v
1 - v
),
sprout::darkroom::colors::mul(
sprout::darkroom::colors::add(
sprout::darkroom::colors::mul(c10, u),
sprout::darkroom::colors::mul(c11, 1 - u)
sprout::darkroom::colors::mul(c10, 1 - u),
sprout::darkroom::colors::mul(c11, u)
),
1 - v
v
)
);
}

2
sprout/darkroom/materials/texture_map.hpp
View file

@ -90,7 +90,7 @@ namespace sprout {
return sprout::darkroom::materials::bilinear_interpolate(
get_color(x0, y0), get_color(x0 + 1, y0),
get_color(x0, y0 + 1), get_color(x0 + 1, y0 + 1),
1 - (x - x0), 1 - (y - y0)
x - x0, y - y0
);
}
template<typename Unit>