Commit Graph

222 Commits

Author SHA1 Message Date
Laurent Rineau 82a9645ba7 Fix VCisms: add "typename" and "this->" where required. 2008-09-05 08:03:49 +00:00
Pierre Alliez 31b2cd5b79 added incremental builder to copy a basic polyhedron into a textured one. 2008-09-04 15:42:58 +00:00
Pierre Alliez a3e70b5fa3 Demo polyhedron: commented addition of tex polyhedron and indentation. 2008-09-04 13:16:44 +00:00
Pierre Alliez 7033da91c9 rename Tex_polyhedron into Textured_polyhedron
link with TAUCS
2008-09-04 11:54:39 +00:00
Laurent Rineau b01af5dbdf Fix a use of CGAL::to_double: the generic CGAL::to_double is not able to
select the right Real_embeddable_traits (see the comments i have inserted).
2008-09-04 11:11:37 +00:00
Laurent Rineau 05982bcde8 Add typenames where needed. 2008-09-04 11:10:49 +00:00
Laurent Rineau 8fd0c93dc0 Fix a header name: Windows is case-insensitive but others OSs are! 2008-09-04 11:10:27 +00:00
Laurent Rineau a1bdd10ba6 Remove unused Windows-isms. 2008-09-04 11:09:47 +00:00
Pierre Alliez cd208c2715 Polyhedron demo: another attempt to compile - I get the messages
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(38) : error C2144: erreur de syntaxe : 'int' doit être précédé de ';'
2>        D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(44) : voir la référence à l'instanciation de la classe modèle 'CGAL::Fourtuple<T>' en cours de compilation
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(38) : error C2059: erreur de syntaxe : '{'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(38) : error C2334: jetons inattendus avant '{' ; corps apparent de la fonction ignoré
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(41) : error C2144: erreur de syntaxe : 'int' doit être précédé de ';'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C2327: 'CGAL::Fourtuple<T>::e0' : n'est pas un nom de type, un membre static, ni un énumérateur
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C2065: 'a0' : identificateur non déclaré
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C3861: 'e0' : identificateur introuvable
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C4430: spécificateur de type manquant - int est pris en compte par défaut. Remarque : C++ ne prend pas en charge int par défaut
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C2061: erreur de syntaxe : identificateur 'a1'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C4430: spécificateur de type manquant - int est pris en compte par défaut. Remarque : C++ ne prend pas en charge int par défaut
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C2365: 'CGAL::Fourtuple<T>::e1' : redéfinition ; la précédente définition était 'données membres'
2>        D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(36) : voir la déclaration de 'CGAL::Fourtuple<T>::e1'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C2061: erreur de syntaxe : identificateur 'a2'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C4430: spécificateur de type manquant - int est pris en compte par défaut. Remarque : C++ ne prend pas en charge int par défaut
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C2365: 'CGAL::Fourtuple<T>::e2' : redéfinition ; la précédente définition était 'données membres'
2>        D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(36) : voir la déclaration de 'CGAL::Fourtuple<T>::e2'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(42) : error C2061: erreur de syntaxe : identificateur 'a3'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(43) : error C4430: spécificateur de type manquant - int est pris en compte par défaut. Remarque : C++ ne prend pas en charge int par défaut
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(43) : error C2365: 'CGAL::Fourtuple<T>::e3' : redéfinition ; la précédente définition était 'données membres'
2>        D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(36) : voir la déclaration de 'CGAL::Fourtuple<T>::e3'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(43) : error C2143: erreur de syntaxe : absence de ';' avant '{'
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(43) : error C2334: jetons inattendus avant '{' ; corps apparent de la fonction ignoré
2>D:\pierre\src\cgal\CGALI\trunk\Polyhedron\demo\Polyhedron\..\..\..\STL_Extension\include\CGAL/Fourtuple.h(44) : fatal error C1075: fin de fichier rencontrée avant que l'élément accola
2008-09-04 08:31:57 +00:00
Pierre Alliez 8da0a517c0 remove DemosMainWindow from CmakeList - sorry for confusion 2008-09-04 08:15:14 +00:00
Pierre Alliez 0e128620c1 one attempt to fix comilation issue but I get this message:e2>D:\pierre\src\cgal\CGALI\trunk\Surface_mesher\include\CGAL/Robust_circumcenter_traits_3.h(29) : fatal error C1083: Impossible d'ouvrir le fichier include : 'CGAL/Robust_construction.h' : No such file or directory 2008-09-03 15:29:23 +00:00
Pierre Alliez 7b2e24f25c polyedron demo: added man model (it self intersects) 2008-09-03 11:48:33 +00:00
Pierre Alliez df111d3d66 added textured polyhedron.
note: does not compile - need to fix this.
2008-08-25 08:08:28 +00:00
Laurent Rineau e2e9488943 "dont submit" the biggest off files 2008-08-19 11:55:03 +00:00
Pierre Alliez dd41e4f2cf one attempt to texture mapping 2008-08-14 05:44:55 +00:00
Pierre Alliez add2be5b29 conformal parameterization. 2008-08-14 04:43:39 +00:00
Pierre Alliez 8f351ebd66 more on parameterization demo. 2008-08-14 03:37:29 +00:00
Pierre Alliez ae31d1071a added mushroom model 2008-08-13 16:09:34 +00:00
Pierre Alliez 13bf035e08 added a few models for testing. 2008-08-13 15:46:29 +00:00
Pierre Alliez b8cb058fc6 small update on parameterization 2008-08-13 07:35:32 +00:00
Pierre Alliez 33f63f15fe added parameterization (no visualization yet) 2008-08-13 03:28:27 +00:00
Pierre Alliez e4f3b7afdc nef polyhedra rendered with black edges. 2008-08-12 02:08:42 +00:00
Pierre Alliez 35ebf94041 added 2 models for the polyhedron demo 2008-08-11 22:40:57 +00:00
Pierre Alliez 766cd4e567 more wait cursors and console outputs.
now render edges in black
2008-08-11 18:43:21 +00:00
Pierre Alliez 93793fe21b fix remeshing conversion bug - the AABB tree now goes even faster. 2008-08-11 15:59:50 +00:00
Laurent Rineau 16486bc4cb Fix the columns widths. 2008-08-03 22:20:40 +00:00
Laurent Rineau 7427e45138 Stave and restore the dockwidget geometry. 2008-08-03 21:30:10 +00:00
Laurent Rineau b715656df3 Allow boolean operations that take one or two *nef* polyhedron as input.
(With previous revision, nef polyhedra could only be displayed.)
2008-08-01 18:59:03 +00:00
Laurent Rineau 5a27d45492 Remove verbose degugging of gluTess callbacks. 2008-08-01 18:57:55 +00:00
Laurent Rineau a3b2fc48bc - Fix erase: previous revision made it a no-op if the selected entry was a
Nef_polyhedron.
- Fix duplicate: previous revision make it a copy of pointers, instead of a
  deap copy.
