openframeworks · ofTheo · Mar 7, 2023 · Aug 3, 2022 · Aug 10, 2022 · Aug 10, 2022
diff --git a/addons/ofxAndroid/src/ofAppAndroidWindow.cpp b/addons/ofxAndroid/src/ofAppAndroidWindow.cpp
@@ -266,7 +266,7 @@ Java_cc_openframeworks_OFAndroid_setAppDataDir( JNIEnv*  env, jobject  thiz, jst
 	jboolean iscopy;
 	const char *mfile = env->GetStringUTFChars(data_dir, &iscopy);
 	__android_log_print(ANDROID_LOG_INFO,"ofAppAndroidWindow",("setting app dir name to: \"" + string(mfile) + "\"").c_str());
-    ofSetDataPathRoot(string(mfile)+"/");
+    ofSetDataPathRoot({ string(mfile)+"/" });
     env->ReleaseStringUTFChars(data_dir, mfile);
 }
 

diff --git a/addons/ofxAndroid/src/ofxAndroidSoundPlayer.cpp b/addons/ofxAndroid/src/ofxAndroidSoundPlayer.cpp
@@ -43,7 +43,7 @@ ofxAndroidSoundPlayer::~ofxAndroidSoundPlayer(){
 
 
 //------------------------------------------------------------
-bool ofxAndroidSoundPlayer::load(const std::filesystem::path& fileName, bool stream){
+bool ofxAndroidSoundPlayer::load(const of::filesystem::path& fileName, bool stream){
 	if(!javaSoundPlayer){
 		ofLogError("ofxAndroidSoundPlayer") << "loadSound(): java SoundPlayer not loaded";
 		return false;

diff --git a/addons/ofxAndroid/src/ofxAndroidSoundPlayer.h b/addons/ofxAndroid/src/ofxAndroidSoundPlayer.h
@@ -8,7 +8,7 @@ class ofxAndroidSoundPlayer: public ofBaseSoundPlayer{
 	ofxAndroidSoundPlayer();
 	virtual ~ofxAndroidSoundPlayer();
 
-	bool load(const std::filesystem::path& fileName, bool stream = false);
+	bool load(const of::filesystem::path& fileName, bool stream = false);
 	void unload();
 	void play();
 	void stop();

diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp
@@ -80,7 +80,7 @@ bool ofxAssimpModelLoader::load(string modelName, int assimpOptimizeFlags){
 	//	}
 
 	// loads scene from file
-	std::string path = file.getAbsolutePath();
+	std::string path = file.getAbsolutePath().string();
 string ofDirectory::getAbsolutePath() const { 
 	try{ 
 		return std::filesystem::canonical(std::filesystem::absolute(myDir)).string(); 
 	}catch(...){ 
 		return std::filesystem::absolute(myDir).string(); 
 	} 
 string ofDirectory::getAbsolutePath() const { 
 	try{ 
 		return std::filesystem::canonical(std::filesystem::absolute(myDir)).string(); 
 	}catch(...){ 
 		return std::filesystem::absolute(myDir).string(); 
 	} 
 	const aiScene * scenePtr = importer.ReadFile(path.c_str(), 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*){}
@@ -373,6 +373,7 @@ void ofxAssimpModelLoader::loadGLResources(){
 
 				std::string texPathStr = texPath.C_Str();
 
+//				std::cout << "first texPathStr: " << texPathStr << std::endl;
 				//deal with Blender putting "//" in front of local file paths
 				if( texPathStr.size() > 2 && texPathStr.substr(0, 2) == "//" ){
 					texPathStr = texPathStr.substr(2, texPathStr.size()-2);
@@ -388,20 +389,35 @@ void ofxAssimpModelLoader::loadGLResources(){
 				auto ogPath = texPathStr;
 				bool bHasEmbeddedTexture = false;
 
-				string modelFolder = ofFilePath::getEnclosingDirectory( file.path() );
-				string relTexPath = ofFilePath::getEnclosingDirectory(texPathStr,false);
-				string texFile = ofFilePath::getFileName(texPathStr);
-				string realPath = ofFilePath::join(ofFilePath::join(modelFolder, relTexPath), texFile);
+				// FIXME: Convert everything possible to fs. remove .string() in the end
+				auto modelFolder = ofFilePath::getEnclosingDirectory( file.path() );
+				auto relTexPath = ofFilePath::getEnclosingDirectory(texPathStr,false);
+				auto realPath = modelFolder / of::filesystem::path{ texPathStr };
+
+				using std::cout;
+				using std::endl;
+				cout << "modelFolder : " << modelFolder << endl;
+				cout << "texPathStr : " << texPathStr << endl;
+				cout << "relTexPath : " << relTexPath.string() << endl;
+				cout << "realPath : " << realPath.string() << endl;
+
+
+//				modelFolder : "../MacOS/../../../data/FlightHelmet/"
+//				texPathStr : FlightHelmet_Materials_LeatherPartsMat_Normal.png
+//				relTexPath :
+//				realPath : ../MacOS/../../../data/FlightHelmet/
+
+
 
 #ifndef TARGET_LINUX_ARM
 				if(bTryEmbed || ofFile::doesFileExist(realPath) == false) {
 					auto embeddedTexture = scene->GetEmbeddedTexture(ogPath.c_str());
 					if( embeddedTexture ){
 						bHasEmbeddedTexture = true;
-						ofLogVerbose("ofxAssimpModelLoader") << "loadGLResource() texture " << texFile << " is embedded ";
+						ofLogVerbose("ofxAssimpModelLoader") << "loadGLResource() texture " << realPath.filename() << " is embedded ";
 					}else{
 						ofLogError("ofxAssimpModelLoader") << "loadGLResource(): texture doesn't exist: \""
-						<< file.getFileName() + "\" in \"" << realPath << "\"";
+						<< file.getFileName() + "\" in \"" << realPath.string() << "\"";
 					}
 				}
 #endif
@@ -419,7 +435,7 @@ void ofxAssimpModelLoader::loadGLResources(){
 					meshHelper.addTexture(assimpTexture);
 
 					ofLogVerbose("ofxAssimpModelLoader") << "loadGLResource(): texture already loaded: \""
-					<< file.getFileName() + "\" from \"" << realPath << "\"" << " adding texture as " << assimpTexture.getTextureTypeAsString() ;
+					<< file.getFileName() + "\" from \"" << realPath.string() << "\"" << " adding texture as " << assimpTexture.getTextureTypeAsString() ;
 				} else {
 
 					shared_ptr<ofTexture> texture = std::make_shared<ofTexture>();
@@ -463,7 +479,7 @@ 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 << "\"";
+						<< file.getFileName() + "\" from \"" << realPath.string() << "\"";
 					}
 				}
 			}

diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h b/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h
@@ -19,6 +19,7 @@
 #include "ofxAssimpTexture.h"
 #include "ofMesh.h"
 #include "ofMath.h"
+#include "ofConstants.h"
 
 #include <assimp/Importer.hpp>
 
@@ -177,7 +178,11 @@ class ofxAssimpModelLoader{
 		glm::mat4 modelMatrix;
 
 		std::vector<ofLight> lights;
-		std::map<std::string,std::shared_ptr<ofTexture>> textures;
+		// std::map<std::string,std::shared_ptr<ofTexture>> textures;
+		std::map<
+			of::filesystem::path,
+			std::shared_ptr<ofTexture>
+		> textures;
 		std::vector<ofxAssimpMeshHelper> modelMeshes;
 		std::vector<ofxAssimpAnimation> animations;
 		int currentAnimation; // DEPRECATED - to be removed with deprecated animation functions.

diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp b/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.cpp
@@ -6,10 +6,10 @@
 //
 
 #include "ofxAssimpTexture.h"
-#include "ofConstants.h"
+//#include "ofConstants.h"
 #include "ofLog.h"
 
-void ofxAssimpTexture::setup(const ofTexture & texture, std::string texturePath, bool bTexRepeat) {
+void ofxAssimpTexture::setup(const ofTexture & texture, const of::filesystem::path & texturePath, bool bTexRepeat) {
 	this->texture = texture;
 	if( bTexRepeat ){
 		this->texture.setTextureWrap(GL_REPEAT, GL_REPEAT);
@@ -43,7 +43,7 @@ ofTexture & ofxAssimpTexture::getTextureRef() {
 	return texture;
 }
 
-std::string ofxAssimpTexture::getTexturePath() {
+of::filesystem::path ofxAssimpTexture::getTexturePath() {
 	return texturePath;
 }
 

diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.h b/addons/ofxAssimpModelLoader/src/ofxAssimpTexture.h
@@ -9,15 +9,16 @@
 
 #include "ofTexture.h"
 #include <assimp/material.h>
+#include "ofConstants.h"
 
 class ofxAssimpTexture {
 
 public:
 
-	void setup(const ofTexture & texture, std::string texturePath, bool bTexRepeat = true);
+	void setup(const ofTexture & texture, const of::filesystem::path & texturePath, bool bTexRepeat = true);
 
 	ofTexture & getTextureRef();
-	std::string getTexturePath();
+	of::filesystem::path getTexturePath();
 	bool hasTexture();
 
 	void setTextureType(aiTextureType aTexType);
@@ -27,7 +28,7 @@ class ofxAssimpTexture {
 private:
 
 	ofTexture texture;
-	std::string texturePath;
+	of::filesystem::path texturePath;
 	aiTextureType textureType;
 	std::string mTexTypeStr;
 };
diff --git a/addons/ofxEmscripten/src/ofxEmscriptenURLFileLoader.cpp b/addons/ofxEmscripten/src/ofxEmscriptenURLFileLoader.cpp
@@ -30,12 +30,12 @@ int ofxEmscriptenURLFileLoader::getAsync(const string &  url, const string &  na
 	return req->getId();
 }
 
-ofHttpResponse ofxEmscriptenURLFileLoader::saveTo(const string &  url, const std::filesystem::path &  path){
+ofHttpResponse ofxEmscriptenURLFileLoader::saveTo(const string &  url, const of::filesystem::path &  path){
 	saveAsync(url,path);
 	return ofHttpResponse();
 }
 
-int ofxEmscriptenURLFileLoader::saveAsync(const string &  url, const std::filesystem::path &  path){
+int ofxEmscriptenURLFileLoader::saveAsync(const string &  url, const of::filesystem::path &  path){
 	ofHttpRequest * req = new ofHttpRequest(url,url,true);
 #if __EMSCRIPTEN_major__>1 || (__EMSCRIPTEN_major__==1 && __EMSCRIPTEN_minor__>22)
 	emscripten_async_wget2(url.c_str(), path.c_str(), "GET", "", req, &onload_file_cb, &onerror_file_cb, NULL);

diff --git a/addons/ofxEmscripten/src/ofxEmscriptenURLFileLoader.h b/addons/ofxEmscripten/src/ofxEmscriptenURLFileLoader.h
@@ -13,8 +13,8 @@ class ofxEmscriptenURLFileLoader: public ofBaseURLFileLoader {
 	virtual ~ofxEmscriptenURLFileLoader();
 	ofHttpResponse get(const std::string &  url);
 	int getAsync(const std::string &  url, const std::string &  name=""); // returns id
-	ofHttpResponse saveTo(const std::string &  url, const std::filesystem::path &  path);
-	int saveAsync(const std::string &  url, const std::filesystem::path &  path);
+	ofHttpResponse saveTo(const std::string &  url, const of::filesystem::path &  path);
+	int saveAsync(const std::string &  url, const of::filesystem::path &  path);
 	ofHttpResponse handleRequest(const ofHttpRequest & request);
 	int handleRequestAsync(const ofHttpRequest & request);
 	void remove(int id);

diff --git a/addons/ofxGui/src/ofxSliderGroup.cpp b/addons/ofxGui/src/ofxSliderGroup.cpp
@@ -1,5 +1,6 @@
 #include "ofxSliderGroup.h"
-using namespace std;
+
+using std::string;
 
 template<class VecType>
 ofxVecSlider_<VecType>::ofxVecSlider_(ofParameter<VecType> value, float width, float height){

diff --git a/addons/ofxOpenCv/src/ofxCvHaarFinder.cpp b/addons/ofxOpenCv/src/ofxCvHaarFinder.cpp
@@ -53,7 +53,7 @@ void ofxCvHaarFinder::setup(std::string haarFile) {
 
 	this->haarFile = haarFile;
 
-	haarFile = ofToDataPath(haarFile);
+	haarFile = ofToDataPath(haarFile).string();
 #ifdef USE_OLD_CV
 	if(cascade != NULL)
 		cvReleaseHaarClassifierCascade(&cascade);

diff --git a/addons/ofxPoco/src/ofxXmlPoco.cpp b/addons/ofxPoco/src/ofxXmlPoco.cpp
@@ -42,8 +42,8 @@ ofxXmlPoco::ofxXmlPoco(){
 }
 
 
-bool ofxXmlPoco::load(const std::filesystem::path & path){
-	ofFile file(path, ofFile::ReadOnly);
+bool ofxXmlPoco::load(const of::filesystem::path & filePath){
+	ofFile file(filePath, ofFile::ReadOnly);
 	if(!file.exists()){
 		ofLogError("ofxXmlPoco") << "couldn't load, \"" << file.getFileName() << "\" not found";
 		return false;
@@ -53,10 +53,10 @@ bool ofxXmlPoco::load(const std::filesystem::path & path){
 }
 
 
-bool ofxXmlPoco::save(const std::filesystem::path & path){
+bool ofxXmlPoco::save(const of::filesystem::path & filePath){
     ofBuffer buffer;
     buffer.set(toString());
-    ofFile file(path, ofFile::WriteOnly);
+    ofFile file(filePath, ofFile::WriteOnly);
     return file.writeFromBuffer(buffer);
 }
 

diff --git a/addons/ofxPoco/src/ofxXmlPoco.h b/addons/ofxPoco/src/ofxXmlPoco.h
@@ -41,8 +41,8 @@ class ofxXmlPoco{
     ofxXmlPoco( const ofxXmlPoco& rhs );
     const ofxXmlPoco& operator =( const ofxXmlPoco& rhs );
 
-    bool load(const std::filesystem::path & path);
-    bool save(const std::filesystem::path & path);
+    bool load(const of::filesystem::path & filePath);
+    bool save(const of::filesystem::path & filePath);
 
     bool            addChild( const std::string& path );
     void            addXml( ofxXmlPoco& xml, bool copyAll = false);

diff --git a/addons/ofxSvg/src/ofxSvg.cpp b/addons/ofxSvg/src/ofxSvg.cpp
@@ -2,7 +2,8 @@
 #include "ofConstants.h"
 #include <locale>
 
-using namespace std;
+using std::string;
+using std::vector;
 
 extern "C"{
 	#include "svgtiny.h"
@@ -27,7 +28,7 @@ ofPath & ofxSvg::getPathAt(int n){
 }
 
 void ofxSvg::load(std::string path){
-	path = ofToDataPath(path);
+	path = ofToDataPath(path).string();
 
 	if(path.compare("") == 0){
 		ofLogError("ofxSVG") << "load(): path does not exist: \"" << path << "\"";

diff --git a/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp b/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp
@@ -1,5 +1,8 @@
 #include "ofxThreadedImageLoader.h"
 #include <sstream>
+
+using std::string;
+
 ofxThreadedImageLoader::ofxThreadedImageLoader(){
 	nextID = 0;
     ofAddListener(ofEvents().update, this, &ofxThreadedImageLoader::update);

diff --git a/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.h b/addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.h
@@ -6,8 +6,7 @@
 #include "ofTypes.h" 
 #include "ofThreadChannel.h"
 
-
-using namespace std;
+using std::string;
 
 class ofxThreadedImageLoader : public ofThread {
 public:
@@ -40,12 +39,12 @@ class ofxThreadedImageLoader : public ofThread {
     };
 
 
-    typedef map<string, ofImageLoaderEntry>::iterator entry_iterator;
+    typedef std::map<string, ofImageLoaderEntry>::iterator entry_iterator;
 
 	int                 nextID;
     int                 lastUpdate;
 
-	map<string,ofImageLoaderEntry> images_async_loading; // keeps track of images which are loading async
+	std::map<string,ofImageLoaderEntry> images_async_loading; // keeps track of images which are loading async
 	ofThreadChannel<ofImageLoaderEntry> images_to_load_from_disk;
 	ofThreadChannel<ofImageLoaderEntry> images_to_update;
 };

diff --git a/addons/ofxUnitTests/src/ofxUnitTests.h b/addons/ofxUnitTests/src/ofxUnitTests.h
@@ -228,9 +228,9 @@ class ofxUnitTestsApp: public ofBaseApp{
         const std::string APPVEYOR_API_URL = "APPVEYOR_API_URL";
         if(ofGetEnv(APPVEYOR_API_URL)!=""){
             //ofSystem("appveyor AddTest -Name " + projectName.string() + " -Framework ofxUnitTests -FileName " + exeName.string() + " -Outcome " + (passed?"Passed":"Failed") + " -Duration " + ofToString(now-then));
-            auto projectDir = std::filesystem::canonical(std::filesystem::path(ofFilePath::getCurrentExeDir()) / "..");
+            auto projectDir = of::filesystem::canonical(of::filesystem::path(ofFilePath::getCurrentExeDir()) / "..");
             auto projectName = projectDir.stem();
-            auto exeName = std::filesystem::path(ofFilePath::getCurrentExePath()).filename();
+            auto exeName = of::filesystem::path(ofFilePath::getCurrentExePath()).filename();
             auto stdOut = logger->getStdOut();
             ofStringReplace(stdOut, "\\", "\\\\");
             ofStringReplace(stdOut, "\"", "\\\"");

diff --git a/addons/ofxXmlSettings/src/ofxXmlSettings.cpp b/addons/ofxXmlSettings/src/ofxXmlSettings.cpp
@@ -48,7 +48,7 @@ ofxXmlSettings::ofxXmlSettings(const string& xmlFile):
 	//we do this so that we have a valid handle
 	//without the need for loadFile
 	storedHandle   = TiXmlHandle(&doc);
-	loadFile(xmlFile);
+	load(xmlFile);
 }
 
 //---------------------------------------------------------
@@ -73,8 +73,8 @@ void ofxXmlSettings::clear(){
 
 //---------------------------------------------------------
 bool ofxXmlSettings::load(const string& xmlFile){
-	string fullXmlFile = ofToDataPath(xmlFile);
-	bool loadOkay = doc.LoadFile(fullXmlFile);
+	auto fullXmlFile = ofToDataPath(xmlFile);
+	bool loadOkay = doc.LoadFile(fullXmlFile.string());
 
 	//theo removed bool check as it would
 	//return false if the file exists but was
@@ -89,8 +89,8 @@ bool ofxXmlSettings::load(const string& xmlFile){
 
 //---------------------------------------------------------
 bool ofxXmlSettings::save(const string& xmlFile){
-	string fullXmlFile = ofToDataPath(xmlFile);
-	return doc.SaveFile(fullXmlFile);
+	auto fullXmlFile = ofToDataPath(xmlFile);
+	return doc.SaveFile(fullXmlFile.string());
 }
 
 //---------------------------------------------------------

diff --git a/addons/ofxXmlSettings/src/ofxXmlSettings.h b/addons/ofxXmlSettings/src/ofxXmlSettings.h
@@ -8,7 +8,6 @@
 #include "tinyxml.h"
 #endif
 
-using namespace std;
 
 /*
 	Q: what is the which = 0 argument?

diff --git a/addons/ofxiOS/src/core/ofxiOSAppDelegate.mm b/addons/ofxiOS/src/core/ofxiOSAppDelegate.mm
@@ -62,7 +62,7 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application {
     currentScreenIndex = 0;
 
     // set the root application path
-    ofSetDataPathRoot([[NSString stringWithFormat:@"%@/", [[NSBundle mainBundle] resourcePath]] cStringUsingEncoding:NSUTF8StringEncoding]);
+    ofSetDataPathRoot(of::filesystem::path([[NSString stringWithFormat:@"%@/", [[NSBundle mainBundle] resourcePath]] cStringUsingEncoding:NSUTF8StringEncoding]));
 
 	// show or hide status bar depending on OF_WINDOW or OF_FULLSCREEN
     [[UIApplication sharedApplication] setStatusBarHidden:(ofxiOSGetOFWindow()->getWindowMode() == OF_FULLSCREEN)];

diff --git a/addons/ofxiOS/src/sound/ofxOpenALSoundPlayer.cpp b/addons/ofxiOS/src/sound/ofxOpenALSoundPlayer.cpp
@@ -93,7 +93,7 @@ ofxOpenALSoundPlayer::~ofxOpenALSoundPlayer() {
 
 //--------------------------------------------------------------
 
-bool ofxOpenALSoundPlayer::load(const std::filesystem::path& filePath, bool stream) {
+bool ofxOpenALSoundPlayer::load(const of::filesystem::path& filePath, bool stream) {
 
 	if(!SoundEngineInitialized) {
 		ofxOpenALSoundPlayer::initializeSoundEngine();

diff --git a/addons/ofxiOS/src/sound/ofxOpenALSoundPlayer.h b/addons/ofxiOS/src/sound/ofxOpenALSoundPlayer.h
@@ -62,7 +62,7 @@ class ofxOpenALSoundPlayer : public ofBaseSoundPlayer{
 	ofxOpenALSoundPlayer();
 	~ofxOpenALSoundPlayer();
 
-	bool	load(const std::filesystem::path& fileName, bool stream=false);
+	bool	load(const of::filesystem::path& fileName, bool stream=false);
 	void	unload();
 
 	void	play();

diff --git a/addons/ofxiOS/src/sound/ofxiOSSoundPlayer.h b/addons/ofxiOS/src/sound/ofxiOSSoundPlayer.h
@@ -15,7 +15,7 @@ class ofxiOSSoundPlayer : public ofBaseSoundPlayer {
     ofxiOSSoundPlayer();
     ~ofxiOSSoundPlayer();
 
-    bool load(const std::filesystem::path& fileName, bool stream = false);
+    bool load(const of::filesystem::path& fileName, bool stream = false);
     void unload();
     void play();
     void stop();