olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix build on macOS/clang

This commit is contained in:
Eric Wasylishen 2022-05-11 00:21:14 -06:00
parent 0147e51658
commit 6e3bb91d98
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/common/qvec.hh
View File

@ -621,14 +621,6 @@ template<typename T>
return normal;
}
template<typename T>
inline qvec<T, 3> vec_from_mangle(const qvec<T, 3> &m)
{
const qvec<T, 3> mRadians = m * static_cast<T>(Q_PI / 180.0);
const qmat3x3d rotations = RotateAboutZ(mRadians[0]) * RotateAboutY(-mRadians[1]);
return {rotations * qvec3d(1, 0, 0)};
}
template<typename T>
inline qvec<T, 3> mangle_from_vec(const qvec<T, 3> &v)
{
@ -1146,4 +1138,16 @@ struct twosided
// equality checks
constexpr bool operator==(const twosided &other) const { return front == other.front && back == other.back; }
constexpr bool operator!=(const twosided &other) const { return !(*this == other); }
};
};
namespace qv {
template<typename T>
inline qvec<T, 3> vec_from_mangle(const qvec<T, 3> &m)
{
const qvec<T, 3> mRadians = m * static_cast<T>(Q_PI / 180.0);
const qmat3x3d rotations = RotateAboutZ(mRadians[0]) * RotateAboutY(-mRadians[1]);
return {rotations * qvec3d(1, 0, 0)};
}
}

2
include/common/settings.hh
View File

@ -43,7 +43,7 @@ private:
public:
parse_exception(std::string str) : _what(std::move(str)) { }
const char *what() const override { return _what.c_str(); }
const char *what() const noexcept override { return _what.c_str(); }
};
enum class source