Skip to content

Commit 10a6ac1

Browse files
authored
More .h cleanup (#7779)
#changelog #headers
1 parent dd09e97 commit 10a6ac1

Some content is hidden

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

63 files changed

+89
-97
lines changed

addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "ofPixels.h"
66
#include "ofGraphics.h"
77
#include "ofConstants.h"
8+
#include "ofMatrix4x4.h"
89

910
#include <assimp/cimport.h>
1011
#include <assimp/scene.h>

addons/ofxGui/src/ofxColorPicker.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "ofxColorPicker.h"
1010
#include "ofGraphics.h"
11+
#include "ofPolyline.h"
1112

1213

1314
namespace {

addons/ofxGui/src/ofxGuiGroup.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "ofxButton.h"
66
#include "ofxLabel.h"
77
#include "ofxSlider.h"
8+
#include "ofPath.h"
89

910
class ofxGuiGroup : public ofxBaseGui {
1011
public:

addons/ofxGui/src/ofxInputField.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#pragma once
1010

1111
#include "ofxBaseGui.h"
12+
#include "ofVboMesh.h"
1213

1314
template<typename Type>
1415
class ofxInputField : public ofxBaseGui{

addons/ofxGui/src/ofxLabel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "ofxBaseGui.h"
44
#include "ofParameter.h"
5+
#include "ofPath.h"
6+
#include "ofVboMesh.h"
57

68
class ofxLabel: public ofxBaseGui {
79
public:

addons/ofxGui/src/ofxToggle.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "ofParameter.h"
44
#include "ofxBaseGui.h"
5+
#include "ofPath.h"
56

67
class ofxToggle : public ofxBaseGui{
78
public:

libs/openFrameworks/3d/of3dPrimitives.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include "ofMesh.h"
44
#include "ofNode.h"
5-
#include <map>
65

76
class ofTexture;
87
class ofVboMesh;

libs/openFrameworks/3d/of3dUtils.h

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

33
#define GLM_FORCE_CTOR_INIT
4-
#include "glm/fwd.hpp"
4+
#include "glm/vec3.hpp"
55

66
/// \brief Draws x,y,z axes representing the current reference frame.
77
///
@@ -62,7 +62,7 @@ void ofDrawGridPlane(float stepSize = 1.25f, size_t numberOfSteps = 8, bool labe
6262
/// \param start The start point (tail) of the arrow, expressed as an glm::vec3.
6363
/// \param end The end point (head) of the arrow, expressed as an glm::vec3.
6464
/// \param headSize The size of the arrowhead.
65-
void ofDrawArrow(const glm::vec3& start, const glm::vec3& end, float headSize = 0.05f);
65+
void ofDrawArrow(const glm::vec3 & start, const glm::vec3 & end, float headSize = 0.05f);
6666

6767
/// \brief This function renders a set of 3 axis-aligned circular bands, centered at the origin.
6868
///

libs/openFrameworks/3d/ofMesh.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "ofGraphicsBaseTypes.h"
77
#include "ofVectorMath.h"
88
#include "ofMath.h"
9-
#include "ofMathConstants.h"
9+
// #include "ofMathConstants.h"
1010
#include "ofLog.h"
1111
#include "ofColor.h"
1212

libs/openFrameworks/3d/ofNode.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
#pragma once
33

44
#include "ofParameter.h"
5-
#include <glm/gtc/quaternion.hpp>
5+
// FIXME: deprecated and ctor
66
#include "ofConstants.h"
77
#include "glm/mat4x4.hpp"
8+
#include <glm/gtc/quaternion.hpp>
89
#include <array>
910

1011
class ofBaseRenderer;

0 commit comments

Comments
 (0)