Skip to content

Commit 0bcb728

Browse files
TomSawTomSaw
committed
constexpr constructors, #pragma once
1 parent d46c09d commit 0bcb728

15 files changed

+224
-695
lines changed

‎src/modm/math/geometry/vector.hpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
*/
1313
// ----------------------------------------------------------------------------
1414

15-
#ifndef MODM_VECTOR_HPP
16-
#define MODM_VECTOR_HPP
15+
#pragma once
1716

1817
#include <cmath>
1918
#include <stdint.h>
@@ -24,7 +23,8 @@
2423
namespace modm
2524
{
2625
// forward declaration
27-
template<typename T, uint8_t W, uint8_t H> class Matrix;
26+
template<typename T, uint8_t, uint8_t>
27+
class Matrix;
2828

2929
/**
3030
* \brief Class for handling common point operations
@@ -146,6 +146,4 @@ namespace modm
146146
#include "vector1.hpp"
147147
#include "vector2.hpp"
148148
#include "vector3.hpp"
149-
#include "vector4.hpp"
150-
151-
#endif // MODM_VECTOR_HPP
149+
#include "vector4.hpp"

‎src/modm/math/geometry/vector1.hpp‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
*/
1212
// ----------------------------------------------------------------------------
1313

14-
#ifndef MODM_VECTOR1_HPP
15-
#define MODM_VECTOR1_HPP
14+
#pragma once
1615

1716
#include <cmath>
1817
#include <cstdlib>
@@ -36,9 +35,9 @@ namespace modm
3635
class Vector<T, 1>
3736
{
3837
public:
39-
Vector();
40-
Vector(T inX);
41-
Vector(const Matrix<T, 1, 1> &rhs);
38+
constexpr Vector() = default;
39+
constexpr Vector(T inX);
40+
constexpr Vector(const Matrix<T, 1, 1> &rhs);
4241

4342
inline void
4443
set(const T& x);
@@ -88,7 +87,7 @@ namespace modm
8887
bool hasInf() const;
8988

9089
public:
91-
T x;
90+
T x = 0;
9291

9392
public:
9493
#ifndef __DOXYGEN__
@@ -109,5 +108,3 @@ namespace modm
109108
}
110109

111110
#include "vector1_impl.hpp"
112-
113-
#endif // MODM_VECTOR1_HPP

‎src/modm/math/geometry/vector1_impl.hpp‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,30 @@
1111
*/
1212
// ----------------------------------------------------------------------------
1313

14-
#ifndef MODM_VECTOR1_HPP
15-
#error "Don't include this file directly, use 'vector1.hpp' instead!"
16-
#endif
14+
#pragma once
15+
#include "vector1.hpp"
1716

18-
// ----------------------------------------------------------------------------
1917
template<typename T>
20-
modm::Vector<T, 1>::Vector() :
21-
x()
22-
{
23-
}
24-
25-
template<typename T>
26-
modm::Vector<T, 1>::Vector(T inX) :
18+
constexpr modm::Vector<T, 1>::Vector(T inX) :
2719
x(inX)
28-
{
29-
}
20+
{}
3021

3122
template<typename T>
32-
modm::Vector<T, 1>::Vector(const modm::Matrix<T, 1, 1> &rhs) :
23+
constexpr modm::Vector<T, 1>::Vector(const modm::Matrix<T, 1, 1> &rhs) :
3324
x(*reinterpret_cast<const T*>(&rhs))
34-
{
35-
}
25+
{}
3626

3727
// ----------------------------------------------------------------------------
3828
template<typename T>
3929
void
4030
modm::Vector<T, 1>::set(const T& value)
41-
{
42-
this->x = value;
43-
}
31+
{ this->x = value; }
4432

4533
// ----------------------------------------------------------------------------
4634
template<typename T>
4735
void
4836
modm::Vector<T, 1>::setX(const T& value)
49-
{
50-
this->x = value;
51-
}
37+
{ this->x = value; }
5238

5339
// ----------------------------------------------------------------------------
5440
template<typename T>

‎src/modm/math/geometry/vector2.hpp‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
*/
1313
// ----------------------------------------------------------------------------
1414

15-
#ifndef MODM_VECTOR2_HPP
16-
#define MODM_VECTOR2_HPP
15+
#pragma once
1716

1817
#include <cmath>
1918
#include <stdint.h>
@@ -62,19 +61,13 @@ namespace modm
6261
typedef typename GeometricTraits<T>::FloatType FloatType;
6362

6463
public:
65-
/**
66-
* \brief Default-Constructor
67-
*
68-
* Creates a Vector with coordinates (0, 0).
69-
*/
70-
Vector();
71-
72-
Vector(const T& inX, const T& inY);
73-
74-
Vector(const Vector<T, 1> &inX, const Vector<T, 1> &inY);
75-
Vector(const T &inX, const Vector<T, 1> &inY);
76-
Vector(const Vector<T, 1> &inX, const T &inY);
77-
explicit Vector(T inVal);
64+
constexpr Vector() = default;
65+
constexpr Vector(const T& inX, const T& inY);
66+
constexpr Vector(const Vector<T, 1> &inX, const Vector<T, 1> &inY);
67+
constexpr Vector(const T &inX, const Vector<T, 1> &inY);
68+
constexpr Vector(const Vector<T, 1> &inX, const T &inY);
69+
constexpr explicit Vector(T inVal);
70+
// TODO requires constexpr Matrix constructors
7871
Vector(const Matrix<T, 2, 1> &rhs);
7972

8073
inline void
@@ -246,8 +239,8 @@ namespace modm
246239
const T* ptr() const;
247240

248241
Vector operator - () const;
249-
Vector operator - (const Vector &rhs) const;
250-
Vector operator + (const Vector &rhs) const;
242+
constexpr Vector operator - (const Vector &rhs) const;
243+
constexpr Vector operator + (const Vector &rhs) const;
251244
T operator * (const Vector &rhs) const;
252245
T operator ^ (const Vector &rhs) const;
253246
Vector operator * (float rhs) const;
@@ -295,8 +288,7 @@ namespace modm
295288
#endif
296289

297290
public:
298-
T x;
299-
T y;
291+
T x = 0, y = 0;
300292

301293
protected:
302294
template<typename U>
@@ -379,6 +371,4 @@ namespace modm
379371
}
380372
}
381373

