songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
48,883 Commits 3 Branches 156 Tags 964 MiB
Commit Graph

470 Commits

Author SHA1 Message Date
Laurent Rineau edc22fceba The meshing works... almost. 2009-11-23 17:00:18 +00:00
Laurent Rineau 39c8d33a1e The placement of protecting spheres seems ok, now, as well as the 
visualization. Now let's mesh...
 2009-11-23 11:03:09 +00:00
Laurent Rineau 118b6af6c3 Protect border edges (sharp edges will come). 
For the moment, the display does not work!
 2009-11-23 01:00:12 +00:00
Laurent Rineau 23d3e6e1ac Minor change: add shortcuts to actions. 
(The diff is not small because Qt4 Designer loves to change the whitespace
of the xml file, or the order of things, from versions to versions.)
 2009-11-20 13:49:55 +00:00
Laurent Rineau 08cb49f980 - The remeshing plugin now ask for the tag (manifold/non_manifold). It can 
also return a triangle soup, instead of a polyhedron.
- To choose the initial points, do not try to create a sample of n initial
  points if the number of vertices of the input polyhedron is < n (think
  about the cube, with 8 vertices).
 2009-11-20 13:28:35 +00:00
Laurent Rineau 3baee3ce4c - Insert a random sample of the polyhedron points, instead of the first 
points, to avoid having a triangulation of dimension < 3
- Set the error_behavior to ABORT, so that the try/catch of the Qt4 main
  loop does not intercept our CGAL assertions (that prevents efficient
  debugging).
 2009-11-19 14:18:33 +00:00
Sylvain Pion 4fffff584c One more typo : Copyrigth -> Copryright. 2009-08-07 11:32:21 +00:00
Laurent Rineau f1a3f94274 Merge to trunk commits from CGAL-3.5-branch so far. 
Merged revisions 50855,50859,50863,50868,50871,50878-50879,50886,50893,50930-50934 via svnmerge from 
svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.5-branch

........
  r50855 | lrineau | 2009-07-27 13:47:18 +0200 (Mon, 27 Jul 2009) | 1 line
  
  Attempt to fix links to precompiled demos.
........
  r50859 | lrineau | 2009-07-27 14:37:54 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  update the AUTHORS list
........
  r50863 | lrineau | 2009-07-27 14:53:14 +0200 (Mon, 27 Jul 2009) | 3 lines
  
  Remove occurences of "3.4" in various files (problem reported by
  J. Reichel)
........
  r50868 | lrineau | 2009-07-27 15:38:39 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Fix target names conflicts with Triangulation_2.
........
  r50871 | lrineau | 2009-07-27 15:48:57 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Taucs will be updated for CGAL-3.5.
........
  r50878 | lrineau | 2009-07-27 16:10:03 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  There was still a 3.4 in that file.
........
  r50879 | lrineau | 2009-07-27 16:16:11 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Fix a problem with \cgalrawversion{}: use "\cgalrawversion" instead!
........
  r50886 | reichel | 2009-07-27 19:09:07 +0200 (Mon, 27 Jul 2009) | 2 lines
  
  Set CGAL_SONAME_VERSION to 4 and CGAL_SOVERSION to 4.0.0.
........
  r50893 | lsaboret | 2009-07-28 10:27:31 +0200 (Tue, 28 Jul 2009) | 2 lines
  
  * Fixed include path.
  * Fixed order of libraries: TAUCS must be listed before LAPACK.
........
  r50930 | lrineau | 2009-07-29 11:58:00 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add periodic_3_demo to "make demos".
........
  r50931 | lrineau | 2009-07-29 11:59:33 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add CGAL ipelets to "make demos".
........
  r50932 | lrineau | 2009-07-29 12:57:59 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add the polyhedron demo to "make demos".
........
  r50933 | lrineau | 2009-07-29 13:04:50 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Add the points set demo to "make demos".
........
  r50934 | lrineau | 2009-07-29 13:09:22 +0200 (Wed, 29 Jul 2009) | 2 lines
  
  Make the windows installer fetch the manual from the right place!
........
 2009-07-29 12:49:27 +00:00
Laurent Rineau 968b31d684 Move the non-documented AABB_polyhedral_oracle.h to the polyhedron demo. 2009-07-22 14:06:10 +00:00
Laurent Rineau ded88b6cf2 Add a TODO for later. 2009-07-10 09:17:03 +00:00
Laurent Rineau 2a7d7d314c <CGAL/AABB_polyhedral_oracle.h> is actually not used. 
But <CGAL/AABB_intersections.h> is required!
 2009-07-08 16:27:57 +00:00
