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

Cartesian->Simple_cartesian / float->double / int -> size_t

This commit is contained in:
Andreas Fabri 2010-06-24 08:40:19 +00:00
parent 7762ed8e02
commit d6d5c6c558
9 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Polyhedron_IO/examples/Polyhedron_IO/iv2off.cpp
View File

@ -2,7 +2,7 @@
// The scanner triggers on Coordinate3, IndexedFaceSet, and IndexedLineSet // The scanner triggers on Coordinate3, IndexedFaceSet, and IndexedLineSet
// keywords. It does not recognize transformations nor groups. // keywords. It does not recognize transformations nor groups.
#include <CGAL/Cartesian.h> #include <CGAL/Simple_cartesian.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/File_writer_OFF.h> #include <CGAL/IO/File_writer_OFF.h>
#include <cstddef> #include <cstddef>
@ -14,11 +14,11 @@
using namespace std; using namespace std;
typedef CGAL::Cartesian<float> Kernel; typedef CGAL::Simple_cartesian<double> Kernel;
typedef Kernel::Point_3 Point; typedef Kernel::Point_3 Point;
typedef list<Point> Point_list; typedef list<Point> Point_list;
typedef list<int> Facet; typedef list<std::size_t> Facet;
typedef list<Facet> Facet_list; typedef list<Facet> Facet_list;
// Command line arguments // Command line arguments
// ====================== // ======================
@ -38,10 +38,10 @@ Facet_list facets;
// iv File Scanner // iv File Scanner
// =============== // ===============
void iv_file_scanner( istream& in) { void iv_file_scanner( istream& in) {
int offset = 0; // offset for the Index....Set std::size_t offset = 0; // offset for the Index....Set
char c; // one read character (comment, vertex, or facet) char c; // one read character (comment, vertex, or facet)
char str[2000]; // temporal storage for rest of identifier char str[2000]; // temporal storage for rest of identifier
int blocks = 0; // Number of blocks found. int blocks = 0; // Number of blocks found.
CGAL::Verbose_ostream vout( verbose); CGAL::Verbose_ostream vout( verbose);
in >> str; in >> str;
@ -94,7 +94,7 @@ void iv_file_scanner( istream& in) {
vout << "\"IndexedFaceSet { coordIndex\" block found." vout << "\"IndexedFaceSet { coordIndex\" block found."
<< endl; << endl;
// indices start here // indices start here
int face_offset = facets.size(); std::size_t face_offset = facets.size();
in >> c; in >> c;
CGAL_assertion( c == '['); CGAL_assertion( c == '[');
facets.push_back( Facet()); facets.push_back( Facet());
@ -128,7 +128,7 @@ void iv_file_scanner( istream& in) {
vout << "\"IndexedLineSet { coordIndex\" block found." vout << "\"IndexedLineSet { coordIndex\" block found."
<< endl; << endl;
// indices start here // indices start here
int face_offset = facets.size(); std::size_t face_offset = facets.size();
in >> c; in >> c;
CGAL_assertion( c == '['); CGAL_assertion( c == '[');
facets.push_back( Facet()); facets.push_back( Facet());

1
Polyhedron_IO/examples/Polyhedron_IO/off2iv.cpp
View File

@ -1,6 +1,5 @@
// Convert from OFF format to OpenInventor (.iv) format. // Convert from OFF format to OpenInventor (.iv) format.
#include <CGAL/basic.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/Inventor_ostream.h> #include <CGAL/IO/Inventor_ostream.h>
#include <CGAL/IO/File_writer_inventor.h> #include <CGAL/IO/File_writer_inventor.h>

1
Polyhedron_IO/examples/Polyhedron_IO/off2off.cpp
View File

@ -1,6 +1,5 @@
// Copies a file in OFF format. // Copies a file in OFF format.
#include <CGAL/basic.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/File_writer_OFF.h> #include <CGAL/IO/File_writer_OFF.h>
#include <CGAL/IO/generic_copy_OFF.h> #include <CGAL/IO/generic_copy_OFF.h>

1
Polyhedron_IO/examples/Polyhedron_IO/off2vrml.cpp
View File

@ -1,6 +1,5 @@
// Convert from OFF format to VRML (.wrl) 1.0 or 2.0 format. // Convert from OFF format to VRML (.wrl) 1.0 or 2.0 format.
#include <CGAL/basic.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/VRML_1_ostream.h> #include <CGAL/IO/VRML_1_ostream.h>
#include <CGAL/IO/VRML_2_ostream.h> #include <CGAL/IO/VRML_2_ostream.h>

1
Polyhedron_IO/examples/Polyhedron_IO/off2wav.cpp
View File

@ -1,6 +1,5 @@
// Convert from OFF format to Wavefront (.obj) format. // Convert from OFF format to Wavefront (.obj) format.
#include <CGAL/basic.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/File_writer_wavefront.h> #include <CGAL/IO/File_writer_wavefront.h>
#include <CGAL/IO/generic_copy_OFF.h> #include <CGAL/IO/generic_copy_OFF.h>

1
Polyhedron_IO/examples/Polyhedron_IO/off_bbox.cpp
View File

@ -1,6 +1,5 @@
// computes bbox of an OFF object. // computes bbox of an OFF object.
#include <CGAL/basic.h>
#include <CGAL/Bbox_3.h> #include <CGAL/Bbox_3.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/File_scanner_OFF.h> #include <CGAL/IO/File_scanner_OFF.h>

12
Polyhedron_IO/examples/Polyhedron_IO/off_glue.cpp
View File

@ -1,6 +1,6 @@
// Glue vertices of a polyhedron together that have equal coordinate values. // Glue vertices of a polyhedron together that have equal coordinate values.
#include <CGAL/Cartesian.h> #include <CGAL/Simple_cartesian.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/File_scanner_OFF.h> #include <CGAL/IO/File_scanner_OFF.h>
#include <CGAL/IO/File_writer_OFF.h> #include <CGAL/IO/File_writer_OFF.h>
@ -14,9 +14,9 @@
using namespace std; using namespace std;
typedef CGAL::Cartesian<float> Kernel; typedef CGAL::Simple_cartesian<double> Kernel;
typedef Kernel::Point_3 Point; typedef Kernel::Point_3 Point;
typedef Kernel::Vector_3 Vector; typedef Kernel::Vector_3 Vector;
struct Vertex { struct Vertex {
Point point; Point point;
Vector normal; Vector normal;
@ -179,11 +179,11 @@ int main( int argc, char **argv) {
// Copy facets and translate vertex indices. // Copy facets and translate vertex indices.
writer.write_facet_header(); writer.write_facet_header();
for ( i = 0; i < scanner.size_of_facets(); i++) { for ( i = 0; i < scanner.size_of_facets(); i++) {
int no; // number of vertices of a facet. std::size_t no; // number of vertices of a facet.
scanner.scan_facet( no, i); scanner.scan_facet( no, i);
writer.write_facet_begin( no); writer.write_facet_begin( no);
for ( int j = 0; j < no; j++) { for ( int j = 0; j < no; j++) {
int index; std::size_t index;
scanner.scan_facet_vertex_index( index, i); scanner.scan_facet_vertex_index( index, i);
writer.write_facet_vertex_index( vertices[index].index); writer.write_facet_vertex_index( vertices[index].index);
} }

8
Polyhedron_IO/examples/Polyhedron_IO/off_transform.cpp
View File

@ -1,6 +1,6 @@
// Applies translation and scaling to an OFF object. // Applies translation and scaling to an OFF object.
#include <CGAL/Cartesian.h> #include <CGAL/Simple_cartesian.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
#include <CGAL/IO/File_scanner_OFF.h> #include <CGAL/IO/File_scanner_OFF.h>
#include <CGAL/IO/File_writer_OFF.h> #include <CGAL/IO/File_writer_OFF.h>
@ -12,9 +12,9 @@
using namespace std; using namespace std;
typedef CGAL::Cartesian<float> Kernel; typedef CGAL::Simple_cartesian<double> Kernel;
typedef Kernel::Point_3 Point; typedef Kernel::Point_3 Point;
typedef Kernel::Vector_3 Vector; typedef Kernel::Vector_3 Vector;
bool verbose = false; bool verbose = false;
bool binary = false; bool binary = false;

6
Polyhedron_IO/examples/Polyhedron_IO/polyhedron_copy.cpp
View File

@ -1,6 +1,6 @@
// Copies a CGAL::Polyhedron_3 from OFF format to OFF format. // Copies a CGAL::Polyhedron_3 from OFF format to OFF format.
#include <CGAL/Cartesian.h> #include <CGAL/Simple_cartesian.h>
#include <CGAL/Polyhedron_3.h> #include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h> #include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/IO/Verbose_ostream.h> #include <CGAL/IO/Verbose_ostream.h>
@ -12,8 +12,8 @@
using namespace std; using namespace std;
typedef CGAL::Cartesian<double> Kernel; typedef CGAL::Simple_cartesian<double> Kernel;
typedef CGAL::Polyhedron_3<Kernel> Polyhedron; typedef CGAL::Polyhedron_3<Kernel> Polyhedron;
bool verbose = false; bool verbose = false;
bool binary = false; bool binary = false;