More .h work (#7545)

dimitre · web-flow · commit cdbc3a5aa136 · 2023-05-23T15:08:16.000-03:00
#changelog #core
diff --git a/.github/workflows/build-msys2.yml b/.github/workflows/build-msys2.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         msystem:
         - mingw64
-        - ucrt64
+        # - ucrt64
     defaults:
       run:
         shell: msys2 {0}
diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp
@@ -2,6 +2,7 @@
 #include "ofxAssimpUtils.h"
 #include "ofLight.h"
 #include "ofImage.h"
+#include "ofPixels.h"
 #include "ofGraphics.h"
 #include "ofConstants.h"
 
diff --git a/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp b/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp
@@ -1,5 +1,7 @@
 #include "ofxThreadedImageLoader.h"
+#include "ofLog.h"
 #include <sstream>
+
 ofxThreadedImageLoader::ofxThreadedImageLoader(){
 	nextID = 0;
     ofAddListener(ofEvents().update, this, &ofxThreadedImageLoader::update);
diff --git a/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.h b/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.h
@@ -2,6 +2,7 @@
 
 #include "ofThread.h"
 #include "ofImage.h"
+#include "ofPixels.h"
 #include "ofURLFileLoader.h"
 #include "ofTypes.h"
 #include "ofThreadChannel.h"
diff --git a/addons/ofxiOS/src/utils/ofxiOSExtras.mm b/addons/ofxiOS/src/utils/ofxiOSExtras.mm
@@ -31,6 +31,8 @@
 
 
 #include "ofxiOSExtras.h"
+#include "ofLog.h"
+#include "ofPixels.h"
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
diff --git a/apps/projectGenerator b/apps/projectGenerator
@@ -1 +1 @@
-Subproject commit b1c27d4d57d9b8c0684d495424b3411b92dedf33
+Subproject commit a658f136328e95e62f9b6c4569ed2a3b765e9264
diff --git a/libs/openFrameworks/3d/ofMesh.inl b/libs/openFrameworks/3d/ofMesh.inl
@@ -8,6 +8,8 @@
 #include "ofMath.h"
 #include "ofMathConstants.h"
 #include "ofLog.h"
+#include "ofColor.h"
+
 #include <unordered_map>
 
 //--------------------------------------------------------------
diff --git a/libs/openFrameworks/3d/ofNode.h b/libs/openFrameworks/3d/ofNode.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "ofParameter.h"
+#include <glm/gtc/quaternion.hpp>
 #include "ofConstants.h"
 #include "glm/mat4x4.hpp"
 #include <array>
diff --git a/libs/openFrameworks/events/ofEvent.h b/libs/openFrameworks/events/ofEvent.h
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <array>
 
-// FIXME: deprecated only
+// FIXME: constants deprecated only
 #include "ofConstants.h"
 
 
diff --git a/libs/openFrameworks/gl/ofGLProgrammableRenderer.h b/libs/openFrameworks/gl/ofGLProgrammableRenderer.h
@@ -7,7 +7,7 @@
 #include "of3dGraphics.h"
 #include "ofBitmapFont.h"
 #include "ofPath.h"
-#include "ofMaterialBaseTypes.h"
+//#include "ofMaterialBaseTypes.h"
 
 class ofShapeTessellation;
 class ofFbo;
diff --git a/libs/openFrameworks/gl/ofLight.cpp b/libs/openFrameworks/gl/ofLight.cpp
@@ -13,6 +13,7 @@
 #include "ofGLBaseTypes.h"
 #include "ofGLUtils.h"
 #include "ofConstants.h"
+#include "ofColor.h"
 #include <glm/gtc/quaternion.hpp>
 #include <map>
 
diff --git a/libs/openFrameworks/gl/ofLight.h b/libs/openFrameworks/gl/ofLight.h
@@ -10,9 +10,14 @@
 #pragma once
 
 #include "ofNode.h"
-#include "ofColor.h"
 #include "ofShadow.h"
 
+template<typename T>
+class ofColor_;
+typedef ofColor_<unsigned char> ofColor;
+typedef ofColor_<float> ofFloatColor;
+typedef ofColor_<unsigned short> ofShortColor;
+
 class ofBaseGLRenderer;
 
 enum ofLightType {
diff --git a/libs/openFrameworks/gl/ofMaterial.cpp b/libs/openFrameworks/gl/ofMaterial.cpp
@@ -4,6 +4,7 @@
 #include "ofCubeMap.h"
 #include "ofImage.h"
 #include "ofGLProgrammableRenderer.h"
+
 #include <typeinfo>
 
 using std::shared_ptr;
diff --git a/libs/openFrameworks/gl/ofMaterial.h b/libs/openFrameworks/gl/ofMaterial.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include "ofShader.h"
-#include "ofColor.h"
 #include "ofMaterialBaseTypes.h"
-// FIXME: deprecated only and ctor
+// FIXME: constants deprecated only and ctor
 #include "ofConstants.h"
+#include "ofColor.h"
+
 #include "glm/fwd.hpp"
 #include "glm/vec2.hpp"
 #include <map>
diff --git a/libs/openFrameworks/gl/ofMaterialBaseTypes.h b/libs/openFrameworks/gl/ofMaterialBaseTypes.h
@@ -1,11 +1,7 @@
 #pragma once
 
-#include "ofShader.h"
-// #include "ofColor.h"
-// FIXME: deprecated only and ctor
-// #include "ofConstants.h"
-// #include "glm/fwd.hpp"
-// #include "glm/vec2.hpp"
+class ofShader;
+class ofGLProgrammableRenderer;
 
 // enum ofMaterialTextureType: short{
 // 	OF_MATERIAL_TEXTURE_NONE=0,
@@ -37,8 +33,6 @@
 
 // PBR Material based on GLTF spec from KhronosGroup: https://github.com/KhronosGroup/glTF
 
-class ofGLProgrammableRenderer;
-
 
 /// \class ofBaseMaterial
 /// \brief material parameter properties that can be applied to vertices in the OpenGL lighting model
diff --git a/libs/openFrameworks/graphics/ofCairoRenderer.h b/libs/openFrameworks/graphics/ofCairoRenderer.h
@@ -4,7 +4,7 @@
 #include "ofGraphicsBaseTypes.h"
 #include "ofPath.h"
 #include "of3dGraphics.h"
-// FIXME: replace by template
+
 #include "ofPixels.h"
 #include <deque>
 #include <stack>
diff --git a/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h b/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h
@@ -1,27 +1,11 @@
 #pragma once
 
 #include "ofGraphicsConstants.h"
-#include "ofColor.h"
 #include "ofConstants.h"
 #include "glm/fwd.hpp"
+#include "ofColor.h"
 
 class ofRectangle;
-
-template<typename T>
-class ofPixels_;
-
-typedef ofPixels_<unsigned char> ofPixels;
-typedef ofPixels_<float> ofFloatPixels;
-typedef ofPixels_<unsigned short> ofShortPixels;
-typedef ofPixels& ofPixelsRef;
-
-template<typename T>
-class ofImage_;
-
-typedef ofImage_<unsigned char> ofImage;
-typedef ofImage_<float> ofFloatImage;
-typedef ofImage_<unsigned short> ofShortImage;
-
 class ofPath;
 class of3dPrimitive;
 class ofLight;
@@ -37,6 +21,19 @@ class ofSoundBuffer;
 class ofFbo;
 class ofBaseVideoDraws;
 
+template<typename T>
+class ofPixels_;
+typedef ofPixels_<unsigned char> ofPixels;
+typedef ofPixels_<float> ofFloatPixels;
+typedef ofPixels_<unsigned short> ofShortPixels;
+typedef ofPixels& ofPixelsRef;
+
+template<typename T>
+class ofImage_;
+typedef ofImage_<unsigned char> ofImage;
+typedef ofImage_<float> ofFloatImage;
+typedef ofImage_<unsigned short> ofShortImage;
+
 template<class T>
 class ofPolyline_;
 using ofPolyline = ofPolyline_<ofDefaultVertexType>;
diff --git a/libs/openFrameworks/graphics/ofImage.cpp b/libs/openFrameworks/graphics/ofImage.cpp
@@ -1,5 +1,7 @@
 #include "ofImage.h"
 #include "ofAppRunner.h"
+#include "ofPixels.h"
+
 #include "FreeImage.h"
 
 #include "ofURLFileLoader.h"
diff --git a/libs/openFrameworks/graphics/ofImage.h b/libs/openFrameworks/graphics/ofImage.h
@@ -4,14 +4,17 @@
 #include "ofGLBaseTypes.h"
 #include "ofGraphicsConstants.h"
 #include "ofGLUtils.h"
-// FIXME: replace by template
-#include "ofPixels.h"
 #include "ofConstants.h"
 
+template<typename T>
+class ofPixels_;
+typedef ofPixels_<unsigned char> ofPixels;
+typedef ofPixels_<float> ofFloatPixels;
+typedef ofPixels_<unsigned short> ofShortPixels;
+
 class ofFile;
 class ofBuffer;
 
-
 /// \file
 /// ofImage is used for loading, saving and drawing images in openFrameworks.
 /// ofImage is a convenient class that lets you both draw images to the screen
diff --git a/libs/openFrameworks/graphics/ofPath.cpp b/libs/openFrameworks/graphics/ofPath.cpp
@@ -1,4 +1,5 @@
 #include "ofPath.h"
+#include "ofColor.h"
 
 using std::vector;
 
diff --git a/libs/openFrameworks/graphics/ofPath.h b/libs/openFrameworks/graphics/ofPath.h
@@ -1,11 +1,16 @@
 #pragma once
 
-#include "ofColor.h"
 #include "ofPolyline.h"
 #include "ofVboMesh.h"
 #include "ofTessellator.h"
 #include "ofConstants.h"
 
+template<typename T>
+class ofColor_;
+typedef ofColor_<unsigned char> ofColor;
+typedef ofColor_<float> ofFloatColor;
+typedef ofColor_<unsigned short> ofShortColor;
+
 /// \class
 
 /// \brief ofPath is a way to create a path or multiple paths consisting of
diff --git a/libs/openFrameworks/graphics/ofPixels.cpp b/libs/openFrameworks/graphics/ofPixels.cpp
@@ -1,5 +1,6 @@
 #include "ofGraphicsConstants.h"
 #include "ofPixels.h"
+#include "ofColor.h"
 
 #define GLM_FORCE_CTOR_INIT
 #include "glm/common.hpp"
diff --git a/libs/openFrameworks/graphics/ofPixels.h b/libs/openFrameworks/graphics/ofPixels.h
@@ -1,10 +1,16 @@
 #pragma once
 
 #include "ofUtils.h"
-#include "ofColor.h"
 #include "ofLog.h"
 #include "ofMath.h"
 #include "ofConstants.h"
+
+template<typename T>
+class ofColor_;
+typedef ofColor_<unsigned char> ofColor;
+typedef ofColor_<float> ofFloatColor;
+typedef ofColor_<unsigned short> ofShortColor;
+
 #include <limits>
 
 
diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.h b/libs/openFrameworks/graphics/ofTrueTypeFont.h
@@ -4,7 +4,6 @@
 #include "ofPath.h"
 #include "ofTexture.h"
 #include "ofMesh.h"
-// FIXME: template
 #include "ofPixels.h"
 #include "ofConstants.h"
 #include <unordered_map>
diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp
@@ -3,6 +3,48 @@
 #define GLM_FORCE_CTOR_INIT
 #include "glm/common.hpp"
 
+
+#ifdef OF_SOUND_PLAYER_AV_ENGINE
+#include "ofAVEngineSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofAVEngineSoundPlayer
+#endif
+
+#ifdef OF_SOUND_PLAYER_QUICKTIME
+#include "ofQuicktimeSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofQuicktimeSoundPlayer
+#endif
+
+#ifdef OF_SOUND_PLAYER_FMOD
+#include "ofFmodSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofFmodSoundPlayer
+#endif
+
+#ifdef OF_SOUND_PLAYER_MEDIA_FOUNDATION
+#include "ofMediaFoundationSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofMediaFoundationSoundPlayer
+#endif
+
+#ifdef OF_SOUND_PLAYER_OPENAL
+#include "ofOpenALSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofOpenALSoundPlayer
+#endif
+
+#ifdef TARGET_OF_IOS
+#include "ofxiOSSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofxiOSSoundPlayer
+#endif
+
+#ifdef OF_SOUND_PLAYER_EMSCRIPTEN
+#include "ofxEmscriptenSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofxEmscriptenSoundPlayer
+#endif
+
+#ifdef TARGET_ANDROID
+#include "ofxAndroidSoundPlayer.h"
+#define OF_SOUND_PLAYER_TYPE ofxAndroidSoundPlayer
+#endif
+
+
 // these are global functions, that affect every sound / channel:
 // ------------------------------------------------------------
 
diff --git a/libs/openFrameworks/sound/ofSoundPlayer.h b/libs/openFrameworks/sound/ofSoundPlayer.h
@@ -25,46 +25,6 @@ void ofSoundUpdate();
 /// \return pointer to an FFT sample, sample size is equal to the nBands parameter.
 float * ofSoundGetSpectrum(int nBands);
 
-#ifdef OF_SOUND_PLAYER_AV_ENGINE
-#include "ofAVEngineSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofAVEngineSoundPlayer
-#endif
-
-#ifdef OF_SOUND_PLAYER_QUICKTIME
-#include "ofQuicktimeSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofQuicktimeSoundPlayer
-#endif
-
-#ifdef OF_SOUND_PLAYER_FMOD
-#include "ofFmodSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofFmodSoundPlayer
-#endif
-
-#ifdef OF_SOUND_PLAYER_MEDIA_FOUNDATION
-#include "ofMediaFoundationSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofMediaFoundationSoundPlayer
-#endif
-
-#ifdef OF_SOUND_PLAYER_OPENAL
-#include "ofOpenALSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofOpenALSoundPlayer
-#endif
-
-#ifdef TARGET_OF_IOS
-#include "ofxiOSSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofxiOSSoundPlayer
-#endif
-
-#ifdef OF_SOUND_PLAYER_EMSCRIPTEN
-#include "ofxEmscriptenSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofxEmscriptenSoundPlayer
-#endif
-
-#ifdef TARGET_ANDROID
-#include "ofxAndroidSoundPlayer.h"
-#define OF_SOUND_PLAYER_TYPE ofxAndroidSoundPlayer
-#endif
-
 
 /// \class ofSoundPlayer
 /// \brief Plays sound files.
diff --git a/libs/openFrameworks/sound/ofSoundStream.cpp b/libs/openFrameworks/sound/ofSoundStream.cpp
@@ -20,6 +20,8 @@
 #define OF_SOUND_STREAM_TYPE ofxEmscriptenSoundStream
 #endif
 
+void ofFmodSetBuffersize(unsigned int bs);
+float * ofFmodSoundGetSpectrum(int nBands);
 
 //FIXME: this is needed to make video work on emscripten
 //See: https://github.com/openframeworks/openFrameworks/issues/7377 
diff --git a/libs/openFrameworks/types/ofBaseTypes.cpp b/libs/openFrameworks/types/ofBaseTypes.cpp
diff --git a/libs/openFrameworks/types/ofParameter.h b/libs/openFrameworks/types/ofParameter.h
diff --git a/libs/openFrameworks/utils/ofFileUtils.h b/libs/openFrameworks/utils/ofFileUtils.h
diff --git a/libs/openFrameworks/utils/ofUtils.cpp b/libs/openFrameworks/utils/ofUtils.cpp
diff --git a/libs/openFrameworks/video/ofAVFoundationGrabber.h b/libs/openFrameworks/video/ofAVFoundationGrabber.h
diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.h b/libs/openFrameworks/video/ofAVFoundationPlayer.h
diff --git a/libs/openFrameworks/video/ofVideoGrabber.cpp b/libs/openFrameworks/video/ofVideoGrabber.cpp
diff --git a/libs/openFrameworks/video/ofVideoGrabber.h b/libs/openFrameworks/video/ofVideoGrabber.h
diff --git a/libs/openFrameworks/video/ofVideoPlayer.cpp b/libs/openFrameworks/video/ofVideoPlayer.cpp
diff --git a/libs/openFrameworks/video/ofVideoPlayer.h b/libs/openFrameworks/video/ofVideoPlayer.h