Laurent Rineau aa13c41910 Add a workaround so that Qt-4.2 (used in the testsuite) is also supported: 
QColor::darker was named QColor::dark in Qt-4.2.
 2009-07-08 14:13:11 +00:00
Laurent Rineau 307579c69a Fix the mesh_3 plugin of the Polyhedron demo, after Mesh_3 refactoring. 2009-07-06 14:16:22 +00:00
Laurent Rineau 426484348d Add a customized cgal_test, so that plugins are compiled too. 2009-07-06 09:15:31 +00:00
Andreas Fabri 437215a6be root_bbox -> bbox and is_empty -> empty 2009-07-04 17:40:38 +00:00
Laurent Rineau edcd3846c3 New signal, in Scene_item, that will be emitted just before an item is 
destroyed by the scene.
 2009-04-27 13:40:59 +00:00
Stéphane Tayeb 51c1715065 Fix compilation errors with AABB_tree package. 2009-04-27 13:23:54 +00:00
Pierre Alliez 4018a88be9 polyhedron demo: fix compilation of remeshing plugin 2009-04-26 14:25:30 +00:00
Stéphane Tayeb a7d06454d2 Add include files to fix compilation errors with AABB_tree r48849. 2009-04-22 09:34:19 +00:00
Laurent Rineau dca45892a2 Add a TODO file. 2009-04-22 08:46:17 +00:00
Laurent Rineau 15d7658427 Move the refactored Polyhdron demo to trunk. That version is now the 
official one!
 2009-04-22 08:38:37 +00:00
Laurent Rineau cc78922d1b Move the current demo/Polyhedron to demo/Polyhedron.old 2009-04-22 08:36:52 +00:00
Laurent Rineau 38c236994e Remove that temporary commited version. 2009-04-21 12:16:14 +00:00
Laurent Rineau ee527de50f Attempt to fix the compilation in the testsuite. 
I do not really understand what is the rule the extend the Intersect_3
functor of the kernel.
 2009-04-02 12:43:43 +00:00
Laurent Rineau 14c5963966 Update to last version. 2009-03-31 13:13:04 +00:00
Laurent Rineau 9e0ee8713d - Use <CGAL/Timer.h> instead of <QTime.h>. 
- Adaptation to the new interface of AABB_tree (with constness).
 2009-03-30 14:17:10 +00:00
Laurent Rineau 520fcb3a9d Qt-4.5 broke compatibility witg uic-4.2 2009-03-30 12:39:09 +00:00
Laurent Rineau ae5de4ad7f Let's try this in the testsuite, just for a new days. 2009-03-27 16:17:18 +00:00
Laurent Saboret c90c988b33 Fixed compilation error on Windows: added Profiling_tools/include to include path. 2009-03-18 10:16:39 +00:00
Laurent Rineau c2a7942fda Add macros CGAL_POLYHEDRON_DEMO_USE_NEF and 
CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER so that one can compile without the
remeshing and boolean operations.
That speeds the compilation of the demo, while developing another part of
the demo.
 2009-03-09 18:07:39 +00:00
Laurent Rineau faee2cad9b Restore the possibility to use separate compilations, with forward 
declarations to avoid too many dependencies.
 2009-03-05 14:08:30 +00:00
Pierre Alliez bb001a99c2 added icosahedron.off to polyhedron demo 2009-02-27 14:24:28 +00:00
Laurent Rineau a203642e46 Remove a warning from g++: 
MainWindow_parameterization.cpp:39: warning: 'success' may be used
uninitialized in this function
 2009-02-25 09:59:36 +00:00
Laurent Rineau 397c0fd00f s/above/below/ 2009-01-30 15:42:41 +00:00
Laurent Rineau ecb349ec7a No need to link explicitly with ${TAUCS_LIBRARIES}: ${TAUCS_USE_FILE} deals 
with that.
 2009-01-25 23:12:45 +00:00
Laurent Rineau 9950bb2547 Merge revision 47808 from branch 3.4: 
- Add a conditional compilation of MainWindow_curvature_estimation.cpp,
    that depends on the configuration of LAPACK.
  - Add QMessage::warning() calls, to tell the user why some functionality
    is not available.
 2009-01-25 14:36:58 +00:00
