Commit Graph

371 Commits

Author SHA1 Message Date
Sébastien Loriot cee248ca54 merge from next 2012-01-13 18:48:35 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Sébastien Loriot 3e4ea6c3b1 merge from next 2012-01-13 13:19:58 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Sébastien Loriot 9b75cd5506 require Eigen 3.1 or greater 2011-12-22 16:06:37 +00:00
Sébastien Loriot bdcf26bb20 merge next 2011-12-01 09:19:02 +00:00
Laurent Rineau c7ca93c07e Include <CGAL/glu.h> before any use of GLU 2011-11-09 14:24:17 +00:00
Laurent Rineau 88ef561715 Fix the call to Q_INIT_RESOURCE
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
2011-10-11 09:51:29 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Sébastien Loriot 26e10e4722 merge from next 2011-09-23 11:52:20 +00:00
Sébastien Loriot dff6dda8b3 Remove from copyright holder
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
Sébastien Loriot 62ed832e2b *Add a model for SVDTraits using Eigen and use it by default. Update the doc.
*Add non-sparse matrix class (thus renamimg of the existing one)
*specialisation of the matrix class in Eigen_solver_traits according
 whether this is a symmetric or asymmetric matrix
*update use-files of lapack and Taucs to get definitions
2011-09-21 12:36:13 +00:00
Laurent Rineau 35d5400079 Remove extra ';' 2011-08-01 12:35:14 +00:00
Sébastien Loriot ec00745941 Scene_polygon_soup -> Scene_polygon_soup_item 2011-07-01 13:22:23 +00:00
Laurent Rineau 637dfffc54 scene_edit_polyhedron_item depends on scene_polyhedron_item
(The Windows linker is picky whereas Linux linker is not.)
2011-06-27 13:49:46 +00:00
Laurent Rineau 0626846321 Fix the order, so that target are made in an order compatible with the
dependency graph
2011-06-16 10:38:41 +00:00
Laurent Rineau b81ae9f7e9 Update the cgal_test of the polyhedron demo.
Currently the testsuite shows a red cell in the tests results but the
polyhedron demo is OK. The test is wrong.
2011-06-16 10:33:29 +00:00
Philipp Möller 175a2ea6e9 Merged next into this branch 2011-06-14 15:22:46 +00:00
Sébastien Loriot 9a2b3759ff merge from trunk 2011-06-14 12:43:48 +00:00
Laurent Rineau 28bc7ca5c0 Add some decl spec (import|export) to CGAL_Qt4
That allows to build libCGAL_Qt4 and the Polyhedron demo with
-fvisibility-ms-compat on Linux.

That may allow to build CGAL_Qt4 as a DLL on Windows, one day.
2011-06-10 17:14:27 +00:00
Philipp Möller 34d6ac52ec Replaced [U]Integer* with boost::[u]int*_t in Polyhedron, Polyhedron_IO and Stream_support 2011-06-10 14:51:30 +00:00
Laurent Rineau 1aef74348d Scene_edit_polyhedron_item are now editable. 2011-06-08 17:15:29 +00:00
Laurent Rineau 2b61af17ec Compute the nearest vertex only if there is a slot connected to the signal 2011-06-08 12:24:49 +00:00
Laurent Rineau 77be9fd21c One step in the direction of editable polyhedra in the polyhedron demo
For the moment, the Scene_edit_polyhedron_item is not yet editable. To be
continued...
2011-06-07 18:03:11 +00:00
Laurent Rineau 93a4063a3b Update the cgal_test: polygon_soup has been renamed scene_polygon_soup 2011-06-06 15:01:31 +00:00
Laurent Rineau 538ad27a5a Fix a warning 2011-06-03 17:03:15 +00:00
Laurent Rineau 28bc66c69d Remove this cast, now that scene->numberOfEntries() is an int. 2011-06-03 16:54:25 +00:00
Laurent Rineau 409c28464f numberOfEntries() must return an int, because it is a Qt property. 2011-06-03 16:51:48 +00:00
Laurent Rineau 3e100e387d Fix linking errors on Windows. 2011-06-03 16:44:36 +00:00
Laurent Rineau abd3051dbf Forgot this file! 2011-06-03 16:02:09 +00:00
Laurent Rineau c5c6b5f9a8 Add the Scene_polygon_soup, and the orient_soup plugin. 2011-06-03 15:50:19 +00:00
Laurent Rineau c0df6c5134 Sync with the branch: missing (?) #include 2011-06-03 15:49:53 +00:00
Laurent Rineau 3adc79986d Update the triangulate_facets plugin, that was buggy in the trunk/next branch 2011-06-03 15:48:56 +00:00
Laurent Rineau 2111f2b395 Fix OFF I/O for polyhedra and Nef polyhedra 2011-06-03 15:48:04 +00:00
Laurent Rineau 2f039d1b57 Remove warnings. 2011-06-03 15:42:04 +00:00
Laurent Rineau cef624afb7 Begin to update Polyhedron demo from work done in the Mesh_3 dev'branch
Step 3 (bis): I forgot those small but important patches. The compilation
was OK. The run on Linux too, but there could have been runtime linking
errors on Windows, and subtle runtime issues (such as a missing draw
refresh).
2011-06-03 15:36:38 +00:00
Laurent Rineau fd4d050b39 Begin to update Polyhedron demo from work done in the Mesh_3 dev'branch
Step 4:

  - Update the MainWindow class, to use all the new possibilities of the
    framework:
      - multi-selection of items in the scene,
      - activate the use of the items popup-menus.

  - Add Qt Script possibilities.

  - New actions in the "View" menu: "Look at", copy-paste of camera
    positions, select background color.

  - New action "Reload item", to reload an item if it was loaded from a
    file.
