mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix type

Browse source
This commit is contained in:
bolero-MURAKAMI 2015-01-11 23:46:33 +09:00
parent 1c758320b6
commit 9bf7c26b25
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sprout/math/curve.hpp
View file

@ -11,6 +11,6 @@
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/math/curve/curve_point.hpp> #include <sprout/math/curve/curve_point.hpp>
#include <sprout/math/curve/bezier.hpp> #include <sprout/math/curve/bezier.hpp>
#include <sprout/math/curve/catmull_rom_sprine.hpp> #include <sprout/math/curve/catmull_rom_spline.hpp>
#endif // #ifndef SPROUT_MATH_CURVE_HPP #endif // #ifndef SPROUT_MATH_CURVE_HPP

48
sprout/math/curve/catmull_rom_sprine.hpp → sprout/math/curve/catmull_rom_spline.hpp
View file

@ -5,8 +5,8 @@
Distributed under the Boost Software License, Version 1.0. (See accompanying Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/ =============================================================================*/
#ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPRINE_HPP #ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPLINE_HPP
#define SPROUT_MATH_CURVE_CATMULL_ROM_SPRINE_HPP #define SPROUT_MATH_CURVE_CATMULL_ROM_SPLINE_HPP
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/detail/pow.hpp> #include <sprout/detail/pow.hpp>
@ -18,7 +18,7 @@ namespace sprout {
namespace math { namespace math {
namespace detail { namespace detail {
template<typename Points, typename T> template<typename Points, typename T>
class catmull_rom_sprine_impl { class catmull_rom_spline_impl {
public: public:
static SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type static SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type
call(Points const& p, T const& t) { call(Points const& p, T const& t) {
@ -39,7 +39,7 @@ namespace sprout {
} }
}; };
template<typename Points, typename T> template<typename Points, typename T>
class catmull_rom_sprine_start_impl { class catmull_rom_spline_start_impl {
public: public:
static SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type static SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type
call(Points const& p, T const& t) { call(Points const& p, T const& t) {
@ -57,7 +57,7 @@ namespace sprout {
} }
}; };
template<typename Points, typename T> template<typename Points, typename T>
class catmull_rom_sprine_end_impl { class catmull_rom_spline_end_impl {
public: public:
static SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type static SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type
call(Points const& p, T const& t) { call(Points const& p, T const& t) {
@ -77,46 +77,46 @@ namespace sprout {
} // namespace detail } // namespace detail
// //
// catmull_rom_sprine // catmull_rom_spline
// catmull_rom_sprine_start // catmull_rom_spline_start
// catmull_rom_sprine_end // catmull_rom_spline_end
// //
template<typename Points, typename T> template<typename Points, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type
catmull_rom_sprine(T const& t, Points const& p) { catmull_rom_spline(T const& t, Points const& p) {
return sprout::math::detail::catmull_rom_sprine_impl<Points, T>::call(p, t); return sprout::math::detail::catmull_rom_spline_impl<Points, T>::call(p, t);
} }
template<typename Points, typename T> template<typename Points, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type
catmull_rom_sprine_start(T const& t, Points const& p) { catmull_rom_spline_start(T const& t, Points const& p) {
return sprout::math::detail::catmull_rom_sprine_start_impl<Points, T>::call(p, t); return sprout::math::detail::catmull_rom_spline_start_impl<Points, T>::call(p, t);
} }
template<typename Points, typename T> template<typename Points, typename T>
inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result<Points>::type
catmull_rom_sprine_end(T const& t, Points const& p) { catmull_rom_spline_end(T const& t, Points const& p) {
return sprout::math::detail::catmull_rom_sprine_end_impl<Points, T>::call(p, t); return sprout::math::detail::catmull_rom_spline_end_impl<Points, T>::call(p, t);
} }
template<typename P0, typename P1, typename P2, typename P3, typename T> 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 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) { catmull_rom_spline(T const& t, P0 const& p0, P1 const& p1, P2 const& p2, P3 const& p3) {
return sprout::math::catmull_rom_sprine(t, sprout::tuples::forward_as_tuple(p0, p1, p2, p3)); return sprout::math::catmull_rom_spline(t, sprout::tuples::forward_as_tuple(p0, p1, p2, p3));
} }
template<typename P0, typename P1, typename P2, typename T> 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 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) { catmull_rom_spline_start(T const& t, P0 const& p0, P1 const& p1, P2 const& p2) {
return sprout::math::catmull_rom_sprine_start(t, sprout::tuples::forward_as_tuple(p0, p1, p2)); return sprout::math::catmull_rom_spline_start(t, sprout::tuples::forward_as_tuple(p0, p1, p2));
} }
template<typename P0, typename P1, typename P2, typename T> 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 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) { catmull_rom_spline_end(T const& t, P0 const& p0, P1 const& p1, P2 const& p2) {
return sprout::math::catmull_rom_sprine_end(t, sprout::tuples::forward_as_tuple(p0, p1, p2)); return sprout::math::catmull_rom_spline_end(t, sprout::tuples::forward_as_tuple(p0, p1, p2));
} }
} // namespace math } // namespace math
using sprout::math::catmull_rom_sprine; using sprout::math::catmull_rom_spline;
using sprout::math::catmull_rom_sprine_start; using sprout::math::catmull_rom_spline_start;
using sprout::math::catmull_rom_sprine_end; using sprout::math::catmull_rom_spline_end;
} // namespace sprout } // namespace sprout
#endif // #ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPRINE_HPP #endif // #ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPLINE_HPP