From 9bf7c26b25363f704569d1aa4567a761ef72dfe5 Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Sun, 11 Jan 2015 23:46:33 +0900 Subject: [PATCH] fix type --- sprout/math/curve.hpp | 2 +- ..._rom_sprine.hpp => catmull_rom_spline.hpp} | 48 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) rename sprout/math/curve/{catmull_rom_sprine.hpp => catmull_rom_spline.hpp} (76%) diff --git a/sprout/math/curve.hpp b/sprout/math/curve.hpp index e3da3d66..2c3d0aef 100644 --- a/sprout/math/curve.hpp +++ b/sprout/math/curve.hpp @@ -11,6 +11,6 @@ #include #include #include -#include +#include #endif // #ifndef SPROUT_MATH_CURVE_HPP diff --git a/sprout/math/curve/catmull_rom_sprine.hpp b/sprout/math/curve/catmull_rom_spline.hpp similarity index 76% rename from sprout/math/curve/catmull_rom_sprine.hpp rename to sprout/math/curve/catmull_rom_spline.hpp index 5d8b8bcb..12a8713f 100644 --- a/sprout/math/curve/catmull_rom_sprine.hpp +++ b/sprout/math/curve/catmull_rom_spline.hpp @@ -5,8 +5,8 @@ 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) =============================================================================*/ -#ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPRINE_HPP -#define SPROUT_MATH_CURVE_CATMULL_ROM_SPRINE_HPP +#ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPLINE_HPP +#define SPROUT_MATH_CURVE_CATMULL_ROM_SPLINE_HPP #include #include @@ -18,7 +18,7 @@ namespace sprout { namespace math { namespace detail { template - class catmull_rom_sprine_impl { + class catmull_rom_spline_impl { public: static SPROUT_CONSTEXPR typename sprout::math::curve_point_result::type call(Points const& p, T const& t) { @@ -39,7 +39,7 @@ namespace sprout { } }; template - class catmull_rom_sprine_start_impl { + class catmull_rom_spline_start_impl { public: static SPROUT_CONSTEXPR typename sprout::math::curve_point_result::type call(Points const& p, T const& t) { @@ -57,7 +57,7 @@ namespace sprout { } }; template - class catmull_rom_sprine_end_impl { + class catmull_rom_spline_end_impl { public: static SPROUT_CONSTEXPR typename sprout::math::curve_point_result::type call(Points const& p, T const& t) { @@ -77,46 +77,46 @@ namespace sprout { } // namespace detail // - // catmull_rom_sprine - // catmull_rom_sprine_start - // catmull_rom_sprine_end + // catmull_rom_spline + // catmull_rom_spline_start + // catmull_rom_spline_end // template inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result::type - catmull_rom_sprine(T const& t, Points const& p) { - return sprout::math::detail::catmull_rom_sprine_impl::call(p, t); + catmull_rom_spline(T const& t, Points const& p) { + return sprout::math::detail::catmull_rom_spline_impl::call(p, t); } template inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result::type - catmull_rom_sprine_start(T const& t, Points const& p) { - return sprout::math::detail::catmull_rom_sprine_start_impl::call(p, t); + catmull_rom_spline_start(T const& t, Points const& p) { + return sprout::math::detail::catmull_rom_spline_start_impl::call(p, t); } template inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result::type - catmull_rom_sprine_end(T const& t, Points const& p) { - return sprout::math::detail::catmull_rom_sprine_end_impl::call(p, t); + catmull_rom_spline_end(T const& t, Points const& p) { + return sprout::math::detail::catmull_rom_spline_end_impl::call(p, t); } template inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result >::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(t, sprout::tuples::forward_as_tuple(p0, p1, p2, p3)); + catmull_rom_spline(T const& t, P0 const& p0, P1 const& p1, P2 const& p2, P3 const& p3) { + return sprout::math::catmull_rom_spline(t, sprout::tuples::forward_as_tuple(p0, p1, p2, p3)); } template inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result >::type - catmull_rom_sprine_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)); + catmull_rom_spline_start(T const& t, P0 const& p0, P1 const& p1, P2 const& p2) { + return sprout::math::catmull_rom_spline_start(t, sprout::tuples::forward_as_tuple(p0, p1, p2)); } template inline SPROUT_CONSTEXPR typename sprout::math::curve_point_result >::type - catmull_rom_sprine_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)); + catmull_rom_spline_end(T const& t, P0 const& p0, P1 const& p1, P2 const& p2) { + return sprout::math::catmull_rom_spline_end(t, sprout::tuples::forward_as_tuple(p0, p1, p2)); } } // namespace math - using sprout::math::catmull_rom_sprine; - using sprout::math::catmull_rom_sprine_start; - using sprout::math::catmull_rom_sprine_end; + using sprout::math::catmull_rom_spline; + using sprout::math::catmull_rom_spline_start; + using sprout::math::catmull_rom_spline_end; } // namespace sprout -#endif // #ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPRINE_HPP +#endif // #ifndef SPROUT_MATH_CURVE_CATMULL_ROM_SPLINE_HPP