songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some OBJ reading

This commit is contained in:
Maxime Gimeno 2020-05-25 17:03:05 +02:00
parent 1c2015078b
commit d0bfde7966
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
View File

@ -31,6 +31,7 @@
#include <CGAL/Polygon_mesh_processing/shape_predicates.h>
#include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
#include <CGAL/Polygon_mesh_processing/repair_polygon_soup.h>
#include "triangulate_primitive.h"
#include <CGAL/IO/OBJ.h>
@ -1494,11 +1495,16 @@ Scene_surface_mesh_item::load_obj(std::istream& in)
bool failed = !CGAL::read_OBJ(in, *(d->smesh_));
if(failed)
{
in.clear();
in.seekg(0);
std::vector<Point> points;
std::vector<std::vector<std::size_t> > faces;
failed = !CGAL::read_OBJ(in, points, faces);
failed = !CGAL::Polygon_mesh_processing::orient_polygon_soup(points, faces);
if(!failed)
{
CGAL::Polygon_mesh_processing::repair_polygon_soup(points, faces);
failed = !CGAL::Polygon_mesh_processing::orient_polygon_soup(points, faces);
}
if(!failed)
CGAL::Polygon_mesh_processing::polygon_soup_to_polygon_mesh(points, faces, *(d->smesh_));
}

2
Stream_support/include/CGAL/IO/OBJ.h
View File

@ -111,7 +111,7 @@ bool read_OBJ(std::istream& is,
continue;
}
}
if(maxi<0)
if(maxi==-1 && mini == 1)
{
if(verbose)
std::cerr<<"No face detected."<<std::endl;