set IniFilename

Lecrapouille · Dec 30, 2023 · 520dc02 · 520dc02
1 parent 2a4297d
commit 520dc02
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ INCLUDES += -I$(P)/include -I$(P)/src -I$(P)/external
 ###################################################
 # Project defines
 #
-DEFINES += -DDATADIR=\"$(DATADIR)\"
+DEFINES += -DDATADIR=\"$(DATADIR):$(abspath $(P))/data/\"
 
 ###################################################
 # Reduce warnings
@@ -201,19 +201,23 @@ OBJS += DearUtils.o Drawable.o Application.o PetriEditor.o main.o
 ###################################################
 # Compile the project, the static and shared libraries
 .PHONY: all
-all: copy-emscripten-assets $(STATIC_LIB_TARGET) $(SHARED_LIB_TARGET) $(PKG_FILE) $(TARGET)
+all: copy-assets $(STATIC_LIB_TARGET) $(SHARED_LIB_TARGET) $(PKG_FILE) $(TARGET)
 
 ###################################################
-#
-.PHONY: copy-emscripten-assets
-copy-emscripten-assets: | $(BUILD)
+# Copy data inside BUILD to allow emscripten to embedded them
+.PHONY: copy-assets
+copy-assets: | $(BUILD)
 ifeq ($(ARCHI),Emscripten)
 	@$(call print-to,"Copying assets","$(TARGET)","$(BUILD)","")
 	@mkdir -p $(BUILD)/data
 	@mkdir -p $(BUILD)/examples
 	@cp $(P)/data/examples/*.json $(BUILD)/examples
 	@cp $(P)/data/font.ttf $(BUILD)/data
-	@cp $(P)/imgui.ini $(BUILD)
+	@cp $(P)/imgui.ini $(BUILD)/data
+else ifeq ($(ARCHI),Darwin)
+	# FIXME the data folder is copied automatically but missing rule
+	# for other path
+	@cp $(P)/imgui.ini $(P)/data
 endif
 
 ###################################################

diff --git a/src/Editor/PetriEditor.cpp b/src/Editor/PetriEditor.cpp
@@ -49,8 +49,14 @@ void Editor::startUp(std::string const& filepath)
 #  define FONT_SIZE 13.0f
 #endif
 
-    // Setup fonts
+    std::cout << "Path: " << m_path.toString() << std::endl;
+
+    // Set imgui.ini loading/saving location
     ImGuiIO &io = ImGui::GetIO();
+    io.IniFilename = m_path.expand("imgui.ini").c_str();
+    std::cout << "imgui.ini path: " << io.IniFilename << std::endl;
+
+    // Setup fonts
     io.Fonts->AddFontFromFileTTF(m_path.expand("font.ttf").c_str(), FONT_SIZE);
     reloadFonts();
 

diff --git a/src/Utils/Path.cpp b/src/Utils/Path.cpp
@@ -161,6 +161,19 @@ bool Path::open(std::string& filename, std::fstream& fs, std::ios_base::openmode
     return false;
 }
 
+//------------------------------------------------------------------------------
+std::vector<std::string> Path::pathes() const
+{
+    std::vector<std::string> res;
+    res.reserve(m_search_paths.size());
+    for (auto const& it: m_search_paths)
+    {
+        res.push_back(it);
+    }
+
+    return res;
+}
+
 //------------------------------------------------------------------------------
 std::string Path::toString() const
 {

diff --git a/src/Utils/Path.hpp b/src/Utils/Path.hpp
@@ -33,12 +33,15 @@ std::string osx_get_resources_dir(std::string const& file);
 #  endif
 
 //------------------------------------------------------------------------------
+#  ifndef DATADIR
+#    define GET_DATA_PATH project::info::data_path
+#  endif
 #  if defined(__APPLE__)
-#    define GET_DATA_PATH   osx_get_resources_dir("")
+#    define GET_DATA_PATH   DATADIR":" + osx_get_resources_dir("")
 #  elif defined(__EMSCRIPTEN__)
 #    define GET_DATA_PATH   "data/"
 #  else
-#    define GET_DATA_PATH   project::info::data_path
+#    define GET_DATA_PATH   DATADIR
 #  endif
 
 // *****************************************************************************
@@ -107,10 +110,15 @@ class Path
     //--------------------------------------------------------------------------
     std::string expand(std::string const& filename) const;
 
+    //--------------------------------------------------------------------------
+    //! \brief Return the container of path
+    //--------------------------------------------------------------------------
+    std::vector<std::string> pathes() const;
+
     //--------------------------------------------------------------------------
     //! \brief Return pathes as string. The first path is always ".:"
     //--------------------------------------------------------------------------
-    std::string toString() const;
+    std::string toString() const;  
 
     bool open(std::string& filename, std::ifstream& ifs,
               std::ios_base::openmode mode = std::ios_base::in) const;