From 7ffcc407c97715583118a704bac6bfa8941edbe4 Mon Sep 17 00:00:00 2001
From: nicopietroni <nico.pietroni@isti.cnr.it>
Date: Wed, 3 Oct 2012 16:38:23 +0000
Subject: [PATCH] corrected some warning and added support for read/write rosy
 format

---
 .../parametrization/tangent_field_operators.h | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/vcg/complex/algorithms/parametrization/tangent_field_operators.h b/vcg/complex/algorithms/parametrization/tangent_field_operators.h
index 62165750..92c76cf8 100644
--- a/vcg/complex/algorithms/parametrization/tangent_field_operators.h
+++ b/vcg/complex/algorithms/parametrization/tangent_field_operators.h
@@ -380,7 +380,7 @@ namespace vcg {
                 const CoordType &BaseDir)
 			{
 				CoordType sum = CoordType(0,0,0);
-				for (int i=0;i<TangVect.size();i++)
+                for (unsigned int i=0;i<TangVect.size();i++)
 				{
 					CoordType N1=Norms[i];
 					///find the rotation matrix that maps between normals
@@ -710,16 +710,16 @@ namespace vcg {
 				return true;
 			}
 
-            ///load a field on the mesh, it could be a vfield file (per vertex)
-            ///or an ffield file (per face)
+            ///Save a 4 rosy format file as used by
+            ///Interactive Visualization of Rotational Symmetry Fields on Surfaces
+            ///Jonathan Palacios and Eugene Zhang
             static void Save4ROSY(MeshType &mesh,
-                                const char *path,
-                                bool per_vertex=false)
+                                const char *path)
             {
                 FILE *f = fopen(path,"wt");
                 fprintf(f,"%d\n",mesh.vn);
                 fprintf(f,"4\n");
-                for (int i=0;i<mesh.vert.size();i++)
+                for (unsigned int i=0;i<mesh.vert.size();i++)
                 {
                     float dirX=(float)mesh.vert[i].PD1().X();
                     float dirY=(float)mesh.vert[i].PD1().Y();
@@ -730,6 +730,30 @@ namespace vcg {
                 fclose(f);
             }
 
+            ///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,
+                                const char *path)
+            {
+                 FILE *f = fopen(path,"rt");
+                int num,symm;
+                fscanf(f,"%d",&num);
+                assert(num==mesh.vn);
+                fscanf(f,"%d\n",&symm);
+                assert(symm==4);
+                for (unsigned 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();
+                }
+                fclose(f);
+            }
+
             static void MakeDirectionFaceCoherent(MeshType &mesh)
             {
                 vcg::tri::UpdateFlags<MeshType>::FaceClearS(mesh);