Skip to content

Commit

Permalink
More .h work #7 (#7815)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dimitre
dimitre authored Dec 21, 2023
1 parent 54e5a1c commit 698eb54
Show file tree
Hide file tree
Showing 47 changed files with 53 additions and 42 deletions.
1 change: 1 addition & 0 deletions libs/openFrameworks/app/ofAppBaseWindow.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "ofWindowSettings.h"
// MARK: Target
#include "ofConstants.h"

class ofBaseApp;
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/app/ofAppEGLWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "ofImage.h"
#include "ofEvents.h"
#include "ofRectangle.h"
// MARK: Target
#include "ofConstants.h"
#include <queue>
#include <map>
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/app/ofAppGLFWWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "ofAppBaseWindow.h"
// MARK: Optimize to Pointer
#include "ofRectangle.h"
// MARK: Target
#include "ofConstants.h"

#if defined(TARGET_LINUX) && !defined(TARGET_RASPBERRY_PI_LEGACY)
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/app/ofAppGlutWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "ofAppBaseWindow.h"
#include "ofEvents.h"
#include "ofTypes.h"
//#include "ofPixels.h"
// MARK: Target but optional
#include "ofConstants.h"

template <typename T>
Expand Down
1 change: 0 additions & 1 deletion libs/openFrameworks/app/ofAppRunner.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

// #include "ofConstants.h"
#include "ofMainLoop.h"
#include "ofWindowSettings.h"

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/communication/ofSerial.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

// FIXME: ofConstants targets
// MARK: ofConstants targets
#include "ofConstants.h"

class ofBuffer;
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/gl/ofBufferObject.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ofBufferObject.h"
#include "ofAppRunner.h"
#include "ofPixels.h"
//#include "ofPixels.h"
#include "ofGLUtils.h"


Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/gl/ofBufferObject.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

// FIXME: platforms plus GL/ headers
// MARK: Targets plus GL/ headers
#include "ofConstants.h"

template<typename T>
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/gl/ofFbo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "ofUtils.h"
#include "ofGraphics.h"
#include "ofGLRenderer.h"
// MARK: Targets
#include "ofConstants.h"
#include <unordered_map>

Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/gl/ofGLUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#pragma once

#include "ofGraphicsConstants.h"
// MARK: Targets / Defines
#include "ofConstants.h"

class ofShader;
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/gl/ofShader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
make sure to catch and report that error.
*/

// FIXME: ofConstants Targets
// MARK: ofConstants Targets
#include "ofConstants.h"

#define GLM_FORCE_CTOR_INIT
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/gl/ofShadow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "ofGLUtils.h"
#include "ofLight.h"
#include "ofGLProgrammableRenderer.h"
// FIXME: ofConstants Targets
// MARK: ofConstants Targets
#include "ofConstants.h"

#define GLM_FORCE_CTOR_INIT
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/gl/ofTexture.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "ofGraphicsBaseTypes.h"
// MARK: Targets, some can be moved to cpp
#include "ofConstants.h"
#include "glm/mat4x4.hpp"

Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/gl/ofVbo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "ofGraphicsConstants.h"
#include "ofBufferObject.h"
// FIXME: Targets but it can be optional
#include "ofConstants.h"
#include <unordered_map>

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/graphics/ofBitmapFont.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "ofRectangle.h"
#include "ofPixels.h"
#include "ofPixels.h" //MARK: unique_ptr
#include "ofTexture.h"
#include "ofGraphics.h"

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/graphics/ofCairoRenderer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "ofGraphicsBaseTypes.h"
// MARK: Optimization opportunity in ofPath, ofPixels pointer.
#include "ofPath.h"
#include "ofPixels.h"
#include "ofPixels.h" // MARK: ofPixels imageBuffer;
#include "of3dGraphics.h"

#include <deque>
Expand Down
1 change: 0 additions & 1 deletion libs/openFrameworks/graphics/ofImage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "ofGLBaseTypes.h"
#include "ofGraphicsConstants.h"
#include "ofGLUtils.h"
#include "ofConstants.h"

