Commit Graph

74 Commits

Author SHA1 Message Date
Laurent Rineau cd94d98168 Revert "Revert an incorrect push I did"
This reverts commit 33cb60cc29.
2014-05-07 15:24:25 +02:00
Laurent Rineau 33cb60cc29 Revert an incorrect push I did 2014-05-07 15:18:53 +02:00
Aymeric PELLE 61ddfe3014 FT_to_point_function_wrapper has a new nested type : Point. 2014-04-23 19:50:07 +02:00
Aymeric PELLE a12fe7b728 Some classes are moved from the namespace CGAL::Mesh_3 to the namespace CGAL.
Labeled_mesh_domain_3.
Implicit_to_labeling_function_wrapper.
Implicit_vector_to_labeling_function_wrapper.
Implicit_multi_domain_to_labeling_function_wrapper.
2014-04-16 19:57:21 +02:00
Aymeric PELLE 57a709ef09 Fix for windows : Polyline is renamed Polyline_3 in a example. 2014-04-16 13:45:59 +02:00
Aymeric PELLE 30e71be043 Labeled_mesh_domain_3.h and Implicit_to_labeling_function_wrapper are moved.
These files are moved to Mesh_3/include/CGAL/ because they are documented,
so they can be used by users.
2014-04-07 19:12:30 +02:00
Aymeric PELLE 0e9e80b872 Point type is deduced from the ImplicitFunction in the new wrapper.
In Implicit_multi_domain_to_labeling_function_wrapper, the point
type is deduced if ImplicitFunction is a pointer function, else it must
be a nested type of ImplicitFunction.
BGT isn't required anymore for this wrapper.
The constructor of Implicit_multi_domain_to_labeling_function_wrapper taking
only one argument has a new way for auto-making the vector of vector of
positions. In this case, the union of the components equals to the union
of the functions.
2014-03-31 18:42:47 +02:00
Aymeric PELLE c15ff1c19c New implementation of Implicit_multi_domain_to_labeling_function_wrapper.
The user can indicate more precisely which components he wants.
For each component that the user want, he must provide the matching
vector of signs. All these vector of positions must be put in a vector
passed as second parameter to the constructor of that wrapper.
Doc and examples are updated.
2014-03-26 19:02:27 +01:00
Aymeric PELLE 31767a8411 Rename ..._labeled_function_wrapper to ..._labeling_function_wrapper.
Implicit_vector_to_labeled_function_wrapper is deprecated.
Examples, tests, docs are updated.
2014-03-25 15:25:42 +01:00
Aymeric PELLE 91343af22b Two new examples for illustrating features with Labeled_mesh_domain_3.
An example meshes two intersected cubes.
The other one meshes the two same cubes, but we add some feature edges.
2014-03-20 18:36:48 +01:00
Aymeric PELLE 095f99afb8 Add a new example using Implicit_multi_domain_to_labeled_function_wrapper.
This example shows two domains having points satisfying f(p) < 0.
2014-03-04 18:35:35 +01:00
Laurent Rineau bc7e2a1d71 Merge remote-tracking branch 'origin/Mesh_3-improvements-GF' into Mesh_3-improvements-GF-new
Mesh_3-improvements-GF-new is fresh fork of master

Conflicts:
	.gitattributes
	AABB_tree/include/CGAL/AABB_tree.h
	GraphicsView/src/CGAL_Qt4/DemosMainWindow.cpp
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
	Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-02-28 17:10:16 +01:00
Laurent Rineau 354ddc85fc Fix the case of <CGAL/Mesh_3/implicit_to_labeled_function_wrapper.h>
That header file contains a class named
CGAL::Mesh_3::Implicit_to_labeled_function_wrapper and the naming
guidelines are well followed but the case of the file.