Sylvain Pion eaba877fb2 Remove svn:executable property on *.xpm *.odp */maintainer files 2009-01-03 13:38:09 +00:00
Laurent Rineau 7c884dab31 Yet yet yet another fix for out-of-sources build! The last one, I hope! 
(The release is coming...)
 2008-12-18 19:18:01 +00:00
Laurent Rineau 2b4edbaa1e Yet another fix for out-of-sources build! 2008-12-18 18:43:28 +00:00
Fernando Cacciola 24f08fc681 Added demos to the demos target 2008-12-18 17:29:36 +00:00
Laurent Rineau 50f70bb31a Add the CGAL icons, and "CGAL" in the title. 2008-12-18 17:26:35 +00:00
Pierre Alliez e8cb052597 polyhedron demo: removed two unused menus and one comment 2008-12-18 13:47:12 +00:00
Andreas Fabri 45468f2362 Switch to CGAL::Manifold_with_boundary_tag() 2008-12-05 16:33:22 +00:00
Pierre Alliez 644468762e polyhedron demo: remove dependency to graphicsview in the trunk 2008-12-02 09:48:09 +00:00
Laurent Rineau 46b70b7c25 Fix again FindQGLViewer.cmake so that it deals with debug and release 
libraries, even on Linux where only the release one exists.

Rename QGLVIEWER_LIBRARY to QGLVIEWER_LIBRARIES (-IES), to mimic other
CMake packages.
 2008-11-27 15:20:46 +00:00
Laurent Rineau d040b51a80 Use QT4_FOUND instead of QT_FOUND. FindQt4.cmake provides both. 
As we have QT3_FOUND, in FindQt3-patched.cmake, that makes more sens to use
the versionned variable.
 2008-11-20 13:25:42 +00:00
Laurent Rineau 4032eade9a Massive removale of "QUIET" in find_package calls (except for 
FindVTK.cmake, which has a bug). Let's see if that can help us to find out
why we still have problems with demos on MacOS and Windows.
 2008-11-19 13:58:43 +00:00
Laurent Rineau 60f918b050 Just a modification of the first comment. 2008-11-19 13:12:30 +00:00
Laurent Rineau fef3e3b19d cmake-2.4*.5* is required. 2008-11-13 14:49:25 +00:00
Andreas Fabri 1b42bf6c1c Undo as we fixed it globally in Rev 46848 2008-11-12 15:52:24 +00:00
Andreas Fabri f4d33c4550 Include CGAL header before the QtOpenGL file as this one includes <windows.h> which screws up a Leda header file, in case we have leda support 2008-11-12 10:52:01 +00:00
Laurent Rineau 0c065f1f99 Fix the use of TAUCS. 2008-11-10 14:39:45 +00:00
Laurent Rineau db52329482 Remove unused variable (warning). 2008-11-10 14:38:23 +00:00
Fernando Cacciola 547bffecd9 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-06 13:03:41 +00:00
Laurent Rineau 565192a3c6 Comment out option POLYHEDRON_DEMO_ENABLE_FORWARD_DECL because it does not 
work.
 2008-11-05 10:05:24 +00:00
