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

Merge pull request #1146 from maxGimeno/Polyhedron_demo-Fix_obj_reading-GF 

Fix for the OBJ reading.
This commit is contained in:
Sebastien Loriot 2016-06-10 14:10:21 +02:00 committed by GitHub
parent 441457bc2a c2f02afee5
commit 46d94140ba
2 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
View File

@ -5,6 +5,7 @@
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/IO/File_writer_wavefront.h>
#include <CGAL/IO/generic_copy_OFF.h>
#include <CGAL/IO/OBJ_reader.h>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
@ -846,28 +847,8 @@ Scene_polyhedron_item::load_obj(std::istream& in)
typedef Polyhedron::Vertex::Point Point;
std::vector<Point> points;
std::vector<std::vector<std::size_t> > faces;
Point p;
std::string line;
std::size_t i, j, k;
bool failed = false;
while(getline(in, line)){
if(line[0] == 'v'){
std::istringstream iss(line.substr(1));
iss >> p;
if(! iss) failed = true;
points.push_back(p);
} else if(line[0] == 'f'){
std::istringstream iss(line.substr(1));
iss >> i >> j >> k;
if(! iss) failed = true;
std::vector<std::size_t> face;
face.push_back(i-1);
face.push_back(j-1);
face.push_back(k-1);
faces.push_back(face);
}
}
bool failed = !CGAL::read_OBJ(in,points,faces);
if(CGAL::Polygon_mesh_processing::orient_polygon_soup(points,faces)){
CGAL::Polygon_mesh_processing::polygon_soup_to_polygon_mesh( points,faces,*poly);
}else{

59
Polyhedron_IO/include/CGAL/IO/OBJ_reader.h Normal file
View File

@ -0,0 +1,59 @@
// Copyright (c) 2016 GeometryFactory
//
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; either version 3 of the License,
// or (at your option) any later version.
//
// Licensees holding a valid commercial license may use this file in
// accordance with the commercial license agreement provided with the software.
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
//
// $URL$
// $Id$
//
// Author(s) : Andreas Fabri and Maxime Gimeno
#ifndef CGAL_IO_OBJ_READER_H
#define CGAL_IO_OBJ_READER_H
#include <istream>
#include <vector>
namespace CGAL {
template <class Point_3>
bool
read_OBJ( std::istream& input,
std::vector<Point_3> &points,
std::vector<std::vector<std::size_t> > &faces)
{
Point_3 p;
std::string line;
while(getline(input, line)) {
if(line[0] == 'v' && line[1] == ' ') {
std::istringstream iss(line.substr(1));
iss >> p;
if(!iss)
return false;
points.push_back(p);
}
else if(line[0] == 'f') {
std::istringstream iss(line.substr(1));
int i;
faces.push_back( std::vector<std::size_t>() );
while(iss >> i)
{
faces.back().push_back(i-1);
iss.ignore(256, ' ');
}
}
}
return true;
}
} // namespace CGAL
#endif // CGAL_IO_OBJ_READER_H