From 9e4394a6567f6f27574a0ddad6904bdb7bc5f7ce Mon Sep 17 00:00:00 2001
From: nico <nico.pietroni@gmail.com>
Date: Sun, 12 Jan 2020 22:33:48 +1100
Subject: [PATCH] corrected some error in Import/export 4rosy

---
 wrap/io_trimesh/export_field.h | 11 +++++------
 wrap/io_trimesh/import_field.h | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/wrap/io_trimesh/export_field.h b/wrap/io_trimesh/export_field.h
index bcd97e9b..ea89f70b 100644
--- a/wrap/io_trimesh/export_field.h
+++ b/wrap/io_trimesh/export_field.h
@@ -94,15 +94,14 @@ public:
                         const char *path)
     {
         FILE *f = fopen(path,"wt");
-        fprintf(f,"%d\n",mesh.vn);
+        fprintf(f,"%d\n",mesh.fn);
         fprintf(f,"4\n");
-        for (unsigned int i=0;i<mesh.vert.size();i++)
+        for (unsigned int i=0;i<mesh.face.size();i++)
         {
-            float dirX=(float)mesh.vert[i].PD1().X();
-            float dirY=(float)mesh.vert[i].PD1().Y();
-            float dirZ=(float)mesh.vert[i].PD1().Z();
+            float dirX=(float)mesh.face[i].PD1().X();
+            float dirY=(float)mesh.face[i].PD1().Y();
+            float dirZ=(float)mesh.face[i].PD1().Z();
             fprintf(f,"%f %f %f \n",dirX,dirY,dirZ);
-
         }
         fclose(f);
     }
diff --git a/wrap/io_trimesh/import_field.h b/wrap/io_trimesh/import_field.h
index d7c5ad23..e80c0c14 100644
--- a/wrap/io_trimesh/import_field.h
+++ b/wrap/io_trimesh/import_field.h
@@ -219,25 +219,30 @@ public:
     ///Load a 4 rosy format file as used by
     ///Interactive Visualization of Rotational Symmetry Fields on Surfaces
     ///Jonathan Palacios and Eugene Zhang
-    static void Load4ROSY(MeshType &mesh,
+    static bool Load4ROSY(MeshType &mesh,
                           const char *path)
     {
         FILE *f = fopen(path,"rt");
+        if (!f)
+        {
+            return false;
+        }
         int num,symm;
         fscanf(f,"%d",&num);
-        assert(num==mesh.vn);
+        assert(num==mesh.fn);
         fscanf(f,"%d\n",&symm);
         assert(symm==4);
-        for (unsigned int i=0;i<num;i++)
+        for (int i=0;i<num;i++)
         {
             float dirX,dirY,dirZ;
             fscanf(f,"%f %f %f \n",&dirX,&dirY,&dirZ);
-            mesh.vert[i].PD1()=CoordType(dirX,dirY,dirZ);
-            mesh.vert[i].PD2()=mesh.vert[i].PD1()^mesh.vert[i].N();
-            mesh.vert[i].PD1().Normalize();
-            mesh.vert[i].PD2().Normalize();
+            mesh.face[i].PD1()=CoordType(dirX,dirY,dirZ);
+            mesh.face[i].PD2()=mesh.face[i].PD1()^mesh.face[i].N();
+            mesh.face[i].PD1().Normalize();
+            mesh.face[i].PD2().Normalize();
         }
         fclose(f);
+        return true;
     }