Laurent Saboret dae487fb5a Removed code to find Boost and Boost.Thread (as per AF and LR request) 2008-11-04 15:00:55 +00:00
Laurent Saboret 69eade49a7 Port to Windows/Visual C++ 2005 2008-11-04 14:15:30 +00:00
Laurent Saboret e2f64882b1 Fixed warning 2008-11-04 13:43:05 +00:00
Andreas Fabri 34560b4a0e improve the match by passing a std::ptrdiff_t instead of a number literal 2008-11-04 11:06:35 +00:00
Laurent Saboret 74d29f695a Link with BLAS, LAPACK and TAUCS using CGAL_UseTAUCS.cmake 2008-11-04 11:06:31 +00:00
Laurent Rineau 316356dd3f Use new functions readState() and writeState() of CGAL::Qt::DemosMainWindows 2008-11-02 22:29:53 +00:00
Laurent Rineau edf7b1afe3 Partially revert r46620: only Scene.cpp should have been submitted. 2008-11-02 22:28:18 +00:00
Laurent Rineau 04b54f52e3 Add a workaround so that one use QColor::lighter for Qt>=4.3 and QColor::light for Qt<=4.2. 2008-11-02 22:25:50 +00:00
Laurent Saboret 164adfb71d Fixed bug: AUTO_LINK_ENABLED was renamed CGAL_AUTO_LINK_ENABLED 2008-10-28 12:47:45 +00:00
Fernando Cacciola d70bdaea18 Prefixed cmake variables with CGAL_ 2008-10-23 14:59:02 +00:00
Pierre Alliez b888934721 update resources, rescale elephant mesh model. 2008-10-21 08:55:06 +00:00
Pierre Alliez 3b4399aaf8 added one knot 2008-10-21 08:44:33 +00:00
Pierre Alliez be4f86ab8c demo polyhedron: added a set of mech. parts 2008-10-21 08:42:55 +00:00
Pierre Alliez db6c20f1a7 polyhedron demo: code cleanup in mainwindow.h 2008-10-21 08:32:16 +00:00
Pierre Alliez a234b4cc71 added new small models for Boolean operations and a little cute elephant. 2008-10-21 08:30:09 +00:00
Pierre Alliez 8a9f2dbf2a cleanup mesh models 2008-10-21 08:23:00 +00:00
Pierre Alliez 0d54160c8d polyghedron demo: remove big mesh files 2008-10-21 08:18:44 +00:00
Pierre Alliez 1da7c84720 polyhedron demo: simplified menus 2008-10-16 14:57:38 +00:00
Pierre Alliez 7f8e9ca8b4 polyhedron demo: simplify GUI by removing toolbars 2008-10-07 09:49:48 +00:00
Laurent Rineau 482560eb2d Conditional compilation, for that huge demo! 2008-10-02 10:52:27 +00:00
Laurent Rineau 9e80736743 Move AABB_tree in its own svn package (not documented for CGAL-3.4). 
(TODO: one need copyright/license headers.)
 2008-10-01 08:10:00 +00:00
Pierre Alliez d79f377307 solve one bug in kernel 2008-09-30 13:47:08 +00:00
Laurent Rineau a04928195d Use QApplication::restoreOverrideCursor() instead of 
QApplication::setOverrideCursor(Qt::ArrowCursor).
 2008-09-28 16:23:39 +00:00
Laurent Rineau 7db0035b21 Renam main.cpp to Polyhedron_3.cpp, to please cgal_test_with_cmake. 2008-09-26 13:23:02 +00:00
Laurent Rineau 27c49feaee typos 2008-09-25 16:10:55 +00:00
Pierre Alliez 417b5e2cc1 improve texturing for parameterization 
added few comments and code cleanups
 2008-09-23 14:56:31 +00:00
Laurent Rineau db59488a8a Link with TAUCS... 2008-09-22 21:58:25 +00:00
Laurent Rineau 029aff845e Fix display of textured polyhedra. 2008-09-22 14:32:50 +00:00
Laurent Rineau 5404612493 Fix TAUCS support in this demo. 2008-09-22 14:32:17 +00:00
Laurent Rineau 48d7197304 Followup: attempt to restore the forward declarations and separate 
compilation. Still does not compile.
 2008-09-22 10:53:23 +00:00
Laurent Rineau d901641bdd - Fix the CMakeLists.txt\ 
- Make TAUCS optionnal
- Attempt to restore the forward declarations and separate compilation.
 2008-09-22 10:28:09 +00:00
Pierre Alliez 14e4557741 Polyhedron demo: another attempt to get the texture mapping to work 2008-09-11 21:16:43 +00:00
Pierre Alliez 19cffe7d29 Polyhedron demo: 
- added textured polyhedron 
- rendering with texture mapping does not work yet
 2008-09-11 15:45:30 +00:00
