Changeset 26:510ca7a3fb61 in rrlib_geometry


Ignore:
Timestamp:
22.01.2012 23:21:41 (8 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Phase:
public
Message:

Added missing adaptions to latest renaming and interface changes

Location:
curves
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • curves/tSplineCurve.hpp

    r24 r26  
    111111const typename tShape<Tdimension, TElement>::tPoint tSplineCurve<Tdimension, TElement, Tdegree>::operator()(tParameter t) const 
    112112{ 
    113   assert((0 <= t) && (t <= this->GetNumberOfSegments())); 
     113  assert((0 <= t) && (t <= this->NumberOfSegments())); 
    114114  const tBezierCurve bezier_curve(this->GetBezierCurveForParameter(t, t)); 
    115115  return bezier_curve(t); 
     
    122122const typename tSplineCurve<Tdimension, TElement, Tdegree>::tBezierCurve tSplineCurve<Tdimension, TElement, Tdegree>::GetBezierCurveForParameter(tParameter t) const 
    123123{ 
    124   assert((0 <= t) && (t <= this->GetNumberOfSegments())); 
    125   return this->GetBezierCurveForSegment(static_cast<size_t>(t < this->GetNumberOfSegments() ? t : t - 1.0)); 
     124  assert((0 <= t) && (t <= this->NumberOfSegments())); 
     125  return this->GetBezierCurveForSegment(static_cast<size_t>(t < this->NumberOfSegments() ? t : t - 1.0)); 
    126126} 
    127127 
     
    129129const typename tSplineCurve<Tdimension, TElement, Tdegree>::tBezierCurve tSplineCurve<Tdimension, TElement, Tdegree>::GetBezierCurveForParameter(tParameter t, tParameter &local_t) const 
    130130{ 
    131   local_t = t < this->GetNumberOfSegments() ? t - std::trunc(t) : 1.0; 
     131  local_t = t < this->NumberOfSegments() ? t - std::trunc(t) : 1.0; 
    132132  return this->GetBezierCurveForParameter(t); 
    133133} 
     
    141141    const tSplineCurve<Tdimension, TElement, Tother_degree> &other_spline) const 
    142142{ 
    143   for (unsigned int i = 0; i < this->GetNumberOfSegments(); ++i) 
     143  for (unsigned int i = 0; i < this->NumberOfSegments(); ++i) 
    144144  { 
    145145    size_t last_size = intersection_parameters.size(); 
    146146    const tBezierCurve bezier_curve(this->GetBezierCurveForSegment(i)); 
    147     for (unsigned int k = 0; k < other_spline.GetNumberOfSegments(); ++k) 
     147    for (unsigned int k = 0; k < other_spline.NumberOfSegments(); ++k) 
    148148    { 
    149149      bezier_curve.GetIntersections(intersection_points, intersection_parameters, other_spline.GetBezierCurveForSegment(k)); 
     
    161161    const geometry::tBezierCurve<Tdimension, TElement, Tother_degree> &bezier_curve) const 
    162162{ 
    163   for (unsigned int i = 0; i < this->GetNumberOfSegments(); ++i) 
     163  for (unsigned int i = 0; i < this->NumberOfSegments(); ++i) 
    164164  { 
    165165    size_t last_size = intersection_parameters.size(); 
  • curves/tUniformBSplineCurve.h

    r14 r26  
    8383  tUniformBSplineCurve(TIterator begin, TIterator end, double tension = 0.0); 
    8484 
    85   template <typename TSTLContainer> 
    86   explicit tUniformBSplineCurve(const TSTLContainer &control_points, double tension = 0.0); 
    87  
    8885  inline double GetTension() const 
    8986  { 
Note: See TracChangeset for help on using the changeset viewer.