Merge branch 'master' of github.com:openframeworks/openFrameworks

openframeworks · Dec 7, 2023 · 240ce23 · 240ce23
2 parents f7a881e + c4cf417
commit 240ce23
Show file tree

Hide file tree

Showing 57 changed files with 1,510 additions and 1,326 deletions.
diff --git a/.gitignore b/.gitignore
@@ -134,3 +134,4 @@ Desktop.ini
 .mailmap
 /apps*/
 projectGenerator*/
+.cxx/
diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h
@@ -47,11 +47,15 @@ class ofxAssimpModelLoader{
 		bool load(std::string modelName, int assimpOptimizeFlags=OPTIMIZE_DEFAULT);
 		bool load(ofBuffer & buffer, int assimpOptimizeFlags=OPTIMIZE_DEFAULT, const char * extension="");
 
-		OF_DEPRECATED_MSG("ofxAssimpModelLoader::load(std::string modelName, bool bOptimize) is deprecated, use load(std::string modelName, int assimpOptimizeFlags) instead.", bool load(std::string modelName, bool optimize));
-		OF_DEPRECATED_MSG("ofxAssimpModelLoader::load(ofBuffer & buffer, bool optimize=false, const char * extension="") is deprecated, use load(std::string modelName, int assimpOptimizeFlags) instead.", bool load(ofBuffer & buffer, bool optimize, const char * extension));
+		[[deprecated("use load(std::string modelName, int assimpOptimizeFlags)")]]
+		bool load(std::string modelName, bool optimize);
+		[[deprecated("use load(std::string modelName, int assimpOptimizeFlags)")]]
+		bool load(ofBuffer & buffer, bool optimize, const char * extension);
 
-		OF_DEPRECATED_MSG("ofxAssimpModelLoader::loadModel() is deprecated, use load() instead.", bool loadModel(std::string modelName, bool optimize=false));
-		OF_DEPRECATED_MSG("ofxAssimpModelLoader::loadModel() is deprecated, use load() instead.", bool loadModel(ofBuffer & buffer, bool optimize=false, const char * extension=""));
+		[[deprecated("use load()")]]
+		bool loadModel(std::string modelName, bool optimize=false);
+		[[deprecated("use load()")]]
+		bool loadModel(ofBuffer & buffer, bool optimize=false, const char * extension="");
 
 		void createEmptyModel();
 		void createLightsFromAiModel();
@@ -72,10 +76,14 @@ class ofxAssimpModelLoader{
 		void setPausedForAllAnimations(bool pause);
 		void setLoopStateForAllAnimations(ofLoopType state);
 		void setPositionForAllAnimations(float position);
-		OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", void setAnimation(int animationIndex));
-		OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", void setNormalizedTime(float time));
-		OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", void setTime(float time));
-		OF_DEPRECATED_MSG("Use ofxAssimpAnimation instead", float getDuration(int animationIndex));
+		[[deprecated("Use ofxAssimpAnimation")]]
+		void setAnimation(int animationIndex);
+		[[deprecated("Use ofxAssimpAnimation")]]
+		void setNormalizedTime(float time);
+		[[deprecated("Use ofxAssimpAnimation")]]
+		void setTime(float time);
+		[[deprecated("Use ofxAssimpAnimation")]]
+		float getDuration(int animationIndex);
 
 		bool hasMeshes();
 		unsigned int getMeshCount();

diff --git a/addons/ofxKinect/src/ofxKinect.h b/addons/ofxKinect/src/ofxKinect.h
@@ -175,16 +175,20 @@ class ofxKinect : public ofxBase3DVideo, protected ofThread {
 	const ofFloatPixels & getDistancePixels() const;
 
 	/// get the video (ir or rgb) texture
-	ofTexture& getTexture();
-	const ofTexture& getTexture() const;
-	OF_DEPRECATED_MSG("Use getTexture() instead", ofTexture& getTextureReference());
-	OF_DEPRECATED_MSG("Use getTexture() instead", const ofTexture& getTextureReference() const);
+	ofTexture & getTexture();
+	const ofTexture & getTexture() const;
+	[[deprecated("Use getTexture()")]]
+	ofTexture & getTextureReference();
+	[[deprecated("Use getTexture()")]]
+	const ofTexture & getTextureReference() const;
 
 	/// get the grayscale depth texture
-	ofTexture& getDepthTexture();
-	const ofTexture& getDepthTexture() const;
-	OF_DEPRECATED_MSG("Use getDepthTexture() instead", ofTexture& getDepthTextureReference());
-	OF_DEPRECATED_MSG("Use getDepthTexture() instead", const ofTexture& getDepthTextureReference() const);
+	ofTexture & getDepthTexture();
+	const ofTexture & getDepthTexture() const;
+	[[deprecated("Use getDepthTexture()")]]
+	ofTexture & getDepthTextureReference();
+	[[deprecated("Use getDepthTexture()")]]
+	const ofTexture & getDepthTextureReference() const;
 
 /// \section Grayscale Depth Value
 

diff --git a/addons/ofxNetwork/src/ofxNetworkUtils.h b/addons/ofxNetwork/src/ofxNetworkUtils.h
@@ -57,6 +57,7 @@ void ofxNetworkLogError(int err, const char* file=__FILE__, int line=__LINE__-1)
  * @param line the line where the error happened, generally __LINE__
  * @return int the last network error
  */
-OF_DEPRECATED_MSG("use ofxNetworkLogError(ofxNetworkGetLastError(), file, line) instead", int ofxNetworkCheckErrno(const char* file, int line) );
+[[deprecated("use ofxNetworkLogError(ofxNetworkGetLastError(), file, line)")]]
+int ofxNetworkCheckErrno(const char* file, int line) ;