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 curve implementation

Browse source
This commit is contained in:
bolero-MURAKAMI 2015-01-11 23:29:58 +09:00
parent b55e74de78
commit 1c758320b6
5 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sprout/math/curve/bezier.hpp
View file

@ -129,12 +129,12 @@ namespace sprout {
template<typename P0, typename P1, typename P2, typename... PTail, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<sprout::tuples::tuple<P0 const&, P1 const&, P2 const&, PTail const&...> >::type
bezier(T const& t, P0 const& p0, P1 const& p1, P2 const& p2, PTail const&... p) {
return sprout::math::bezier(sprout::tuples::forward_as_tuple(p0, p1, p2, p...), t);
return sprout::math::bezier(t, sprout::tuples::forward_as_tuple(p0, p1, p2, p...));
}
template<std::size_t N, typename P0, typename P1, typename P2, typename... PTail, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<sprout::tuples::tuple<P0 const&, P1 const&, P2 const&, PTail const&...> >::type
bezier(T const& t, P0 const& p0, P1 const& p1, P2 const& p2, PTail const&... p) {
return sprout::math::bezier<N>(sprout::tuples::forward_as_tuple(p0, p1, p2, p...), t);
return sprout::math::bezier<N>(t, sprout::tuples::forward_as_tuple(p0, p1, p2, p...));
}
} // namespace math

6
sprout/math/curve/catmull_rom_sprine.hpp
View file

@ -100,17 +100,17 @@ namespace sprout {
template<typename P0, typename P1, typename P2, typename P3, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<sprout::tuples::tuple<P0 const&, P1 const&, P2 const&, P3 const&> >::type
catmull_rom_sprine(T const& t, P0 const& p0, P1 const& p1, P2 const& p2, P3 const& p3) {
return sprout::math::catmull_rom_sprine(sprout::tuples::forward_as_tuple(p0, p1, p2, p3), t);
return sprout::math::catmull_rom_sprine(t, sprout::tuples::forward_as_tuple(p0, p1, p2, p3));
}
template<typename P0, typename P1, typename P2, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<sprout::tuples::tuple<P0 const&, P1 const&, P2 const&> >::type
catmull_rom_sprine_start(T const& t, P0 const& p0, P1 const& p1, P2 const& p2) {
return sprout::math::catmull_rom_sprine_start(sprout::tuples::forward_as_tuple(p0, p1, p2), t);
return sprout::math::catmull_rom_sprine_start(t, sprout::tuples::forward_as_tuple(p0, p1, p2));
}
template<typename P0, typename P1, typename P2, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<sprout::tuples::tuple<P0 const&, P1 const&, P2 const&> >::type
catmull_rom_sprine_end(T const& t, P0 const& p0, P1 const& p1, P2 const& p2) {
return sprout::math::catmull_rom_sprine_end(sprout::tuples::forward_as_tuple(p0, p1, p2), t);
return sprout::math::catmull_rom_sprine_end(t, sprout::tuples::forward_as_tuple(p0, p1, p2));
}
} // namespace math