Laurent Rineau 643ba800db Fix linking. 2008-09-11 13:58:08 +00:00
Laurent Rineau 0580aafa81 Use <CGAL/gl.h> instead of <CGAL/gl.h>! 2008-09-11 13:53:56 +00:00
Laurent Rineau 1266312e32 Followup of previous commit ("Add auto-link to libCGALQt4 files."). 
Now use auto-link in demos that use CGAL Qt4 support.
 2008-09-05 16:04:07 +00:00
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
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
Pierre Alliez 09a9c58abc added timing for remeshing 2008-07-26 22:01:56 +00:00
Pierre Alliez e375a5bdb8 First running version of remeshing using AABB tree (needs cleaning) 2008-07-26 21:34:40 +00:00
Pierre Alliez 7032b35789 AABB tree now linked to oracle 2008-07-26 20:15:38 +00:00
Pierre Alliez dfab7987ac more on AABB tree for surface remeshing 2008-07-26 19:59:19 +00:00
Pierre Alliez c259f9dd4e surface remeshing now compiles fine - it remains to connect with the AABBtree collision model. 2008-07-26 19:08:44 +00:00
Pierre Alliez 94f71be161 1-line toolbar 2008-07-26 16:12:12 +00:00
Pierre Alliez afee4ab133 move colllision model into a separate folder. 2008-07-26 14:37:18 +00:00
Pierre Alliez 91c7c4f562 move all intersection tests into a separate folder. 2008-07-26 14:36:21 +00:00
Pierre Alliez 001f880410 initial work on remeshing 2008-07-26 14:34:32 +00:00
Pierre Alliez 976a501b9e uncomment subdivision functions as they now compile fine. 2008-07-26 10:34:56 +00:00
Andreas Fabri 2bf2b4ff3e No need to include <CGAL/basic.h> 2008-07-25 21:21:02 +00:00
Andreas Fabri d65736ebf4 Fix such that subdivision operations compile with VC7. Forward declaration needs some rework by Laurent 2008-07-25 21:19:22 +00:00
Pierre Alliez 20ca98dab6 removed icons. 
fix cursors.
 2008-07-24 20:52:49 +00:00
Pierre Alliez fa9b69fafe added tripod model to debug the kernel 2008-07-22 21:39:06 +00:00
Pierre Alliez b268ca8b0e added inside out operation 
fixed kernel
 2008-07-22 15:25:45 +00:00
Pierre Alliez 427fb2b74f added menu inside out - need to write the code 2008-07-22 13:44:29 +00:00
Pierre Alliez 0bd6adbc43 a bit of cleanup on scene Bbox computation. 2008-07-20 14:34:49 +00:00
Pierre Alliez 39b907c461 global cleanup of mesh operations. 
Laurent: I cannot understand why the icons specified and visible in the designer are not visible in the exec.
Also, I was unable to compile the subdivision functions.
 2008-07-20 14:15:48 +00:00
Pierre Alliez ca0b136bbd icons for Boolean operations. 
weird: they look fine in the designer but are not shown in the exec.
 2008-07-18 20:30:57 +00:00
Laurent Rineau 35af0d054a "Erase all" now work. 
"Erase' now has the Delete key as shortcut.
 2008-07-18 16:23:06 +00:00
Laurent Rineau acf4ea73d5 Let the application remember in which directory lies the last open file. 
That directory is used to load new files.
 2008-07-18 13:49:02 +00:00
Laurent Rineau 7e60068d60 Fix the crash if arguments.isEmpty(). 
Add various checks.
 2008-07-17 23:17:40 +00:00
Laurent Rineau e8f7a4917a Fix the crash if arguments.isEmpty(). 2008-07-17 23:17:23 +00:00
Pierre Alliez 672daa420b added translate for polyhedron kernel 2008-07-17 15:17:24 +00:00
Laurent Rineau 70add34bae Allow the use of Meta instead of Alt, for the paths edition of QGLViewer. 2008-07-16 23:37:11 +00:00
Laurent Rineau 7c4e6dd0b8 Add Viewer::drawWithNames() and Viewer::postSelection(): that implements 
the feature "selection with mouse" (Shift+LeftButton simple click).

Scene::draw now has a boolean parameter (draw with name or not).
 2008-07-16 22:29:34 +00:00
Laurent Rineau c99aa4d8cc Add alpha channel to icons. 2008-07-16 22:04:55 +00:00
Laurent Rineau cf3e194f55 Add action, with shortcuts, to: 
- activate a polyhedron (Ctrl+Space)
  - put polyhedron as selection A (Ctrl+A)
  - put polyhedron as selection B (Ctrl+B)
 2008-07-16 22:04:32 +00:00
Pierre Alliez 125b698c13 fix indent for kernel 2008-07-16 21:42:02 +00:00
Pierre Alliez 08d544bab7 more on polyhedron kernel using LP solver 
remains to implement translate<Polyhedron>
 2008-07-16 21:23:04 +00:00
Pierre Alliez 21bba71a11 started adding some icons - but could not figure out how to specify transparency 2008-07-16 20:30:03 +00:00
Laurent Rineau d72c431eb3 Add a global preference "View edges", which is a QAction in the View menu. 
Update: rename it "Superimpose edges".
 2008-07-16 18:33:47 +00:00
