Skip to content

Update Matrix constants to constexpr to avoid global constructors #2695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ld-kerley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Matrix constants to constexpr to avoid global constructors #2695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions source/MaterialXCore/Types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ const string NAME_PATH_SEPARATOR = "/";
const string ARRAY_VALID_SEPARATORS = ", ";
const string ARRAY_PREFERRED_SEPARATOR = ", ";

const Matrix33 Matrix33::IDENTITY(1, 0, 0,
0, 1, 0,
0, 0, 1);

const Matrix44 Matrix44::IDENTITY(1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
constexpr Matrix33 Matrix33::IDENTITY = Matrix33(1.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 1.0f);

constexpr Matrix44 Matrix44::IDENTITY = Matrix44(1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f);

//
// Color3 methods
Expand Down
32 changes: 14 additions & 18 deletions source/MaterialXCore/Types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,10 @@ template <class M, class S, size_t N> class MatrixN : public MatrixBase
using ConstIterator = typename std::array<RowArray, N>::const_iterator;

public:
MatrixN() : _arr{} { }
explicit MatrixN(Uninit) { }
constexpr MatrixN() : _arr{} { }
constexpr explicit MatrixN(Uninit) { }
template<typename... T>
constexpr explicit MatrixN(const T... ts) : _arr{static_cast<S>(ts)...} {}
explicit MatrixN(S s) { std::fill_n(&_arr[0][0], N * N, s); }
explicit MatrixN(const S* begin, const S* end) { std::copy(begin, end, &_arr[0][0]); }

Expand Down Expand Up @@ -615,16 +617,13 @@ class MX_CORE_API Matrix33 : public MatrixN<Matrix33, float, 3>
{
public:
using MatrixN<Matrix33, float, 3>::MatrixN;
Matrix33() = default;
Matrix33(float m00, float m01, float m02,
constexpr Matrix33() = default;
constexpr Matrix33(float m00, float m01, float m02,
float m10, float m11, float m12,
float m20, float m21, float m22) :
MatrixN(Uninit{})
{
_arr = { RowArray{ m00, m01, m02 },
RowArray{ m10, m11, m12 },
RowArray{ m20, m21, m22 } };
}
MatrixN{m00, m01, m02,
m10, m11, m12,
m20, m21, m22} {}

/// @name Matrix Operations
/// @{
Expand Down Expand Up @@ -686,17 +685,14 @@ class MX_CORE_API Matrix44 : public MatrixN<Matrix44, float, 4>
public:
using MatrixN<Matrix44, float, 4>::MatrixN;
Matrix44() = default;
Matrix44(float m00, float m01, float m02, float m03,
constexpr Matrix44(float m00, float m01, float m02, float m03,
float m10, float m11, float m12, float m13,
float m20, float m21, float m22, float m23,
float m30, float m31, float m32, float m33) :
MatrixN(Uninit{})
{
_arr = { RowArray{ m00, m01, m02, m03 },
RowArray{ m10, m11, m12, m13 },
RowArray{ m20, m21, m22, m23 },
RowArray{ m30, m31, m32, m33 } };
}
MatrixN{m00, m01, m02, m03,
m10, m11, m12, m13,
m20, m21, m22, m23,
m30, m31, m32, m33} {}

/// @name Matrix Operations
/// @{
Expand Down