diff --git a/wrap/io_trimesh/export_idtf.h b/wrap/io_trimesh/export_idtf.h index 22da3255..b34082e5 100644 --- a/wrap/io_trimesh/export_idtf.h +++ b/wrap/io_trimesh/export_idtf.h @@ -121,7 +121,7 @@ public: idtf.write(4,"}"); idtf.write(3,"}"); idtf.write(3,"MESH_FACE_POSITION_LIST {"); - for(SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) + for(typename SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) { idtf.write(4,TextUtility::nmbToStr(fit->V(0) - &(*m.vert.begin())) + " " + TextUtility::nmbToStr(fit->V(1) - &(*m.vert.begin())) + " " + @@ -131,7 +131,7 @@ public: idtf.write(3,"MESH_FACE_NORMAL_LIST {"); unsigned int nn = 0; - for(SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) + for(typename SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) { idtf.write(4,TextUtility::nmbToStr(nn) + " " + TextUtility::nmbToStr(nn + 1) + " " + @@ -144,7 +144,7 @@ public: { idtf.write(3,"MESH_FACE_TEXTURE_COORD_LIST {"); unsigned int nn = 0; - for(SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) + for(typename SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) { idtf.write(4,"FACE " + TextUtility::nmbToStr(nn) + "{"); idtf.write(5,"TEXTURE_LAYER 0 TEX_COORD: " + TextUtility::nmbToStr(nn) + " " + @@ -156,14 +156,14 @@ public: } idtf.write(3,"MESH_FACE_SHADING_LIST {"); - for(SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) + for(typename SaveMeshType::ConstFaceIterator fit = m.face.begin();fit != m.face.end();++fit) { idtf.write(4,TextUtility::nmbToStr(0)); } idtf.write(3,"}"); idtf.write(3,"MODEL_POSITION_LIST {"); - for(SaveMeshType::ConstVertexIterator vit = m.vert.begin();vit != m.vert.end();++vit) + for(typename SaveMeshType::ConstVertexIterator vit = m.vert.begin();vit != m.vert.end();++vit) { idtf.write(4,TextUtility::nmbToStr(vit->P().X()) + " " + TextUtility::nmbToStr(vit->P().Y()) + " " + @@ -172,7 +172,7 @@ public: idtf.write(3,"}"); idtf.write(3,"MODEL_NORMAL_LIST {"); - for(SaveMeshType::FaceIterator fitn = m.face.begin();fitn != m.face.end();++fitn) + for(typename SaveMeshType::FaceIterator fitn = m.face.begin();fitn != m.face.end();++fitn) { for(unsigned int ii = 0;ii < 3;++ii) { @@ -186,7 +186,7 @@ public: if (mask & vcg::tri::io::Mask::IOM_WEDGTEXCOORD) { idtf.write(3,"MODEL_TEXTURE_COORD_LIST {"); - for(SaveMeshType::FaceIterator fitn = m.face.begin();fitn != m.face.end();++fitn) + for(typename SaveMeshType::FaceIterator fitn = m.face.begin();fitn != m.face.end();++fitn) { for(unsigned int ii = 0;ii < 3;++ii) { diff --git a/wrap/io_trimesh/export_u3d.h b/wrap/io_trimesh/export_u3d.h index 0911448c..f78a9f3f 100644 --- a/wrap/io_trimesh/export_u3d.h +++ b/wrap/io_trimesh/export_u3d.h @@ -18,7 +18,6 @@ class ExporterU3D { private: -#ifdef WIN32 static void InvokeConverter(const QString& converter_path,const QString& input_idtf,const QString& output_u3d) { QProcess p; @@ -29,20 +28,6 @@ private: p.close(); } -#else - #ifdef LINUX - - static void InvokeConverter(const char* converter_path,const QString& input_idtf,const QString& output_u3d) - { - p.start(converter_path + "IDTFConverter.exe -input " + input_idtf + " -output " + output_u3d); - //wait for four minutes - bool t = p.waitForFinished(240000); - p.close(); - } - - #endif -#endif - static void SaveLatex(SaveMeshType& m,const QString& file) { Output_File latex(file.toStdString() + ".tex");