Changes in src/Line.cpp [69baa4:f932b7]

File:

• src/Line.cpp (modified) (4 diffs)

src/Line.cpp

@@ -37 +37 @@
 Line::~Line()
 {}
-
-Line &Line::operator=(const Line& rhs){
-  if(this!=&rhs){
-    origin.reset(new Vector(*rhs.origin));
-    direction.reset(new Vector(*rhs.direction));
-  }
-  return *this;
-}
 
 
@@ -219 +211 @@
 }
 
-Line Line::rotateLine(const Line &rhs, double alpha) const{
-  Vector lineOrigin = rotateVector(rhs.getOrigin(),alpha);
-  Vector helper = rhs.getDirection();
-  // rotate the direction without considering the ofset
-  pair<Vector,Vector> parts = helper.partition(*direction);
-  Vector lineDirection = parts.first;
-  Vector a = parts.second;
-  if(!a.IsZero()){
-    // construct a vector that is orthogonal to a and direction and has length |a|
-    Vector y = a;
-    // direction is normalized, so the result has length |a|
-    y.VectorProduct(*direction);
-
-    lineDirection += cos(alpha) * a + sin(alpha) * y;
-  }
-  return Line(lineOrigin,lineDirection);
-}
-
-Plane Line::rotatePlane(const Plane &rhs, double alpha) const{
-  vector<Vector> points = rhs.getPointsOnPlane();
-  transform(points.begin(),
-            points.end(),
-            points.begin(),
-            boost::bind(&Line::rotateVector,this,_1,alpha));
-  return Plane(points[0],points[1],points[2]);
-}
-
 Plane Line::getOrthogonalPlane(const Vector &origin) const{
   return Plane(getDirection(),origin);
@@ -269 +234 @@
 }
 
-LinePoint Line::getLinePoint(const Vector &point) const{
-  ASSERT(isContained(point),"Line point queried for point not on line");
-  Vector helper = point - (*origin);
-  double param = helper.ScalarProduct(*direction);
-  return LinePoint(*this,param);
-}
-
-LinePoint Line::posEndpoint() const{
-  return LinePoint(*this, numeric_limits<double>::infinity());
-}
-LinePoint Line::negEndpoint() const{
-  return LinePoint(*this,-numeric_limits<double>::infinity());
-}
-
-bool operator==(const Line &x,const Line &y){
-  return *x.origin == *y.origin && *x.direction == *y.direction;
-}
-
 Line makeLineThrough(const Vector &x1, const Vector &x2){
   if(x1==x2){
@@ -293 +240 @@
   return Line(x1,x1-x2);
 }
-
-
-/******************************** Points on the line ********************/
-
-LinePoint::LinePoint(const LinePoint &src) :
-  line(src.line),param(src.param)
-{}
-
-LinePoint::LinePoint(const Line &_line, double _param) :
-  line(_line),param(_param)
-{}
-
-LinePoint& LinePoint::operator=(const LinePoint &src){
-  line=src.line;
-  param=src.param;
-  return *this;
-}
-
-Vector LinePoint::getPoint() const{
-  ASSERT(!isInfinite(),"getPoint() on infinite LinePoint called");
-  return (*line.origin)+param*(*line.direction);
-}
-
-Line LinePoint::getLine() const{
-  return line;
-}
-
-bool LinePoint::isInfinite() const{
-  return isPosInfinity() || isNegInfinity();
-}
-bool LinePoint::isPosInfinity() const{
-  return param == numeric_limits<double>::infinity();
-}
-bool LinePoint::isNegInfinity() const{
-  return param ==-numeric_limits<double>::infinity();
-}
-
-bool operator==(const LinePoint &x, const LinePoint &y){
-  ASSERT(x.line==y.line,"Operation on two points of different lines");
-  return x.param == y.param;
-
-}
-bool operator<(const LinePoint &x, const LinePoint &y){
-  ASSERT(x.line==y.line,"Operation on two points of different lines");
-  return x.param<y.param;
-}