2008-08-01 18:55:59 +00:00
Laurent Rineau 09fc087073 - Restore forward declarations and multiple compilation units.
- That is controled by a CMake option, ENABLE_FORWARD_DECL, which is OFF by
  default.

Tested in both cases (ON and OFF)...
2008-08-01 18:25:20 +00:00
Laurent Rineau 90637a6159 - Add tooltips for Nef_polyhedron.
- Scene::bbox() is moved to Scene_nef_and_polyhedron_operations.cpp
- Fix display of Nef_polyhedron entries.
  Details:
    - no longer use <CGAL/Nef_3/OGL_helper.h>
    - Scene::gl_render_nef_facets(Nef_polyhedron*) has been written from
      scratch (inspired by pieces of OGL_helper).
    - Use model light FRONT_AND_BACK for Nef_polyhedron entries, because
      Nef_polyhedron does not have the inside_out operation.
2008-08-01 18:24:14 +00:00
Laurent Rineau 701b3c05c9 Missing includes. 2008-08-01 18:14:01 +00:00
Laurent Rineau 3e92d2feeb Missing includes. 2008-08-01 18:13:34 +00:00
Laurent Rineau 6ef7b8a934 Fix onePolygonIsSelected(), so that it returns false if the selected
polyhedron is a Nef_polyhedron.
2008-08-01 18:12:56 +00:00
Laurent Rineau 9c79f2741e Add missing includes. 2008-08-01 18:11:32 +00:00
Laurent Rineau 52499951fa Add full support for Nef_3 in Polyhedron demo.
The Nef_3 rendering is still buggy (one just see the vertices). I do not
know why.
2008-08-01 11:15:31 +00:00
Laurent Rineau 265f382c05 Use support for recent files from CGAL::Qt::DemosMainWindow. 2008-07-30 18:04:59 +00:00
Laurent Rineau 796a0ee86e Use best OpenGL anti-aliasing, when anti-aliasing is opted. 2008-07-29 10:44:16 +00:00
Pierre Alliez add457ea96 a bit of cleanup in remeshing 2008-07-28 21:46:00 +00:00
Laurent Rineau 12e0e4ecc8 Add the output of remeshing to a new polyhedron. 2008-07-28 19:59:22 +00:00
Pierre Alliez bf572511a8 one unsuccessful attempt to mix kernel (I tried AABB tree with Cartesian, the rest with filtered kernel) 2008-07-28 19:30:23 +00:00
Pierre Alliez 6ef5a5d693 more on collision detection 2008-07-28 18:58:50 +00:00
Pierre Alliez bc8e6fd1e2 replace furthest intersection test by first_intersection 2008-07-28 18:16:38 +00:00
Laurent Rineau d4a2f1cb63 Fix compilation errors with GNU C++ compiler:
- add typename where needed and remove some where they were forbidden,
  - move up some function definitions, before they are used.
2008-07-28 13:45:30 +00:00
Pierre Alliez 7358b5e14c stripped off collision model for getting the demo compile on Linux 2008-07-28 11:36:44 +00:00
Pierre Alliez a99528a897 update models 2008-07-27 08:12:36 +00:00
Pierre Alliez 2f8b64315f fix cursor for remeshing 2008-07-27 07:28:25 +00:00
Pierre Alliez 835bd072f9 remeshing parameters using input dialog 2008-07-27 07:23:41 +00:00
Pierre Alliez e733fef1fe added lucy statue with finer resolution. 2008-07-26 22:06:58 +00:00