openframeworks · dimitre · May 24, 2024 · May 22, 2024
diff --git a/libs/openFrameworks/3d/ofEasyCam.h b/libs/openFrameworks/3d/ofEasyCam.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include "ofCamera.h"
-//#include "ofEvents.h"
 class ofEventListeners;
 class ofEventArgs;
-//#include "ofRectangle.h"
 class ofRectangle;
 
 #define GLM_FORCE_CTOR_INIT

diff --git a/libs/openFrameworks/events/ofEvents.h b/libs/openFrameworks/events/ofEvents.h
@@ -2,7 +2,6 @@
 
 #include "ofEventUtils.h"
 #include "ofFpsCounter.h"
-//#include "ofTimer.h"
 #include "ofTimerFps.h"
 
 #define GLM_FORCE_CTOR_INIT

diff --git a/libs/openFrameworks/gl/ofBufferObject.cpp b/libs/openFrameworks/gl/ofBufferObject.cpp
@@ -1,6 +1,5 @@
 #include "ofBufferObject.h"
 #include "ofAppRunner.h"
-//#include "ofPixels.h"
 #include "ofGLUtils.h"
 
 

diff --git a/libs/openFrameworks/gl/ofGLProgrammableRenderer.h b/libs/openFrameworks/gl/ofGLProgrammableRenderer.h
@@ -8,7 +8,6 @@
 #include "ofPolyline.h"
 #include "ofBitmapFont.h"
 #include "ofPath.h"
-//#include "ofMaterialBaseTypes.h"
 
 class ofShapeTessellation;
 class ofFbo;

diff --git a/libs/openFrameworks/gl/ofMaterial.cpp b/libs/openFrameworks/gl/ofMaterial.cpp
@@ -10,8 +10,6 @@
 #include <glm/vec2.hpp>
 #include <glm/gtx/transform.hpp>
 
-//#include <typeinfo>
-
 using std::shared_ptr;
 using std::string;
 

diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp
@@ -1,16 +1,9 @@
 #include "ofBufferObject.h"
 #include "ofCubeMap.h"
-// #include "ofFileUtils.h"
 #include "ofGLProgrammableRenderer.h"
-// #include "ofGraphics.h"
 #include "ofLight.h"
-// #include "ofMatrix3x3.h"
-// #include "ofMatrix4x4.h"
-// #include "ofParameter.h"
 #include "ofShader.h"
 #include "ofShadow.h"
-// #include "ofTexture.h"
-// #include "ofUtils.h"
 #ifdef TARGET_ANDROID
     #include "ofxAndroidUtils.h"
 #endif

diff --git a/libs/openFrameworks/graphics/ofPolyline.inl b/libs/openFrameworks/graphics/ofPolyline.inl
@@ -6,9 +6,7 @@
 #include "ofGraphicsBaseTypes.h"
 #include "ofVectorMath.h"
 #include "ofAppRunner.h"
-//#include "ofMath.h"
 #include "ofLog.h"
-//#include "ofConstants.h"
 
 //----------------------------------------------------------
 template<class T>

diff --git a/libs/openFrameworks/math/ofVec3f.h b/libs/openFrameworks/math/ofVec3f.h
@@ -7,8 +7,6 @@
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/vec3.hpp>
 
-//#include <iostream>
-
 /// \brief  ofVec3f is a class for storing a three dimensional vector.
 /// 
 /// Moving through space requires knowledge of where things are and where they are

diff --git a/libs/openFrameworks/math/ofVectorMath.h b/libs/openFrameworks/math/ofVectorMath.h
@@ -1,11 +1,6 @@
 #pragma once
 
-//#include "ofVec3f.h"
 class ofMatrix3x3;
-// MARK: ofMatrix4x4 already contains some of commented out includes here.
-//#include "ofVec2f.h"
-//#include "ofVec4f.h"
-//#include "ofMatrix3x3.h"
 #include "ofMatrix4x4.h"
 #include "ofQuaternion.h"
 

diff --git a/libs/openFrameworks/sound/ofAVEngineSoundPlayer.h b/libs/openFrameworks/sound/ofAVEngineSoundPlayer.h
@@ -13,7 +13,6 @@
 #ifdef OF_SOUND_PLAYER_AV_ENGINE
 
 #include "ofSoundBaseTypes.h"
