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

Use new style with make_array(), more compact and efficient

This commit is contained in:
Sylvain Pion 2008-04-09 14:25:17 +00:00
parent c10c7ebead
commit ccff0db36d
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cartesian_kernel/include/CGAL/Cartesian/Point_2.h
View File

@ -60,12 +60,8 @@ public:
: base(CGALi::make_array(x, y)) {} : base(CGALi::make_array(x, y)) {}
PointC2(const FT &hx, const FT &hy, const FT &hw) PointC2(const FT &hx, const FT &hy, const FT &hw)
{ : base( hw != FT(1) ? CGALi::make_array(hx/hw, hy/hw)
if (hw != FT(1)) : CGALi::make_array(hx, hy) ) {}
base = CGALi::make_array(hx/hw, hy/hw);
else
base = CGALi::make_array(hx, hy);
}
const FT& x() const const FT& x() const
{ {

8
Cartesian_kernel/include/CGAL/Cartesian/Point_3.h
View File

@ -57,12 +57,8 @@ public:
: base(CGALi::make_array(x, y, z)) {} : base(CGALi::make_array(x, y, z)) {}
PointC3(const FT &x, const FT &y, const FT &z, const FT &w) PointC3(const FT &x, const FT &y, const FT &z, const FT &w)
{ : base( w != FT(1) ? CGALi::make_array(x/w, y/w, z/w)
if (w != FT(1)) : CGALi::make_array(x, y, z) ) {}
base = CGALi::make_array(x/w, y/w, z/w);
else
base = CGALi::make_array(x, y, z);
}
/* /*
bool operator==(const PointC3 &p) const bool operator==(const PointC3 &p) const

8
Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h
View File

@ -56,12 +56,8 @@ public:
: base(CGALi::make_array(x, y)) {} : base(CGALi::make_array(x, y)) {}
VectorC2(const FT &hx, const FT &hy, const FT &hw) VectorC2(const FT &hx, const FT &hy, const FT &hw)
{ : base( hw != FT(1) ? CGALi::make_array(hx/hw, hy/hw)
if (hw != FT(1)) : CGALi::make_array(hx, hy) ) {}
base = CGALi::make_array(hx/hw, hy/hw);
else
base = CGALi::make_array(hx, hy);
}
const FT & x() const const FT & x() const
{ {

8
Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h
View File

@ -70,12 +70,8 @@ public:
: base(CGALi::make_array(x, y, z)) {} : base(CGALi::make_array(x, y, z)) {}
VectorC3(const FT &x, const FT &y, const FT &z, const FT &w) VectorC3(const FT &x, const FT &y, const FT &z, const FT &w)
{ : base( w != FT(1) ? CGALi::make_array(x/w, y/w, z/w)
if (w != FT(1)) : CGALi::make_array(x, y, z) ) {}
base = CGALi::make_array(x/w, y/w, z/w);
else
base = CGALi::make_array(x, y, z);
}
const FT & x() const const FT & x() const
{ {