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

Version 3.3 (September 3 1999) 

- Added Point_d to Cartesian
This commit is contained in:
Hervé Brönnimann 1999-09-03 17:15:41 +00:00
parent 86ff278cc9
commit 1620c1eefb
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Old_Packages/Cartesian_basic/changes.txt
View File

@ -1,3 +1,6 @@
Version 3.3 (September 3 1999)
- Added Point_d to Cartesian
Version 3.2.4 (September 2 1999)
- Removed references to <CGAL/Kernel/function_objects_?.h>
and copy pasted directly into Cartesian_? classes,

15
Old_Packages/Cartesian_basic/include/CGAL/Cartesian.h
View File

@ -40,7 +40,7 @@
#include <CGAL/Cartesian_3.h>
#endif // CGAL_CARTESIAN_3_H
#ifndef CGAL_CARTESIAN_DYNAMIC_D_H
// #include <CGAL/Cartesian_dynamic_d.h>
#include <CGAL/Cartesian_dynamic_d.h>
#endif // CGAL_CARTESIAN_DYNAMIC_D_H
#define CGAL_REP_CLASS_DEFINED
@ -52,7 +52,7 @@ template< class R, class _FT >
struct Cartesian_base :
public Cartesian_base_2<R,_FT>
, public Cartesian_base_3<R,_FT>
// , public Cartesian_base_dynamic_d<R,_FT>
, public Cartesian_base_dynamic_d<R,_FT>
{
// Number types and representation tag (to avoid ambiguity in
// inheritance tree)
@ -66,8 +66,7 @@ struct Cartesian_base :
typedef Cartesian_base_2<R,_FT> Kernel_base_2;
typedef Cartesian_base_3<R,_FT> Kernel_base_3;
// typedef Cartesian_base_dynamic_d<R,_FT> Kernel_base_d;
typedef Cartesian_base_dynamic_d<R,_FT> Kernel_base_d;
typedef typename Kernel_base_2::Point_2 Point_2;
typedef typename Kernel_base_2::Vector_2 Vector_2;
@ -94,14 +93,14 @@ struct Cartesian_base :
typedef typename Kernel_base_3::Tetrahedron_3 Tetrahedron_3;
typedef typename Kernel_base_3::Aff_transformation_3 Aff_transformation_3;
// typedef typename Kernel_base_d::Point_d Point_d;
typedef typename Kernel_base_d::Point_d Point_d;
};
CGAL_END_NAMESPACE
// #include <CGAL/Kernel/Construction_objects_2.h>
// #include <CGAL/Kernel/Predicate_objects_2.h>
#include <CGAL/Kernel/function_objects.h>
// #include <CGAL/Kernel/function_objects.h>
CGAL_BEGIN_NAMESPACE
@ -146,7 +145,7 @@ struct Cartesian : public Cartesian_base< Cartesian<_FT>, _FT >
typedef typename Kernel_base::Tetrahedron_3 Tetrahedron_3;
typedef typename Kernel_base::Aff_transformation_3 Aff_transformation_3;
// typedef typename Kernel_base::Point_d Point_d;
typedef typename Kernel_base::Point_d Point_d;
#else
// Now CGAL::Point_2<R> is only a wrapper around CGAL::PointC2<R>
@ -207,7 +206,7 @@ struct Cartesian : public Cartesian_base< Cartesian<_FT>, _FT >
typedef CGAL::Tetrahedron_3<Self> Tetrahedron_3;
typedef CGAL::Aff_transformation_3<Self> Aff_transformation_3;
// typedef CGAL::Point_d<Self> Point_d;
typedef CGAL::Point_d<Self> Point_d;
#endif // CGAL_CFG_NO_ADVANCED_KERNEL

6
Old_Packages/Cartesian_basic/include/CGAL/Cartesian_dynamic_d.h
View File

@ -57,14 +57,20 @@ struct Cartesian_base_dynamic_d
#ifndef CGAL_CFG_NO_ADVANCED_KERNEL
// Because of partial specialization, CGAL::Point_d<R> is selected as
// CGAL::Point_d<Cartesian_d<FT>,Cartesian_tag>
// CAUTION: This is not yet done, so we revert to the old class PointCd
typedef PointCd<R> Point_d;
#else
typedef PointCd<R> Point_d;
#endif // CGAL_CFG_NO_ADVANCED_KERNEL
};
CGAL_END_NAMESPACE
// TODO: we revert to the old class PointCd
#include <CGAL/PointCd.h>
CGAL_BEGIN_NAMESPACE
// This class is a restricted dD geometric kernel
// It is useful only if you do not need the 3D kernel
// If you need both, you should be using Cartesian<FT>

2
Old_Packages/Cartesian_basic/version
View File

@ -1 +1 @@
3.2.4 ( 2 Sep 1999 )
3.3 ( 3 Sep 1999 )