-//#include "ofEvents.h"
 class ofEventArgs;
 
 // FIXME: some can be moved to .mm

diff --git a/libs/openFrameworks/sound/ofSoundBuffer.h b/libs/openFrameworks/sound/ofSoundBuffer.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <cstdint> // MARK: uint64_t msys2 only complain about this one it seems.
-//#include <cstddef>
 #include <vector>
 #include <string>
 

diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp
@@ -9,11 +9,6 @@
 #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

diff --git a/libs/openFrameworks/types/ofColor.h b/libs/openFrameworks/types/ofColor.h
@@ -2,7 +2,6 @@
 
 #define GLM_FORCE_CTOR_INIT
 #define GLM_ENABLE_EXPERIMENTAL
-// #include <glm/ext/scalar_common.hpp>
 #include <glm/gtx/wrap.hpp>
 #include <iostream>
 #include <limits>

diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
@@ -99,7 +99,6 @@ enum ofTargetPlatform{
 #elif defined( __APPLE_CC__)
     #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
     #include <TargetConditionals.h>
-	// #include <unistd.h>
 
 	#if (TARGET_OS_IPHONE || TARGET_OS_IOS || TARGET_OS_SIMULATOR || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_TV && !TARGET_OS_WATCH
         #define TARGET_OF_IPHONE
@@ -191,7 +190,6 @@ enum ofTargetPlatform{
 		#define __MACOSX_CORE__
 	#endif
 	#include "GL/glew.h"
-	// #include <ApplicationServices/ApplicationServices.h>
 
 	#if defined(__LITTLE_ENDIAN__)
 		#define TARGET_LITTLE_ENDIAN		// intel cpu
@@ -204,8 +202,6 @@ enum ofTargetPlatform{
 
 #ifdef TARGET_LINUX
 
-	// #include <unistd.h>
-
 	#ifdef TARGET_LINUX_ARM
 		#ifdef TARGET_RASPBERRY_PI
 			#include <bcm_host.h>
@@ -259,7 +255,6 @@ enum ofTargetPlatform{
 
 #ifdef TARGET_ANDROID
 	#include <typeinfo>
-	// #include <unistd.h>
 	#include <GLES/gl.h>
 	#define GL_GLEXT_PROTOTYPES
 	#include <GLES/glext.h>

diff --git a/libs/openFrameworks/utils/ofLog.h b/libs/openFrameworks/utils/ofLog.h
@@ -2,7 +2,6 @@
 
 // Only private ofFile file;
 #include "ofFileUtils.h"
-//#include "ofUtils.h"  //ofVAArgsToString
 #include <sstream>
 
 

diff --git a/libs/openFrameworks/utils/ofUtils.h b/libs/openFrameworks/utils/ofUtils.h
@@ -14,10 +14,7 @@
 #include <chrono>
 #include <iomanip>  //for setprecision
 #include <optional>
-
-// #include <random>
 #include <sstream>
-// #include <type_traits>
 
 #include "ofRandomDistributions.h"
 #include "ofRandomEngine.h"

diff --git a/libs/openFrameworks/video/ofDirectShowPlayer.h b/libs/openFrameworks/video/ofDirectShowPlayer.h
@@ -3,7 +3,6 @@
 //To allow for QuickTime video playback install the K-Lite Mega Codec Pack 10.2
 
 #pragma once 
-//#include "ofConstants.h"
 #include "ofVideoBaseTypes.h"
 
 template<typename T>

diff --git a/libs/openFrameworks/video/ofMediaFoundationPlayer.h b/libs/openFrameworks/video/ofMediaFoundationPlayer.h
@@ -34,7 +34,6 @@
 #include <d3d11_1.h>
 #include <wrl.h>
 #include <wincodec.h>
-//#include "ofConstants.h"
 #include "ofVideoBaseTypes.h"
 #include "ofPixels.h" //mSrcPixels
 #include "ofFbo.h"

diff --git a/libs/openFrameworks/video/ofVideoPlayer.h b/libs/openFrameworks/video/ofVideoPlayer.h
@@ -2,7 +2,6 @@
 
 #include "ofTexture.h"
 #include "ofVideoBaseTypes.h"
-//#include "ofConstants.h"
 
 //---------------------------------------------
 class ofVideoPlayer : public ofBaseVideoDraws {