manolas
/
MySources
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
iasonmanolas 2021-06-12 15:04:06 +03:00
parent 33774c546c 553e117379
commit e5ba83c0c8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
edgemesh.hpp
View File

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

5
simulation_structs.hpp
View File

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

1
vcgtrimesh.hpp
View File

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