From 73b2bc8c1a1c3f8e1aa691c170e59fc8c10dd657 Mon Sep 17 00:00:00 2001
From: iasonmanolas <iasonmanolasece@gmail.com>
Date: Sat, 12 Jun 2021 12:18:55 +0300
Subject: [PATCH] Windows refactoring

---
 edgemesh.hpp           | 6 ++++++
 simulation_structs.hpp | 5 +----
 vcgtrimesh.hpp         | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/edgemesh.hpp b/edgemesh.hpp
index c373add..33ec3e7 100755
--- a/edgemesh.hpp
+++ b/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;
 
diff --git a/simulation_structs.hpp b/simulation_structs.hpp
index 4141aa4..35bb693 100755
--- a/simulation_structs.hpp
+++ b/simulation_structs.hpp
@@ -297,10 +297,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(??)
diff --git a/vcgtrimesh.hpp b/vcgtrimesh.hpp
index 02a180e..60d8f9e 100755
--- a/vcgtrimesh.hpp
+++ b/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>