That header file is internal to Mesh_3 and not documented.
2013-02-07 15:29:46 +01:00
Sébastien Loriot 7d20531b1d Convert remaining CRLF files to LF 2012-12-04 17:09:28 +01:00
Eric Berberich e4136efc7b better verbosity 2012-10-10 12:50:40 +00:00
Eric Berberich 64c998cfa7 do not compile some example if ImageIO is not configured 2012-10-10 12:49:18 +00:00
Mariette Yvinec faa00e3d9e remove copyright headres from Mesh_3 examples 2012-09-11 15:15:02 +00:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | 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.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
2012-08-22 12:35:03 +00:00
Laurent Rineau 0b427c99eb Fix license headers 2012-02-06 11:39:56 +00:00
Andreas Fabri 75f50a1513 Fix for Windows 'min/max' bug 2012-01-18 11:32:21 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Sébastien Loriot 80e0ff0c81 use cell_radius_edge_ratio in examples instead of cell_radius_edge which is
no longer documented
2011-12-14 09:42:11 +00:00
Laurent Rineau 08a567a025 Remove this auto-generated cgal_test_with_cmake 2011-09-29 11:43:44 +00:00
Laurent Rineau 53a25ed753 Remove lines of code that should have never been added to this example
BUGFIX
2011-09-29 11:42:37 +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 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +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 6d500f3605 Make the code conform to the documentation: add C3t3::edges_in_complex_end(Curve_segment_index) 2011-04-19 12:15:22 +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 77a2bead80 Add missing svn properties (keywords and eol-style). 2010-09-20 12:12:46 +00:00
Andreas Fabri 85462651e4 Replace derivation of a kernel by a typedef, as otherwise we do not profit from static filters in the EPIC kernels 2010-05-14 08:58:30 +00:00
Stéphane Tayeb 1f3332bf63 Move Mesh_3 from candidate-packages to trunk (2/2) 2010-01-06 13:46:02 +00:00
Stéphane Tayeb 313a28d9a2 Move Mesh_3 from candidate-packages to trunk (1/2) 2010-01-06 13:44:50 +00:00
Stéphane Tayeb 7057ddc2d1 Merge [r51556-r51996]
From branches/CGAL-3.5-branch/Mesh_3 To trunk/Mesh_3.

r51758 | lrineau
* Fix all \ccPkgHowToCiteCgal at once to turn 08 into 09

r51937 | stayeb
* Fix polyhedral oracle issue: switch to exact intersection computation.

r51957 | stayeb
* cleanup example folder.

r51960 | stayeb
* Remove wrong using namespace statement.
2009-09-21 14:36:31 +00:00
Laurent Rineau 07c73ca08d Remove no-longer-used GNUmakefile (and deps) 2009-08-20 13:58:10 +00:00
Laurent Rineau b6f567e260 add a new cmake variable in CGALConfig.cmake, so that one can detect if CGAL_ImageIO is build with ZLIB support. Use that variable in examples/Mesh_3/. 2009-07-23 15:02:02 +00:00
Stéphane Tayeb e8a51bff38 Remove unused data. 2009-07-10 11:32:18 +00:00
Stéphane Tayeb 2b996f5f46 * Change example parameters to achieve smaller execution time (seems to be a problem on a few platforms in test suite)
* Zip liver image (mesh_3D_image now needs ZLIB)
2009-07-08 12:18:56 +00:00
Stéphane Tayeb 58ba96a8ca Minor fix: revert r50348 changes. 2009-07-07 10:54:12 +00:00
Stéphane Tayeb e32ea59a7d * Remove old commentaries
* Renaming
* Minor fix in mesh_polyhedral_domain example
2009-07-03 15:11:04 +00:00
Stéphane Tayeb fe60ae5f4e Move Mesh_3 from branches/experimental-packages to trunk. 2009-06-26 15:29:26 +00:00
Laurent Rineau 3c6e2102f0 Move Mesh_3 into "experimental-packages" until accepted in CGAL.
(Request from Sylvain Pion.)
2007-03-19 07:32:03 +00:00
Joachim Reichel d08f6bea45 replace obsolete variable CGAL_QT_LDFLAGS by CGAL_LDFLAGS 2007-03-11 09:54:17 +00:00
Sylvain Pion 6fb5cb906b Remove trailing white spaces and end of lines.
(using : perl -pi.bak -e 's/\s+$/\n/' */examples/*/*.cpp )
2007-03-10 14:59:41 +00:00
Laurent Rineau ab6c13badb *** empty log message *** 2006-09-13 13:24:31 +00:00
Laurent Rineau f3917f0301 fix symlinks 2006-07-10 10:22:28 +00:00
Laurent Rineau f5c912e666 - major switch from .C to .cpp. Andreas's script left a lot of things that
had to be fixed manually.
- new debug macro in <CGAL/Surface_mesher/Standard_criteria.h>
  - CGAL_MESH_3_DEBUG_CRITERIA
  Used in test/Mesh_3/combined_spheres*.cpp
2006-07-10 10:12:38 +00:00
Andreas Fabri 0365c9fd16 changed .C to .cpp in examples 2006-07-09 21:13:19 +00:00
Laurent Rineau bf07fad719 new way of dealing with dependencies, in my packages 2006-07-05 16:28:34 +00:00