Skip to content

Commit 312ad3c

Browse files
authored
fix ctor (#7409)
#changelog #core
1 parent 11366f3 commit 312ad3c

File tree

13 files changed

+17
-4
lines changed

13 files changed

+17
-4
lines changed

libs/openFrameworks/3d/of3dUtils.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#define GLM_FORCE_CTOR_INIT
34
#include "glm/fwd.hpp"
45

56
/// \brief Draws x,y,z axes representing the current reference frame.

libs/openFrameworks/3d/ofEasyCam.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "ofCamera.h"
44
#include "ofEvents.h"
55
#include "ofRectangle.h"
6+
7+
#define GLM_FORCE_CTOR_INIT
68
#include "glm/gtc/quaternion.hpp"
79

810
/// \brief A super simple camera for interacting with objects in 3D space.

libs/openFrameworks/app/ofWindowSettings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#define GLM_FORCE_CTOR_INIT
34
#include "glm/vec2.hpp"
45
#include <string>
56

libs/openFrameworks/graphics/ofGraphics.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "ofGraphicsBaseTypes.h"
44
#include "ofRectangle.h"
55
#include "ofConstants.h"
6-
#define GLM_FORCE_CTOR_INIT
76
#include "glm/fwd.hpp"
87

98
class ofVec3f;

libs/openFrameworks/graphics/ofGraphicsBaseTypes.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "ofGraphicsBaseTypes.h"
22
#include "ofRectangle.h"
3+
4+
#define GLM_FORCE_CTOR_INIT
35
#include "glm/vec2.hpp"
46
#include "glm/trigonometric.hpp"
57

libs/openFrameworks/graphics/ofPixels.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "ofGraphicsConstants.h"
22
#include "ofPixels.h"
3+
4+
#define GLM_FORCE_CTOR_INIT
35
#include "glm/common.hpp"
46
#include <cstring>
57

libs/openFrameworks/math/ofMatrix4x4.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
#include "ofVec4f.h"
1414
#include "ofQuaternion.h"
15+
#include "ofMathConstants.h"
1516
#include "ofConstants.h"
1617
#include "glm/mat4x4.hpp"
17-
#include "ofMathConstants.h"
1818
#include <cmath>
1919

2020
class ofVec3f;

libs/openFrameworks/math/ofQuaternion.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#include "ofMatrix4x4.h"
33
#include "ofMath.h"
44
#include "ofMathConstants.h"
5+
6+
#define GLM_FORCE_CTOR_INIT
57
#include "glm/gtc/quaternion.hpp"
68

79
//----------------------------------------

libs/openFrameworks/math/ofVec4f.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include "ofVec2f.h"
22
#include "ofVec3f.h"
33
#include "ofVec4f.h"
4+
5+
#define GLM_FORCE_CTOR_INIT
46
#include "glm/vec3.hpp"
57
#include "glm/vec4.hpp"
68

libs/openFrameworks/math/ofVectorMath.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
//#include "glm/detail/_swizzle.hpp"
1616
//#include "glm/detail/_swizzle_func.hpp"
1717

18-
#define GLM_FORCE_CTOR_INIT
1918
#include "glm/vec2.hpp"
2019
#include "glm/vec3.hpp"
2120
#include "glm/vec4.hpp"

0 commit comments

Comments
 (0)