Skip to content

Commit 11366f3

Browse files
authored
More .h work (#7403)
#changelog #core
1 parent 8a20605 commit 11366f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+258
-210
lines changed

libs/openFrameworks/3d/ofCamera.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "ofCamera.h"
22
#include "ofGraphics.h"
3+
4+
#define GLM_FORCE_CTOR_INIT
35
#include "glm/gtx/transform.hpp"
46
#include "glm/gtc/quaternion.hpp"
57
#include "of3dGraphics.h"

libs/openFrameworks/3d/ofEasyCam.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
#include "ofMath.h"
33
#include "ofUtils.h"
44
#include "ofGraphicsBaseTypes.h"
5-
#include <limits>
5+
6+
#define GLM_FORCE_CTOR_INIT
67
#include "glm/gtx/vector_angle.hpp"
8+
#include <limits>
79

810
// when an ofEasyCam is moving due to momentum, this keeps it
911
// from moving forever by assuming small values are zero.

libs/openFrameworks/3d/ofMesh.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#ifndef OF_MESH_H
44
#define OF_MESH_H
55

6-
#include "ofConstants.h"
76
#include "ofGLUtils.h"
87

98
template<class V, class N, class C, class T>

libs/openFrameworks/3d/ofNode.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11

22
#pragma once
33

4-
#include "ofConstants.h"
54
#include "ofParameter.h"
6-
#include <array>
5+
#include "ofConstants.h"
76
#include "glm/mat4x4.hpp"
7+
#include <array>
88

99
class ofBaseRenderer;
1010

11-
1211
/// \brief A generic 3d object in space with transformation (position, rotation, scale).
1312

1413
class ofNode {

libs/openFrameworks/app/ofAppBaseWindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "ofConstants.h"
43
#include "ofWindowSettings.h"
4+
#include "ofConstants.h"
55

66
class ofBaseApp;
77
class ofBaseRenderer;

libs/openFrameworks/app/ofAppEGLWindow.h

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

3-
#include "ofConstants.h"
43
#include "ofAppBaseWindow.h"
54
#include "ofThread.h"
65
#include "ofImage.h"
76
#include "ofEvents.h"
87
#include "ofRectangle.h"
9-
10-
8+
#include "ofConstants.h"
119
#include <queue>
1210
#include <map>
1311
#include <X11/Xlib.h>

libs/openFrameworks/app/ofAppGLFWWindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "ofConstants.h"
43
#include "ofAppBaseWindow.h"
54
#include "ofRectangle.h"
5+
#include "ofConstants.h"
66

77
#if defined(TARGET_LINUX) && !defined(TARGET_RASPBERRY_PI_LEGACY)
88
typedef struct _XIM * XIM;

libs/openFrameworks/app/ofAppGlutWindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include "ofConstants.h"
43
#include "ofAppBaseWindow.h"
54
#include "ofEvents.h"
65
#include "ofTypes.h"
76
#include "ofPixels.h"
7+
#include "ofConstants.h"
88

99
class ofBaseApp;
1010
class ofBaseRenderer;

libs/openFrameworks/app/ofAppNoWindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "ofConstants.h"
43
#include "ofAppBaseWindow.h"
4+
#include "ofConstants.h"
55

66
class ofBaseApp;
77
class ofCoreEvents;

libs/openFrameworks/app/ofAppRunner.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3-
#include "ofConstants.h"
43
#include "ofWindowSettings.h"
54
#include "ofMainLoop.h"
5+
#include "ofConstants.h"
66

77
class ofRectangle;
88
class ofAppBaseWindow;

0 commit comments

Comments
 (0)