382-
#include "vector2_impl.hpp"
383-
384-
#endif // MODM_VECTOR2_HPP
374+
#include "vector2_impl.hpp"

‎src/modm/math/geometry/vector2_impl.hpp‎

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,69 +10,42 @@
1010
*/
1111
// ----------------------------------------------------------------------------
1212

13-
#ifndef MODM_VECTOR2_HPP
14-
#error "Don't include this file directly, use 'vector2.hpp' instead!"
15-
#endif
13+
#pragma once
14+
#include "vector2.hpp"
1615

1716
#include <cmath>
1817

1918
// ----------------------------------------------------------------------------
2019
template<typename T>
21-
modm::Vector<T, 2>::Vector() :
22-
x(),
23-
y()
24-
{
25-
}
20+
constexpr modm::Vector<T, 2>::Vector(const T& inX, const T& inY)
21+
: x(inX), y(inY) {}
2622

2723
// ----------------------------------------------------------------------------
2824
template<typename T>
29-
modm::Vector<T, 2>::Vector(const T& inX, const T& inY) :
30-
x(inX),
31-
y(inY)
32-
{
33-
}
25+
constexpr modm::Vector<T, 2>::Vector(const modm::Vector<T, 1> &inX, const modm::Vector<T, 1> &inY)
26+
: x(inX.x), y(inY.x) {}
3427

3528
// ----------------------------------------------------------------------------
3629
template<typename T>
37-
modm::Vector<T, 2>::Vector(
38-
const modm::Vector<T, 1> &inX,
39-
const modm::Vector<T, 1> &inY) :
40-
x(inX.x),
41-
y(inY.x)
42-
{
43-
}
30+
constexpr modm::Vector<T, 2>::Vector(const T &inX, const modm::Vector<T, 1> &inY)
31+
: x(inX), y(inY.x) {}
4432

4533
// ----------------------------------------------------------------------------
4634
template<typename T>
47-
modm::Vector<T, 2>::Vector(const T &inX, const modm::Vector<T, 1> &inY) :
48-
x(inX),
49-
y(inY.x)
50-
{
51-
}
35+
constexpr modm::Vector<T, 2>::Vector(const modm::Vector<T, 1> &inX, const T &inY)
36+
: x(inX.x), y(inY) {}
5237

5338
// ----------------------------------------------------------------------------
5439
template<typename T>
55-
modm::Vector<T, 2>::Vector(const modm::Vector<T, 1> &inX, const T &inY) :
56-
x(inX.x),
57-
y(inY)
58-
{
59-
}
60-
61-
// ----------------------------------------------------------------------------
62-
template<typename T>
63-
modm::Vector<T, 2>::Vector(T inVal) :
64-
x(inVal),
65-
y(inVal)
66-
{
67-
}
40+
constexpr modm::Vector<T, 2>::Vector(T inVal) :
41+
x(inVal), y(inVal) {}
6842

6943
// ----------------------------------------------------------------------------
7044
template<typename T>
7145
modm::Vector<T, 2>::Vector(const modm::Matrix<T, 2, 1> &rhs) :
7246
x(reinterpret_cast<const T*>(&rhs)[0]),
7347
y(reinterpret_cast<const T*>(&rhs)[1])
74-
{
75-
}
48+
{}
7649

