Skip to content

Commit ef0a3be

Browse files
dimitredimitre
authored
WIP - more .h cleanup (#7596)
#changelog #headers
1 parent 8a014cd commit ef0a3be

File tree

11 files changed

+29
-21
lines changed

11 files changed

+29
-21
lines changed

‎addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp

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

88
#include "ofxAssimpTexture.h"
99
#include "ofLog.h"
10+
#include "ofUtils.h"
1011

1112
void ofxAssimpTexture::setup(const ofTexture & texture, const of::filesystem::path & texturePath, bool bTexRepeat) {
1213
this->texture = texture;

‎libs/openFrameworks/gl/ofCubeMap.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "ofGLUtils.h"
1313
#include "ofGLProgrammableRenderer.h"
1414
#include "ofCubeMapShaders.h"
15+
#include "ofFbo.h"
1516
#include "ofConstants.h"
1617

1718
#define GLM_FORCE_CTOR_INIT
@@ -31,6 +32,9 @@ ofVboMesh ofCubeMap::sCubeMesh;
3132
ofShader ofCubeMap::shaderBrdfLUT;
3233
ofTexture ofCubeMap::sBrdfLutTex;
3334

35+
void ofCubeMap::setExposure(float aExposure) {
36+
data->exposure=ofClamp(aExposure, 0.0f, 1.0f);
37+
}
3438

3539
// texture management copied from ofTexture
3640
static std::map<GLuint,int> & getTexturesIndex(){

‎libs/openFrameworks/gl/ofCubeMap.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66

77
#pragma once
88

9-
#include "ofFbo.h"
10-
#include "ofVboMesh.h"
9+
#include "glm/mat4x4.hpp"
10+
11+
class ofVboMesh;
1112

1213
class ofShader;
1314
class ofGLProgrammableRenderer;
@@ -16,8 +17,8 @@ class ofCubeMap {
1617
public:
1718

1819
struct ofCubeMapSettings {
19-
of::filesystem::path filePath = "";
20-
of::filesystem::path cacheDirectory = "";
20+
of::filesystem::path filePath { "" };
21+
of::filesystem::path cacheDirectory { "" };
2122

2223
bool overwriteCache = false;
2324
bool useCache = false;
@@ -105,7 +106,7 @@ class ofCubeMap {
105106
GLuint getTextureId();
106107
bool isHdr();
107108

108-
void setExposure(float aExposure) {data->exposure=ofClamp(aExposure, 0.0f, 1.0f);}
109+
void setExposure(float aExposure);
109110
float getExposure() { return data->exposure; }
110111

111112
void setUseBrdfLutTexture( bool ab );

‎libs/openFrameworks/gl/ofFbo.h

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

3+
// depthBufferTex only
34
#include "ofTexture.h"
45
#include "ofGLBaseTypes.h"
56

‎libs/openFrameworks/gl/ofShader.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
make sure to catch and report that error.
88
*/
99

10-
#include "ofFileUtils.h"
1110
#include "ofConstants.h"
1211
#include "glm/fwd.hpp"
1312
#include <unordered_map>

‎libs/openFrameworks/utils/ofFileUtils.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "ofFileUtils.h"
22
#include "ofLog.h"
3+
#include "ofUtils.h"
34

45
#ifndef TARGET_WIN32
56
#include <pwd.h>

‎libs/openFrameworks/utils/ofFpsCounter.h

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

3+
// ofTime only
34
#include "ofUtils.h"
45
#include "ofConstants.h"
56
#include <queue>

‎libs/openFrameworks/utils/ofLog.h

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

33
#include "ofFileUtils.h"
4-
#include "ofUtils.h"
54
#include "ofConstants.h"
5+
#include "ofUtils.h" // ofVAArgsToString
66
#include <sstream>
77

88
/// \file

‎libs/openFrameworks/utils/ofSystemUtils.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
/// \class ofFileDialogResult
66
/// \brief file dialog box selection or save result
77
class ofFileDialogResult{
8-
public:
9-
ofFileDialogResult();
10-
11-
/// \return the name of the selected file or directory, if set
12-
/// currently returns only 1 file, this may change in the future
13-
std::string getName();
14-
15-
/// \return the full path of the selected file or directory, if set
16-
std::string getPath();
17-
18-
std::string filePath; ///< full path to selected file or directory
19-
std::string fileName; ///< selected file or directory name
20-
bool bSuccess; ///< true if the dialog action was successful, aka file select not cancel
8+
public:
9+
ofFileDialogResult();
10+
11+
/// \return the name of the selected file or directory, if set
12+
/// currently returns only 1 file, this may change in the future
13+
std::string getName();
14+
15+
/// \return the full path of the selected file or directory, if set
16+
std::string getPath();
17+
18+
std::string filePath; ///< full path to selected file or directory
19+
std::string fileName; ///< selected file or directory name
20+
bool bSuccess; ///< true if the dialog action was successful, aka file select not cancel
2121
};
2222

2323
/// \brief show an error message in an alert dialog box

‎libs/openFrameworks/utils/ofURLFileLoader.h

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

33
#include "ofEvents.h"
4+
// ofBuffer only
45
#include "ofFileUtils.h"
56
#include "ofConstants.h"
67
#include <map>

‎libs/openFrameworks/utils/ofXml.h

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

33
#include "ofParameter.h"
4-
#include "ofConstants.h"
54
#include "pugixml.hpp"
65

76
template<typename It>

0 commit comments

Comments
 (0)