template<typename T>
class ofPixels_;
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/graphics/ofPath.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "ofPolyline.h"
#include "ofVboMesh.h"
#include "ofTessellator.h"
// FIXME: ofConstants targets
// MARK: ofConstants targets
#include "ofConstants.h"

template<typename T>
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/graphics/ofPolyline.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "ofAppRunner.h"
#include "ofMath.h"
#include "ofLog.h"
#include "ofConstants.h"
//#include "ofConstants.h"

//----------------------------------------------------------
template<class T>
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/graphics/ofTrueTypeFont.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// MARK: optimization opportunity: unique pointer and remove ofMesh, ofPixels, ofRectangle, ofTexture
#include "ofMesh.h"
#include "ofPixels.h"
#include "ofPixels.h" // Glyph ofPixels pixels
#include "ofRectangle.h"
#include "ofTexture.h"
#include <unordered_map>
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/math/ofMathConstants.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

// MARK: if OF_USE_LEGACY_VECTOR_MATH
#include "ofConstants.h"
#include "glm/fwd.hpp"

Expand Down
4 changes: 3 additions & 1 deletion libs/openFrameworks/math/ofMatrix3x3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@

#pragma once

#include "ofConstants.h"
//#include "ofConstants.h"
#define GLM_FORCE_CTOR_INIT
#include <glm/mat3x3.hpp>
#include <iostream>


/// \brief A 3x3 Matrix
Expand Down
3 changes: 2 additions & 1 deletion libs/openFrameworks/math/ofMatrix4x4.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
#include "ofVec4f.h"
#include "ofQuaternion.h"
#include "ofMathConstants.h"
#include "ofConstants.h"
//#include "ofConstants.h"
#define GLM_FORCE_CTOR_INIT
#include "glm/mat4x4.hpp"
#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/math/ofQuaternion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "ofVec3f.h"
#include "ofVec4f.h"
//class ofVec4f;
#include "ofConstants.h"
//#include "ofConstants.h"
#include <cmath>

#if (_MSC_VER)
Expand Down
3 changes: 2 additions & 1 deletion libs/openFrameworks/math/ofVec3f.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#include "ofVec2f.h"
#include "ofVec4f.h"
#include "ofMathConstants.h"
#include "ofConstants.h"
//#include "ofConstants.h"
#define GLM_FORCE_CTOR_INIT
#include "glm/vec3.hpp"
#include <cmath>
#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions libs/openFrameworks/ofMain.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@
using namespace std;
#else

// this will eventually be disabled by default
#define OF_USE_MINIMAL_STD
// this will eventually be disabled by default
#define OF_USE_MINIMAL_STD
#ifdef OF_USE_MINIMAL_STD
using std::cout;
using std::deque;
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/sound/ofAVEngineSoundPlayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#pragma once

// MARK: Review later
#include "ofConstants.h"

#ifdef OF_SOUND_PLAYER_AV_ENGINE
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/sound/ofFmodSoundPlayer.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

// MARK: Review later
#include "ofConstants.h"

#ifdef OF_SOUND_PLAYER_FMOD
Expand Down
1 change: 1 addition & 0 deletions libs/openFrameworks/sound/ofOpenALSoundPlayer.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

// MARK: Review later
#include "ofConstants.h"

#ifdef OF_SOUND_PLAYER_OPENAL
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/sound/ofRtAudioSoundStream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "ofSoundBaseTypes.h"
#include "ofSoundBuffer.h"
#include "ofConstants.h"
//#include "ofConstants.h"

typedef unsigned int RtAudioStreamStatus;
class RtAudio;
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/sound/ofSoundBaseTypes.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

// FIXME: ofConstants FS
// MARK: ofConstants FS
#include "ofConstants.h"
#include <functional>

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/sound/ofSoundPlayer.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "ofSoundBaseTypes.h"
// FIXME: ofConstants FS
// MARK: ofConstants FS
#include "ofConstants.h"