7750
// ----------------------------------------------------------------------------
7851
template<typename T>
@@ -406,15 +379,15 @@ modm::Vector<T, 2>::operator - () const
406379

407380
// ----------------------------------------------------------------------------
408381
template<typename T>
409-
modm::Vector<T, 2>
382+
constexpr modm::Vector<T, 2>
410383
modm::Vector<T, 2>::operator - (const modm::Vector<T, 2> &rhs) const
411384
{
412385
return modm::Vector<T, 2>(x - rhs.x, y - rhs.y);
413386
}
414387

415388
// ----------------------------------------------------------------------------
416389
template<typename T>
417-
modm::Vector<T, 2>
390+
constexpr modm::Vector<T, 2>
418391
modm::Vector<T, 2>::operator + (const modm::Vector<T, 2> &rhs) const
419392
{
420393
return modm::Vector<T, 2>(x + rhs.x, y + rhs.y);

‎src/modm/math/geometry/vector3.hpp‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
*/
1212
// ----------------------------------------------------------------------------
1313

14-
#ifndef MODM_VECTOR3_HPP
15-
#define MODM_VECTOR3_HPP
14+
#pragma once
1615

1716
#include <stdint.h>
1817
#include "vector.hpp"
@@ -39,33 +38,33 @@ namespace modm
3938
class Vector<T, 3>
4039
{
4140
public:
42-
Vector();
41+
constexpr Vector() = default;
4342

4443
template<typename U>
45-
explicit Vector(const U *array);
44+
constexpr explicit Vector(const U *array);
4645

47-
explicit Vector(T inVal);
48-
Vector(T inX, T inY, T inZ);
46+
constexpr explicit Vector(T inVal);
47+
constexpr Vector(T inX, T inY, T inZ);
4948

50-
Vector(const Vector<T, 1> &inX, const T &inY, const T &inZ);
51-
Vector(const T &inX, const Vector<T, 1> &inY, const T &inZ);
52-
Vector(const T &inX, const T &inY, const Vector<T, 1> &inZ);
49+
constexpr Vector(const Vector<T, 1> &inX, const T &inY, const T &inZ);
50+
constexpr Vector(const T &inX, const Vector<T, 1> &inY, const T &inZ);
51+
constexpr Vector(const T &inX, const T &inY, const Vector<T, 1> &inZ);
5352

54-
Vector(const Vector<T, 1> &inX, const T &inY, const Vector<T, 1> &inZ);
55-
Vector(const Vector<T, 1> &inX, const Vector<T, 1> &inY, const T &inZ);
56-
Vector(const T &inX, const Vector<T, 1> &inY, const Vector<T, 1> &inZ);
53+
constexpr Vector(const Vector<T, 1> &inX, const T &inY, const Vector<T, 1> &inZ);
54+
constexpr Vector(const Vector<T, 1> &inX, const Vector<T, 1> &inY, const T &inZ);
55+
constexpr Vector(const T &inX, const Vector<T, 1> &inY, const Vector<T, 1> &inZ);
5756

58-
Vector(const Vector<T, 1> &inX, const Vector<T, 1> &inY, const Vector<T, 1> &inZ);
57+
constexpr Vector(const Vector<T, 1> &inX, const Vector<T, 1> &inY, const Vector<T, 1> &inZ);
5958

60-
Vector(const Vector<T,2> &inXY, const T &inZ);
61-
Vector(const T &inX, const Vector<T, 2> &inYZ);
59+
constexpr Vector(const Vector<T,2> &inXY, const T &inZ);
60+
constexpr Vector(const T &inX, const Vector<T, 2> &inYZ);
6261

63-
Vector(const Vector<T, 2> &inXY, const Vector<T, 1> &inZ);
64-
Vector(const Vector<T, 1> &inX, const Vector<T, 2> &inYZ);
62+
constexpr Vector(const Vector<T, 2> &inXY, const Vector<T, 1> &inZ);
63+
constexpr Vector(const Vector<T, 1> &inX, const Vector<T, 2> &inYZ);
6564

6665
template<typename U>
67-
Vector(const Vector<U, 3> &rhs);
68-
Vector(const Matrix<T, 3, 1> &rhs);
66+
constexpr Vector(const Vector<U, 3> &rhs);
67+
constexpr Vector(const Matrix<T, 3, 1> &rhs);
6968

7069

7170
inline void
@@ -190,9 +189,7 @@ namespace modm
190189
#endif
191190

192191
public:
193-
T x;
194-
T y;
195-
T z;
192+
T x = 0, y = 0, z = 0;
196193
};
197194

198195
template<typename U, typename T>
@@ -213,6 +210,4 @@ namespace modm
213210
typedef Vector<uint16_t, 3> Vector3u;
214211
}
215212

216-
#include "vector3_impl.hpp"
217-
218-
#endif // MODM_VECTOR3_HPP
213+
#include "vector3_impl.hpp"

0 commit comments

Comments
 (0)