2011-06-03 15:18:56 +00:00
Laurent Rineau 9670c42403 Begin to update Polyhedron demo from work done in the Mesh_3 dev'branch
Step 3:

  - Update the API of the Scene and Viewer class (some methods are not yet used).

  - Update the CMakeLists.txt, to compile all major classes of the
    framework (Scene, Viewer, Scene_item) into a demo_framework library.
2011-06-03 14:40:06 +00:00
Laurent Rineau d6f8ae61d1 Begin to update Polyhedron demo from work done in the Mesh_3 dev'branch
Step 2:

  - Update the Scene_item class (a class from the framework):
      - add the popup menu (not used at the moment),
      - add the selection (not used).

  - Update the Scene_polyhedron_item class.
      - menu,
      - picking.
2011-06-03 13:46:14 +00:00
Laurent Rineau e5d8b79a9f Begin to update Polyhedron demo from work done in the Mesh_3 dev'branch
Step 1:

  - Polyhedron_type.h no longer defines Kernel and geometric
    types. Kernel_type.h defines the EPIC kernel.

  - Each plugin typedefs the geometric types it needs.

  - Polyhedron defined in Polyhedron_type.h uses special "demo items":
      - edges can be marked as "feature edge",
      - facets have a "patch id" (an integer),
      - and vertices have a set of patch ids.
2011-06-03 13:06:15 +00:00
Laurent Rineau 8460d82726 Fix my patch of yesterday, which was obviously wrong!
Yesterday, I did a partial import of a patch from
/branches/experimental-packages/Mesh_3-protecting_balls-branch/Polyhedron/demo/Polyhedron/CMakeLists.txt
but my patch was wrong!

I should have tested!
2011-05-25 13:32:55 +00:00
Laurent Rineau cdb9ca77ff Backport a fix for Windows from the Mesh_3-with-protecting ball branch 2011-05-24 14:24:44 +00:00
Laurent Rineau 3c02e07b23 Try to fix my last revision about cmake_policy, with CMake-2.6.x
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part)
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Laurent Rineau 95cde53b17 Merge "Mesh_3 with features" in trunk, so that it is in CGAL-3.8, at last!
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Mesh_3_with_features
2011-01-10 15:43:22 +00:00
Laurent Rineau 55540024a0 Remove that old not submitted directory. No need to keep old stuff in our
SVN working copies.
2010-12-02 10:51:50 +00:00
Andreas Fabri 04482d4a54 clang is right: std::size_t is always >= 0 2010-11-12 13:04:17 +00:00
Laurent Rineau 360ae76da7 Fix the compute_normal: sum normals and *then* divide the normal by its
length.
2010-10-04 08:36:27 +00:00
Andreas Fabri 6b1e578377 Take care of collinear points when computing a facet normal 2010-09-27 10:53:45 +00:00