Laurent Rineau a872041a55 Add a global preference "View edges", which is a QAction in the View menu. 2008-07-16 18:32:15 +00:00
Laurent Rineau fb91fc9f90 New icons for the checkmark in treeView. 2008-07-16 18:31:32 +00:00
Laurent Rineau 0c53947443 Add toolbars. We need icons. 2008-07-16 17:47:09 +00:00
Laurent Rineau 9ddb771a75 To reduce inter-dependancies, and thus compilation time, MainWindow no 
longer derives from Ui::MainWindow. Instead, MainWindow now has a member:

         Ui::MainWindow* ui;

That way, a single change in MainWindow.ui will no longer trigger the
recompilation of all .cpp that depend on MainWindow.h
 2008-07-16 17:21:03 +00:00
Laurent Rineau 6ae6c2f660 Add tooltips to the Scene. Viewed in the treeView. 2008-07-16 17:07:22 +00:00
Laurent Rineau 96a79fccf5 Fix drawing of edges. 2008-07-16 16:39:19 +00:00
Laurent Rineau d47ab0f489 Reindent. 2008-07-16 16:21:04 +00:00
Pierre Alliez 930db7897a display lists - faster but not simpler 2008-07-16 15:16:29 +00:00
Laurent Rineau 1a6d8a5dbc Add a toolbar. 2008-07-16 14:54:55 +00:00
Laurent Rineau 2841cf29ee Fix a compilation error: Scene.cpp no longer includes the complete 
definition of the type Polyhedron. You must use Scene::destroy instead of
"delete".
 2008-07-16 14:50:50 +00:00
Laurent Rineau e550425440 New function: 
template <class Poly_A, class Poly_B>
  void copy_to(const Poly_A& poly_a, Poly_B& poly_b)
to avoid the ugly hack using a temp file in
MainWindow_boolean_operations.cpp.

Maybe that function should be in CGAL, actually.
 2008-07-16 14:48:15 +00:00
Pierre Alliez 6d6e98bb08 update TODO list 2008-07-16 14:41:48 +00:00
Pierre Alliez 069b83759b more cleanup on simplify 2008-07-16 14:20:38 +00:00
Pierre Alliez 1a4079f2f8 simplification: added timer and output 2008-07-16 14:02:22 +00:00
Laurent Rineau b98175b4f2 Updated todo: we need to disable several menu items. 2008-07-16 13:51:08 +00:00
Laurent Rineau 7ef44188a8 Attempt to fix a compilation error under Windows. 2008-07-16 13:49:50 +00:00
Laurent Rineau 8f569aa382 Use QInputDialog::getInteger to get the parameter for the simplification 
algorithm.
 2008-07-16 13:48:26 +00:00
Laurent Rineau a30e08123b Fix two warnings under Windows. 2008-07-16 13:16:48 +00:00
Pierre Alliez 592921e134 fix compilation issue 2008-07-16 13:01:55 +00:00
Pierre Alliez 69f346a20d tried fixing compilation issues 2008-07-16 12:30:27 +00:00
Laurent Rineau 7273f1997c Add a struct Scene::Bbox to avoid the inclusion of any CGAL header in 
Scene.h. That should reduce compilation times.
 2008-07-16 11:18:29 +00:00
Laurent Rineau c5654c95e3 - Rename several actions, to remove all "_" in their names. 
- Add several "&" in action texts.

- NEW files:
   - "Polyhedron_type.h" defines the Kernel and Polyhedron types,
   - "Polyhedron_type_fwd.h" can be used for a forward declaration of the
     type "Polyhedron".

- New functions in Scene:
    int selectionAndex();
    int selectionBindex();
  Boolean operations now use those functions to get the indices of the
  polyhedra.

- The Exact_polyhedron is now only defined in
  MainWindow_boolean_operations.cp, to reduce compilation times.

