 Timestamp:
 02/02/09 21:35:19 (5 years ago)
 Files:

 1 modified
Legend:
 Unmodified
 Added
 Removed

OpenSceneGraph/trunk/src/osgUtil/DelaunayTriangulator.cpp
r6446 r9630 118 118 }; 119 119 120 Edge() {}120 Edge(): ib_(0), ie_(0), ibs_(0), ies_(0), duplicate_(false) {} 121 121 Edge(Vertex_index ib, Vertex_index ie) : ib_(ib), ie_(ie), ibs_(osg::minimum(ib, ie)), ies_(osg::maximum(ib, ie)), duplicate_(false) {} 122 122 … … 151 151 { 152 152 public: 153 154 Triangle(): 155 a_(0), 156 b_(0), 157 c_(0) {} 158 159 153 160 Triangle(Vertex_index a, Vertex_index b, Vertex_index c, osg::Vec3Array *points) 154 161 : a_(a), … … 160 167 edge_[1] = Edge(b_, c_); 161 168 edge_[2] = Edge(c_, a_); 169 } 170 171 Triangle& operator = (const Triangle& rhs) 172 { 173 if (&rhs==this) return *this; 174 175 a_ = rhs.a_; 176 b_ = rhs.b_; 177 c_ = rhs.c_; 178 cc_ = rhs.cc_; 179 edge_[0] = rhs.edge_[0]; 180 edge_[1] = rhs.edge_[1]; 181 edge_[2] = rhs.edge_[2]; 182 183 return *this; 162 184 } 163 185 … … 321 343 322 344 private: 345 323 346 324 347 bool intersect(const osg::Vec2 p1,const osg::Vec2 p2,const osg::Vec2 p3,const osg::Vec2 p4) const