Compare commits

...

2 Commits

2 changed files with 7 additions and 6 deletions

View File

@ -56,6 +56,7 @@ static float pDistance(float x, float y, float x1, float y1, float x2, float y2)
//return sqrt(dx * dx + dy * dy); //return sqrt(dx * dx + dy * dy);
} }
/* not used anymore... or yet
static bool SortForMinXMaxY (const Point& a, const Point& b) static bool SortForMinXMaxY (const Point& a, const Point& b)
{ {
if (a.x() != b.x()) if (a.x() != b.x())
@ -87,5 +88,5 @@ static std::pair<Point, Point> getMinMaxX(std::vector<Point>& pts)
std::sort(pts.begin(), pts.end(), SortForMinXMaxY); std::sort(pts.begin(), pts.end(), SortForMinXMaxY);
return std::make_pair(pts[0], pts[pts.size() - 1]); return std::make_pair(pts[0], pts[pts.size() - 1]);
} }*/
#endif // UTILITY_H #endif // UTILITY_H

View File

@ -6,9 +6,7 @@
#include <vector> // TODO: or use arrays for maximum performance? #include <vector> // TODO: or use arrays for maximum performance?
#include "Display.h" #include "Display.h"
#include "Point.h" // TODO: check if there is a usable SFML or c++ class #include "Point.h"
#include "Timing.h"
#include "Utility.h"
// TODOs: // TODOs:
// - use SFML vec2 instead of Point class // - use SFML vec2 instead of Point class
@ -80,6 +78,8 @@ int main (int argc, char **argv)
std::string line; std::string line;
std::getline(in, line); // get first line for explizit valueCount std::getline(in, line); // get first line for explizit valueCount
valCount = std::stoi(line); valCount = std::stoi(line);
float x = 0;
float y = 0;
for (int i = 0; i < valCount; ++i) for (int i = 0; i < valCount; ++i)
{ {
getline(in, line); getline(in, line);
@ -87,8 +87,8 @@ int main (int argc, char **argv)
size_t pos = line.find(','); size_t pos = line.find(',');
if (pos != std::string::npos) if (pos != std::string::npos)
{ {
float x = std::stof(line.substr(0, pos)); x = std::stof(line.substr(0, pos));
float y = std::stof(line.substr(pos + 1)); y = std::stof(line.substr(pos + 1));
points.push_back(Point(x, y)); points.push_back(Point(x, y));
} }
else else