/// \brief Stops all active sound players on FMOD-based systems (windows, osx).
Expand Down
1 change: 0 additions & 1 deletion libs/openFrameworks/types/ofParameter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "ofRectangle.h"
#include "ofLog.h"
// #include "ofConstants.h"
#include "ofColor.h"

template <typename ParameterType>
Expand Down
1 change: 0 additions & 1 deletion libs/openFrameworks/types/ofTypes.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

// #include "ofConstants.h"

//----------------------------------------------------------
// ofMutex
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/utils/ofFileUtils.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

// FIXME: ofConstants FS
// MARK: ofConstants FS
#include "ofConstants.h"
#include <fstream>

Expand Down
1 change: 0 additions & 1 deletion libs/openFrameworks/utils/ofFpsCounter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

// ofTime only
#include "ofUtils.h"
// #include "ofConstants.h"
#include <queue>

class ofFpsCounter {
Expand Down
1 change: 0 additions & 1 deletion libs/openFrameworks/utils/ofLog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

// Only private ofFile file;
#include "ofFileUtils.h"
// #include "ofConstants.h"
#include "ofUtils.h" // ofVAArgsToString
#include <sstream>

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/utils/ofUtils.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

// this must be included before the TARGET_MINGW test
// MARK: TARGET_MINGW test
#include "ofConstants.h"

#if !defined(TARGET_MINGW)
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/video/ofAVFoundationGrabber.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "ofVideoBaseTypes.h"
#include "ofTexture.h"
#include "ofThread.h"
// FIXME: Template
// MARK: Template, if
#include "ofPixels.h"
#include <mutex>

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/video/ofAVFoundationPlayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "ofVideoBaseTypes.h"
#include "ofTexture.h"
#include "ofThread.h"
// FIXME: Template
// MARK: Template if pixels is changed to unique_ptr
#include "ofPixels.h"

#ifdef __OBJC__
Expand Down
9 changes: 5 additions & 4 deletions libs/openFrameworks/video/ofDirectShowGrabber.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#pragma once

// MARK: OF_VIDEO_CAPTURE_DIRECTSHOW
#include "ofConstants.h"
#include "ofTexture.h"
#include "ofVideoBaseTypes.h"
#include "ofPixels.h"
#include "ofPixels.h" // MARK: ofPixels pixels

#ifdef OF_VIDEO_CAPTURE_DIRECTSHOW
#include "videoInput.h"
Expand All @@ -26,8 +27,8 @@ class ofDirectShowGrabber : public ofBaseVideoGrabber{
bool setPixelFormat(ofPixelFormat pixelFormat);
ofPixelFormat getPixelFormat() const;

ofPixels& getPixels();
const ofPixels& getPixels() const;
ofPixels & getPixels();
const ofPixels & getPixels() const;

void close();
void clearMemory();
Expand All @@ -50,7 +51,7 @@ class ofDirectShowGrabber : public ofBaseVideoGrabber{
int deviceID;
bool bVerbose;
bool bGrabberInited;
ofPixels pixels;
ofPixels pixels;
int attemptFramerate;
bool bIsFrameNew;

Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/video/ofDirectShowPlayer.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ofDirectShowPlayer.h"
#include "ofPixels.h"
#include "ofPixels.h" // MARK: pixels, srcBuffer
#include "ofMath.h"

#ifdef _MSC_VER
Expand Down
2 changes: 1 addition & 1 deletion libs/openFrameworks/video/ofDirectShowPlayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//To allow for QuickTime video playback install the K-Lite Mega Codec Pack 10.2

#pragma once
#include "ofConstants.h"
//#include "ofConstants.h"
#include "ofVideoBaseTypes.h"

template<typename T>
Expand Down
Loading

0 comments on commit 698eb54

Please sign in to comment.