Merge branch 'master' of https://gitea-s2i2s.isti.cnr.it/manolas/MySources

edgemesh.hpp

@@ -6,6 +6,12 @@
 #include <vcg/complex/complex.h>
 #include <vector>
 #include <wrap/io_trimesh/import.h>
+#include <optional>
+#include <array>
+
+#ifdef POLYSCOPE_DEFINED
+#include <polyscope/curve_network.h>
+#endif
 
 using EdgeIndex = size_t;
 

simulation_structs.hpp

@@ -308,10 +308,7 @@ public:
                                            .string();
       returnValue = pMesh->save(meshFilename);
       nlohmann::json json;
-      json[jsonLabels.meshFilename]
-          = std::filesystem::relative(std::filesystem::path(meshFilename),
-                                      std::filesystem::path(
-                                          std::filesystem::path(jsonFilename).parent_path()));
+json[jsonLabels.meshFilename]= std::filesystem::relative(std::filesystem::path(meshFilename),std::filesystem::path(jsonFilename).parent_path()).string();
       json[jsonLabels.meshLabel]
           = pMesh->getLabel(); // FIXME: This should be exported using nanoply but
                                // nanoply might not be able to write a string(??)

vcgtrimesh.hpp

@@ -2,6 +2,7 @@
 #define VCGTRIMESH_HPP
 #include "mesh.hpp"
 #include <vcg/complex/complex.h>
+#include <optional>
 
 #ifdef POLYSCOPE_DEFINED
 #include <polyscope/surface_mesh.h>