- The min/max problem is handled better, in MainWindow_pca.cpp (quote the
  macros with () instead of using #undef).

- MainWindow_simplify.cpp now works!!

- Scene.h and Scene.cpp has been splitted in several parts, to decrease
  compilation times:
    - Scene_rendering.h declares:
        void gl_render_facets(Polyhedron* poly);
        void gl_render_edges(Polyhedron *poly);
    - Scene_rendering.cpp defines those two functions by using
      <CGAL/gl_render.h>
    - Scene_polyhedron_operations.cpp contains operations that
      create/delete/load/save polyhedra.
  That way, Scene.h and Scene.cpp are CGAL-agnostic.
 2008-07-16 11:08:06 +00:00
Pierre Alliez 792bc2eea8 a bit of cleanup on Scene 2008-07-16 08:41:43 +00:00
Pierre Alliez 66130f35a6 removed menu "Selections" - we'll see this for later 2008-07-16 08:33:00 +00:00
Pierre Alliez d9a9f58477 fix std::cerr output when reading a file 2008-07-16 08:24:28 +00:00
Pierre Alliez 0023b1bce4 normalize models for Boolean operations 2008-07-16 08:20:06 +00:00
Pierre Alliez 62a8260dc9 add timer for Boolean operations 2008-07-16 08:17:03 +00:00
Pierre Alliez 2fc0cfe1dc pca/boolean/self-intersect -> a bit of cleanup 2008-07-16 08:07:44 +00:00
Pierre Alliez 3b5ec29388 cleanup and reduce model sizes 2008-07-16 07:57:03 +00:00
Pierre Alliez 39a19c21cf another attempt to simplify 2008-07-16 07:31:48 +00:00
Pierre Alliez cc9ee7e489 another fix on curvature estimation 2008-07-16 07:25:21 +00:00
Pierre Alliez 1e6b97be68 monge form now complies with vertex normal - thanks Marc! 2008-07-15 13:19:23 +00:00
Pierre Alliez a0a049cbcd solve compilation bug on windows 2008-07-15 13:13:36 +00:00
Laurent Rineau aab17114a3 Fix compilation errors. 2008-07-15 10:25:35 +00:00
Pierre Alliez 79eeb66f5b curvature estimation: fix normal orientation bug 2008-07-15 09:55:38 +00:00
Pierre Alliez 78683b0ee6 now compiles in debug mode but refuses to exec. 2008-07-14 20:51:18 +00:00
Pierre Alliez 9b20194dba more on curvature estimation 
removed enriched polyhedron
removed make_quad (the soup is more generic)
separate compute_normal
 2008-07-14 20:09:22 +00:00
Pierre Alliez 879088c116 more on curvature estimation 
need to fix the normal orientation
 2008-07-14 19:40:27 +00:00
Pierre Alliez 17688b2e03 curvature estimation - remains to represent result as a polyhedron 2008-07-14 16:49:17 +00:00
Pierre Alliez b44dd2ba46 another attempt to get the mesh simplification compile on Windows. 2008-07-14 14:00:10 +00:00
Pierre Alliez 43be43d690 rename self-intersect 
pca fit and self-intersect to red by default
 2008-07-14 13:53:42 +00:00
Pierre Alliez 7626528ed1 tmp renaming to fix capitals 2008-07-14 13:47:16 +00:00
Pierre Alliez e968a67d1c ooops - forgot to add self intersection menu file 2008-07-14 13:27:58 +00:00
Pierre Alliez 0a8289a411 added self-intersection (needs a bit of cleanup) 
PS: the (added) cow model self-interects
 2008-07-14 13:27:09 +00:00
Pierre Alliez 5ed155720b added menu save as... (save selected polyhedron) 
remains to implement save all, and save (all selected polyhedra to their original filename)

normalized 3D models
cleanup boolean operations
 2008-07-14 12:58:50 +00:00
Pierre Alliez 6df756e150 Added Boolean operations 
Laurent: please take a look - you may have a cleaner solution for converting from inexact to exact polyhedron
 2008-07-14 12:25:35 +00:00
Pierre Alliez 6c429f7ddf PCAPCA plane fitting - the best fit line is added as a bar polyhedron 2008-07-14 10:20:38 +00:00
Pierre Alliez 5992d3ae35 PCA plane fitting - the best fit plane is added as a quad polyhedron 2008-07-14 06:59:50 +00:00
Pierre Alliez 36eb748188 added Loop subdivision 2008-07-13 20:27:19 +00:00
Pierre Alliez e1c2d60890 more on polyhedron kernel computation using LP solver 2008-07-12 20:36:33 +00:00
Pierre Alliez 0c94d8efc0 render edges 2008-07-12 19:57:22 +00:00
Laurent Rineau dbcbf05acb Fix two compilation errors. 2008-07-12 17:07:02 +00:00
Pierre Alliez c31d6713bd added rendering file 
another attempt to simplify a polyhedron (the basic one this time) but it does not compile...
 2008-07-12 09:48:23 +00:00
Pierre Alliez af6368c5db drop the enriched polyhedron - rendering by calling a templated function instead. 2008-07-12 09:39:10 +00:00
Laurent Rineau d3d6a5c1eb - Store the MainWindow position/size in a QSetting. 
- Added column A/B to Scene and SceneDelegate.
 2008-07-11 16:23:59 +00:00
Pierre Alliez 387084df22 cleanup interface and viewer 2008-07-11 15:46:51 +00:00
Laurent Rineau da771637ac Un-inline Viewer::setAntiAliasing(bool). That decrease the readability of 
the code.
 2008-07-11 15:08:50 +00:00
Laurent Rineau 021767168f Move convex_hull into MainWindow_convex_hull.cpp 
and simplify into MainWindow_simplify.cpp
 2008-07-11 14:55:20 +00:00
Andreas Fabri e58b0960d6 Added find_package for OPENGL 2008-07-11 14:50:20 +00:00
Laurent Rineau 912bf47dbb - Add two slots in Scene: 
void Scene::polyhedronChanged(int i);
    void Scene::polyhedronChanged(Polyhedron*);
  That way, one no longer call viewer->updateGL() but
  scene->polyhedronChanged, and the code is ready for one document with
  multiple views (one just has to connect SIGNAL(Scene::dataChanged(..)) to
  updateGL() of all viewers.

- Add accessors in Scene:
    Polyhedron* polyhedron(int i);
    QColor polyhedronColor(int);
    QString polyhedronName(int);
    bool isPolyhedronActivated(int);
    RenderingMode polyhedronRenderingMode(int);

- Remove Scene::simplify and Scene::convex_hull: MainWindow does the joob
  itself.
 2008-07-11 14:24:22 +00:00
Laurent Rineau 337d4cbc9c Scene::duplicate now uses Scene::addPolyhedron... 2008-07-11 13:55:46 +00:00
Laurent Rineau a286206697 - Add a "static const QColor defaultColor;" to Scene, 
- Add in Scene:
      void addPolyhedron(Polyhedron* p,
                         QString name,
                         QColor color = defaultColor,
                         bool activated = true,
                         RenderingMode mode = Fill);
- Modify Scene::open to use addPolyhedron.
 2008-07-11 13:53:51 +00:00
Laurent Rineau 1432cbb62f Do not use inlined function in Scene (it does not make sens). 2008-07-11 13:30:58 +00:00
Laurent Rineau f9f27d9e2a Remove another todo entry! 2008-07-11 12:33:27 +00:00
Laurent Rineau c5b91d2f33 Use "::Qt" for the Qt namespace, instead of "Qt" (because CGAL::Qt now 
exists).
 2008-07-11 12:19:46 +00:00
Laurent Rineau d74cb9bac9 Scene::draw() now use the rendering mode. 2008-07-11 12:12:30 +00:00
Laurent Rineau 91b1ba8bed (Add an attribue rendering_mode in Polyhedron_entry.) 
The treeView now displays it.

The Scene::draw() does not use it, yet.
 2008-07-11 12:05:48 +00:00
Laurent Rineau ad787d98c0 Add an attribue rendering_mode in Polyhedron_entry. 2008-07-11 11:19:52 +00:00
Laurent Rineau b91a56535c Setup the treeview's columns widths and streching. 2008-07-11 09:58:00 +00:00
Laurent Rineau 89e61e3809 Delegation for the Color column: one left click pops up the QColorDialog. 2008-07-11 09:57:20 +00:00
Pierre Alliez 9fce504387 cleanup on convex hull 2008-07-10 21:10:51 +00:00
Laurent Rineau 4fb74af216 Minor improvements in the feature "last opened files". 2008-07-10 16:58:57 +00:00
Laurent Rineau 35a9309b87 - Update TODO.txt 
- Last opened polyedron is selected.
- A duplicated polyhedron is selected.
- When a polyhedron is erase, select another one (the previous one if any).
 2008-07-10 16:51:11 +00:00
Laurent Rineau 00e87cf498 - Remove Scene and Camera menu. 
- Move Load/Erase/Duplicate into the File menu.
 2008-07-10 15:49:13 +00:00
Laurent Rineau 7e9278f677 Handle recent files in the File menu. 2008-07-10 15:48:29 +00:00
Pierre Alliez 0e1b8e8ca9 attempt to simplify an enriched polyhedron but fails at compile time (we should ask Fernando some help!) 2008-07-10 15:29:21 +00:00
Laurent Rineau d011d7ffc2 New title for MainWindow: "Polyhedron demo". 2008-07-10 15:05:33 +00:00
Pierre Alliez 1a682c6e71 resources into a separate folder 
added data folder with toy meshes
 2008-07-10 14:11:15 +00:00