Skip to content

Commit

Permalink
[共通] 細かい修正
Browse files Browse the repository at this point in the history
Reputeless committed Apr 25, 2024
1 parent dff7d38 commit 832fbe3
Showing 8 changed files with 23 additions and 23 deletions.
16 changes: 8 additions & 8 deletions Siv3D/include/Siv3D/Math.hpp
Original file line number Diff line number Diff line change
@@ -244,21 +244,21 @@ namespace s3d
//
//////////////////////////////////////////////////

inline float Modf(float x, float& exp) noexcept;
inline float Modf(float x, float& ip) noexcept;

inline double Modf(double x, double& exp) noexcept;
inline double Modf(double x, double& ip) noexcept;

inline Float2 Modf(Float2 x, Float2& exp) noexcept;
inline Float2 Modf(Float2 x, Float2& ip) noexcept;

inline Float3 Modf(Float3 x, Float3& exp) noexcept;
inline Float3 Modf(Float3 x, Float3& ip) noexcept;

inline Float4 Modf(Float4 x, Float4& exp) noexcept;
inline Float4 Modf(Float4 x, Float4& ip) noexcept;

inline Vec2 Modf(Vec2 x, Vec2& exp) noexcept;
inline Vec2 Modf(Vec2 x, Vec2& ip) noexcept;

inline Vec3 Modf(Vec3 x, Vec3& exp) noexcept;
inline Vec3 Modf(Vec3 x, Vec3& ip) noexcept;

inline Vec4 Modf(Vec4 x, Vec4& exp) noexcept;
inline Vec4 Modf(Vec4 x, Vec4& ip) noexcept;

//////////////////////////////////////////////////
//
2 changes: 1 addition & 1 deletion Siv3D/include/Siv3D/MathParser.hpp
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ namespace s3d
/// @param name 変数名
/// @param value 変数へのポインタ
/// @return 変数の登録に成功した場合 true, それ以外の場合は false
bool setVaribale(StringView name, double* value);
bool setVariable(StringView name, double* value);

/// @brief 関数を登録します。
/// @param name 関数名
6 changes: 3 additions & 3 deletions Siv3D/include/Siv3D/detail/ImageDecoder.ipp
Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@

namespace s3d
{
namespace ImageEncoder
namespace ImageDecoder
{
template <class ImageEncoder>
template <class ImageDecoder>
bool Add()
{
return Add(std::make_unique<ImageEncoder>());
return Add(std::make_unique<ImageDecoder>());
}
}
}
6 changes: 3 additions & 3 deletions Siv3D/include/Siv3D/detail/ImageEncoder.ipp
Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@

namespace s3d
{
namespace ImageDecoder
namespace ImageEncoder
{
template <class ImageDecoder>
template <class ImageEncoder>
bool Add()
{
return Add(std::make_unique<ImageDecoder>());
return Add(std::make_unique<ImageEncoder>());
}
}
}
8 changes: 4 additions & 4 deletions Siv3D/include/Siv3D/detail/Math.ipp
Original file line number Diff line number Diff line change
@@ -307,14 +307,14 @@ namespace s3d
//
//////////////////////////////////////////////////

inline float Modf(float x, float& i) noexcept
inline float Modf(float x, float& ip) noexcept
{
return std::modf(x, &i);
return std::modf(x, &ip);
}

inline double Modf(double x, double& i) noexcept
inline double Modf(double x, double& ip) noexcept
{
return std::modf(x, &i);
return std::modf(x, &ip);
}

SIV3D_MATH_FUNCTION_XYREF(Modf)
2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D/MathParser/MathParserDetail.cpp
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ namespace s3d
}
}

bool MathParser::MathParserDetail::setVaribale(const StringView name, double* value)
bool MathParser::MathParserDetail::setVariable(const StringView name, double* value)
{
m_errorMessage.clear();

2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D/MathParser/MathParserDetail.hpp
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ namespace s3d
bool setConstant(StringView name, double value);

[[nodiscard]]
bool setVaribale(StringView name, double* value);
bool setVariable(StringView name, double* value);

template <class Fty>
[[nodiscard]]
4 changes: 2 additions & 2 deletions Siv3D/src/Siv3D/MathParser/SivMathParser.cpp
Original file line number Diff line number Diff line change
@@ -46,9 +46,9 @@ namespace s3d
return pImpl->setConstant(name, value);
}

bool MathParser::setVaribale(const StringView name, double* value)
bool MathParser::setVariable(const StringView name, double* value)
{
return pImpl->setVaribale(name, value);
return pImpl->setVariable(name, value);
}

bool MathParser::setFunction(const StringView name, Fty0 f)

0 comments on commit 832fbe3

Please sign in to comment.