fs::path <> string interoperability

addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp

@@ -26,12 +26,12 @@ ofxAssimpModelLoader::~ofxAssimpModelLoader(){
 
 
 // DEPRECATED
-bool ofxAssimpModelLoader::load(string modelName, bool optimize){
+bool ofxAssimpModelLoader::load(const of::filesystem::path & fileName, bool optimize){
 	int optimizeFlags = OPTIMIZE_DEFAULT;
 	if( optimize ){
 		optimizeFlags = OPTIMIZE_HIGH;
 	}
-	return load(modelName, optimizeFlags);
+	return load(fileName, optimizeFlags);
 }
 
 // DEPRECATED
@@ -44,8 +44,8 @@ bool ofxAssimpModelLoader::load(ofBuffer & buffer, bool optimize, const char * e
 }
 
 // DEPRECATED
-bool ofxAssimpModelLoader::loadModel(string modelName, bool optimize){
-	return load(modelName, optimize);
+bool ofxAssimpModelLoader::loadModel(const of::filesystem::path & fileName, bool optimize){
+	return load(fileName, optimize);
 }
 
 // DEPRECATED
@@ -54,16 +54,14 @@ bool ofxAssimpModelLoader::loadModel(ofBuffer & buffer, bool optimize, const cha
 }
 
 //------------------------------------------
-bool ofxAssimpModelLoader::load(string modelName, int assimpOptimizeFlags){
-
-	file.open(modelName, ofFile::ReadOnly, true); // Since it may be a binary file we should read it in binary -Ed
-	if(!file.exists()) {
-		ofLogVerbose("ofxAssimpModelLoader") << "load(): model does not exist: \"" << modelName << "\"";
+bool ofxAssimpModelLoader::load(const of::filesystem::path & fileName, int assimpOptimizeFlags){
+	file = ofToDataPath(fileName);
+	if (!of::filesystem::exists(file)) {
+		ofLogVerbose("ofxAssimpModelLoader") << "load(): model does not exist: " << fileName ;
 		return false;
 	}
-
-	ofLogVerbose("ofxAssimpModelLoader") << "load(): loading \"" << file.getFileName()
-	<< "\" from \"" << file.getEnclosingDirectory() << "\"";
+
+	ofLogVerbose("ofxAssimpModelLoader") << "load(): loading " << fileName;
 
 	if(scene.get() != nullptr){
 		clear();
@@ -82,8 +80,7 @@ bool ofxAssimpModelLoader::load(string modelName, int assimpOptimizeFlags){
 	//	}
 
 	// loads scene from file
-	std::string path = file.getAbsolutePath();
-	const aiScene * scenePtr = importer.ReadFile(path.c_str(), flags);
+	const aiScene * scenePtr = importer.ReadFile(ofPathToString(file), flags);
 
 	//this is funky but the scenePtr is managed by assimp and so we can't put it in our shared_ptr without disabling the deleter with: [](const aiScene*){}
 	scene = shared_ptr<const aiScene>(scenePtr,[](const aiScene*){});
@@ -374,6 +371,7 @@ void ofxAssimpModelLoader::loadGLResources(){
 				bool bWrap = (texMapMode[0]==aiTextureMapMode_Wrap);
 
 				std::string texPathStr = texPath.C_Str();
+
 
 				//deal with Blender putting "//" in front of local file paths
 				if( texPathStr.size() > 2 && texPathStr.substr(0, 2) == "//" ){
@@ -390,7 +388,8 @@ void ofxAssimpModelLoader::loadGLResources(){
 				auto ogPath = texPathStr;
 				bool bHasEmbeddedTexture = false;
 
-				auto modelFolder = ofFilePath::getEnclosingDirectory( file.path() );
+				auto modelFolder { file.parent_path() };
+				// auto modelFolder = ofFilePath::getEnclosingDirectory( file.path() );
 				auto relTexPath = ofFilePath::getEnclosingDirectory(texPathStr,false);
 				auto realPath = modelFolder / of::filesystem::path{ texPathStr };
 
@@ -402,8 +401,8 @@ void ofxAssimpModelLoader::loadGLResources(){
 						bHasEmbeddedTexture = true;
 						ofLogVerbose("ofxAssimpModelLoader") << "loadGLResource() texture " << realPath.filename() << " is embedded ";
 					}else{
-						ofLogError("ofxAssimpModelLoader") << "loadGLResource(): texture doesn't exist: \""
-						<< file.getFileName() + "\" in \"" << realPath.string() << "\"";
+						ofLogError("ofxAssimpModelLoader") << "loadGLResource(): texture doesn't exist: "
+						<< file << " in \"" << realPath.string() << "\"";
 					}
 				}
 #endif
@@ -420,8 +419,8 @@ void ofxAssimpModelLoader::loadGLResources(){
 					assimpTexture.setTextureType((aiTextureType)d);
 					meshHelper.addTexture(assimpTexture);
 
-					ofLogVerbose("ofxAssimpModelLoader") << "loadGLResource(): texture already loaded: \""
-					<< file.getFileName() + "\" from \"" << realPath.string() << "\"" << " adding texture as " << assimpTexture.getTextureTypeAsString() ;
+					ofLogVerbose("ofxAssimpModelLoader") << "loadGLResource(): texture already loaded: "
+					<< file << " from \"" << realPath.string() << "\"" << " adding texture as " << assimpTexture.getTextureTypeAsString() ;
 				} else {
 
 					shared_ptr<ofTexture> texture = std::make_shared<ofTexture>();
@@ -464,8 +463,8 @@ void ofxAssimpModelLoader::loadGLResources(){
 
 						ofLogVerbose("ofxAssimpModelLoader") << "loadGLResource(): texture " << tmpTex.getTextureTypeAsString() << " loaded, dimensions: " << texture->getWidth() << "x" << texture->getHeight();
 					}else{
-						ofLogError("ofxAssimpModelLoader") << "loadGLResource(): couldn't load texture: \""
-						<< file.getFileName() + "\" from \"" << realPath.string() << "\"";
+						ofLogError("ofxAssimpModelLoader") << "loadGLResource(): couldn't load texture: "
+						<< file << " from \"" << realPath.string() << "\"";
 					}
 				}
 			}

addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h

@@ -44,16 +44,16 @@ class ofxAssimpModelLoader{
 
 		//use the default OF selected flags ( from the options above ) or pass in the exact assimp flags you want
 		//note: you will probably want to |= aiProcess_ConvertToLeftHanded to anything you pass in
-		bool load(std::string modelName, int assimpOptimizeFlags=OPTIMIZE_DEFAULT);
+		bool load(const of::filesystem::path & fileName, int assimpOptimizeFlags=OPTIMIZE_DEFAULT);
 		bool load(ofBuffer & buffer, int assimpOptimizeFlags=OPTIMIZE_DEFAULT, 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)")]]
+		[[deprecated("use load(const of::filesystem::path & fileName, int assimpOptimizeFlags)")]]
+		bool load(const of::filesystem::path & fileName, bool optimize);
+		[[deprecated("use load(const of::filesystem::path & fileName, int assimpOptimizeFlags)")]]
 		bool load(ofBuffer & buffer, bool optimize, const char * extension);
 
 		[[deprecated("use load()")]]
-		bool loadModel(std::string modelName, bool optimize=false);
+		bool loadModel(const of::filesystem::path & fileName, bool optimize=false);
 		[[deprecated("use load()")]]
 		bool loadModel(ofBuffer & buffer, bool optimize=false, const char * extension="");
 
@@ -175,7 +175,8 @@ class ofxAssimpModelLoader{
 		void getBoundingBoxWithMinVector( aiVector3D* min, aiVector3D* max);
 		void getBoundingBoxForNode(const ofxAssimpMeshHelper & mesh,  aiVector3D* min, aiVector3D* max);
 
-		ofFile file;
+		of::filesystem::path file;
+		// ofFile file;
 
 		aiVector3D scene_min, scene_max, scene_center;
 

addons/ofxOpenCv/src/ofxCvHaarFinder.cpp

@@ -49,12 +49,8 @@ void ofxCvHaarFinder::setNeighbors(unsigned neighbors) {
 	this->neighbors = neighbors;
 }
 
-// FIXME: convert to of::filesystem::path
-void ofxCvHaarFinder::setup(std::string haarFile) {
-
-	this->haarFile = haarFile;
-
-	haarFile = ofToDataPath(haarFile);
+void ofxCvHaarFinder::setup(const of::filesystem::path & fileName) {
+	haarFile = ofToDataPath(fileName);
 #ifdef USE_OLD_CV
 	if(cascade != NULL)
 		cvReleaseHaarClassifierCascade(&cascade);
@@ -72,11 +68,11 @@ void ofxCvHaarFinder::setup(std::string haarFile) {
 	#endif
 
 	if (!cascade)
-        ofLogError("ofxCvHaarFinder") << "setup(): couldn't load Haar cascade file: \"" << haarFile << "\"";
+        ofLogError("ofxCvHaarFinder") << "setup(): couldn't load Haar cascade file: " << haarFile;
 #else
-	cascade.load( haarFile );
+	cascade.load( ofPathToString(haarFile) );
 	if( cascade.empty() )
-		ofLogError("ofxCvHaarFinder") << "setup(): couldn't load Haar cascade file: \"" << haarFile << "\"";
+		ofLogError("ofxCvHaarFinder") << "setup(): couldn't load Haar cascade file: " << haarFile ;
 #endif //USE_OLD_CV
 }
 

addons/ofxOpenCv/src/ofxCvHaarFinder.h

@@ -22,23 +22,23 @@ class ofxCvHaarFinder {
 	std::vector<ofxCvBlob> blobs;
 
 	ofxCvHaarFinder();
-	ofxCvHaarFinder(const ofxCvHaarFinder& finder);
+	ofxCvHaarFinder(const ofxCvHaarFinder & finder);
 	~ofxCvHaarFinder();
 
-	void setup(std::string haarFile);
+	void setup(const of::filesystem::path & fileName);
 
 	// The default value is 1.2. For accuracy, bring it closer but not equal to 1.0. To make it faster, use a larger value.
 	void setScaleHaar(float scaleHaar);
 	// How many neighbors can be grouped into a face? Default value is 2. If set to 0, no grouping will be done.
 	void setNeighbors(unsigned neighbors);
 
-	int findHaarObjects(ofImage& input, int minWidth = 0, int minHeight = 0);
-	int findHaarObjects(const ofxCvGrayscaleImage& input, int minWidth = 0, int minHeight = 0);
+	int findHaarObjects(ofImage & input, int minWidth = 0, int minHeight = 0);
+	int findHaarObjects(const ofxCvGrayscaleImage & input, int minWidth = 0, int minHeight = 0);
 
-	int findHaarObjects(const ofxCvGrayscaleImage& input, ofRectangle& roi,	int minWidth = 0, int minHeight = 0);
-	int findHaarObjects(const ofxCvGrayscaleImage&, int x, int y, int w, int h,	int minWidth = 0, int minHeight = 0);
+	int findHaarObjects(const ofxCvGrayscaleImage & input, ofRectangle& roi,	int minWidth = 0, int minHeight = 0);
+	int findHaarObjects(const ofxCvGrayscaleImage &, int x, int y, int w, int h,	int minWidth = 0, int minHeight = 0);
 
-	int findHaarObjects(ofPixels& input, int minWidth = 0, int minHeight = 0);
+	int findHaarObjects(ofPixels & input, int minWidth = 0, int minHeight = 0);
 
 	float getWidth();
 	float getHeight();
@@ -51,7 +51,7 @@ class ofxCvHaarFinder {
 #else
 	cv::CascadeClassifier cascade;
 #endif //USE_OLD_CV
-	std::string haarFile;
+	of::filesystem::path haarFile;
 	ofxCvGrayscaleImage img;
 	float scaleHaar;
 	unsigned neighbors;