Merge pull request #448 from assimp/revert-447-master
Revert "Fix warnings under Visual Studio 12"pull/449/head
commit
a482bc59f4
|
@ -96,11 +96,11 @@ void SweepContext::InitTriangulation()
|
|||
|
||||
void SweepContext::InitEdges(std::vector<Point*> polyline)
|
||||
{
|
||||
std::size_t num_points = polyline.size();
|
||||
for (std::size_t i = 0; i < num_points - 1; i++) {
|
||||
edge_list.push_back(new Edge(*polyline[i], *polyline[i + 1]));
|
||||
int num_points = polyline.size();
|
||||
for (int i = 0; i < num_points; i++) {
|
||||
int j = i < num_points - 1 ? i + 1 : 0;
|
||||
edge_list.push_back(new Edge(*polyline[i], *polyline[j]));
|
||||
}
|
||||
edge_list.push_back(new Edge(*polyline.back(), *polyline.front()));
|
||||
}
|
||||
|
||||
Point* SweepContext::GetPoint(const int& index)
|
||||
|
|
|
@ -64,7 +64,7 @@ void set_tail(Point* p1);
|
|||
|
||||
Point* tail();
|
||||
|
||||
std::size_t point_count();
|
||||
int point_count();
|
||||
|
||||
Node& LocateNode(Point& point);
|
||||
|
||||
|
@ -156,7 +156,7 @@ inline AdvancingFront* SweepContext::front()
|
|||
return front_;
|
||||
}
|
||||
|
||||
inline std::size_t SweepContext::point_count()
|
||||
inline int SweepContext::point_count()
|
||||
{
|
||||
return points_.size();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue