mgs/quickhull
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: mgs:52213825dec606c05000300676c94753af4ed736
Branches Tags
mgs:main
mgs:v1.0.0
..
compare: mgs:69b05cc335f101577b762fcaedefcc0549cd9f89
Branches Tags
mgs:main
mgs:v1.0.0

No commits in common. "52213825dec606c05000300676c94753af4ed736" and "69b05cc335f101577b762fcaedefcc0549cd9f89" have entirely different histories.
52213825de ... 69b05cc335

3 changed files with 30 additions and 125 deletions
Show Stats Expand all files Collapse all files

140
Display.cpp
View File

@ -4,13 +4,12 @@
#include <thread>
#include "Display.h"
//#include "Line.h"
#include "Point.h"
#include "Utility.h"
Display::Display (const std::vector<Point> &pts)
{
if (!m_font.loadFromFile("Resources/LiberationSans-Regular.ttf"))
if (!m_font.loadFromFile("LiberationSans-Regular.ttf"))
{
std::cerr << "font LiberationSans-Regular.ttf could not be loaded!" << std::endl;
}
@ -147,13 +146,12 @@ void Display::update ()
/* TODO: use a convex shape? Or build from vertices in render?
sf::ConvexShape convex;
convex.setPointCount(4);
convex.setPointCount(5);
convex.setPoint(0, topLeft);
convex.setPoint(1, topRight);
convex.setPoint(2, botRight);
convex.setPoint(3, botLeft);*/
convex.setPoint(0, topRight);
convex.setPoint(0, botRight);
convex.setPoint(0, botLeft);*/
//m_ hull as VertexArray
//m_hull.setPrimitiveType(sf::Lines);
m_hull.setPrimitiveType(sf::LineStrip);
m_hull.append(sf::Vertex(topLeft, sf::Color::Blue));
@ -171,70 +169,32 @@ void Display::update ()
{
sf::Vector2f pos = pt.getPosition();
float x = pos.x;
//float y = pos.y;
float y = pos.y;
if (x < left.x) left = pos;
if (x > right.x) right = pos;
}
//m_ hull as VertexArray
//m_hull.setPrimitiveType(sf::Lines);
m_hull.setPrimitiveType(sf::LineStrip);
m_hull.append(sf::Vertex(left, sf::Color::Blue));
m_hull.append(sf::Vertex(right, sf::Color::Blue));
m_lines.push_back(Line(Point(left.x, left.y), Point(right.x, right.y)));
m_lines.push_back(Line(Point(right.x, right.y), Point(left.x, left.y))); // add first line in both directions to work with "right side"
m_curLine = &m_lines[1];
// TODO: split points and use map
m_convex.setPointCount(2);
m_convex.setFillColor(sf::Color::Transparent);
m_convex.setOutlineColor(sf::Color::Red);
m_convex.setOutlineThickness(2);
m_convex.setPoint(0, left);
m_convex.setPoint(1, right);
// TODO: could add here -> set color of points for current split
}
}
else if (curStep == 2)
{
// second step: split board
m_textStatus.setString(text + "split board...");
// TODO: get current line with points
if (m_curLine == nullptr)
{
size_t lines = m_lines.size();
if (lines < 1) throw "no more lines to work :-o TODO: just jump to finish?";
m_curLine = &m_lines[lines - 1];
}
std::cout << std::endl << "current line: " <<
std::to_string(m_curLine->from().x()) << ", " <<
std::to_string(m_curLine->from().y()) << ", " <<
std::to_string(m_curLine->to().x()) << ", " <<
std::to_string(m_curLine->to().y()) << ", " <<
" of " << std::to_string(m_lines.size()) << std::endl;
// second step: split board and find furthest point
m_textStatus.setString(text + "split board and find furthest point...");
for (auto& pt : m_points)
{
pt.setFillColor(sign(
pt.getPosition().x, pt.getPosition().y,
//m_hull[0].position.x, m_hull[0].position.y,
//m_hull[1].position.x, m_hull[1].position.y) > 0 ? sf::Color::Red : sf::Color::Green);
m_curLine->from().x(), m_curLine->from().y(),
m_curLine->to().x(), m_curLine->to().y()) > 0 ? sf::Color::Red : sf::Color::Green);
m_hull[0].position.x, m_hull[0].position.y,
m_hull[1].position.x, m_hull[1].position.y) > 0 ? sf::Color::Red : sf::Color::Green);
}
}
else if (curStep == 3)
{
// get line with more than one point -> or use m_curLine
// calc furthest point
// create new lines
// third step: draw triangle, remove inner points
m_textStatus.setString(text + "find furthest point and draw triangle...");
@ -242,7 +202,11 @@ void Display::update ()
float maxDistance = 0;
for (auto& pt : m_points)
{
/*
float distance = pDistance(
pt.getPosition().x, pt.getPosition().y,
m_hull[0].position.x, m_hull[0].position.y,
m_hull[1].position.x, m_hull[1].position.y);
if (pt.getFillColor() == sf::Color::Green)
{
std::cout << "distance to green point " << pt.getPosition().x << ", " << pt.getPosition().y << ": " << distance << std::endl;
@ -251,16 +215,6 @@ void Display::update ()
{
std::cout << "distance to red point " << pt.getPosition().x << ", " << pt.getPosition().y << ": " << distance << std::endl;
}
*/
if (pt.getFillColor() != sf::Color::Green) continue;
float distance = pDistance(
pt.getPosition().x, pt.getPosition().y,
//m_hull[0].position.x, m_hull[0].position.y,
//m_hull[1].position.x, m_hull[1].position.y);
m_curLine->from().x(), m_curLine->from().y(),
m_curLine->to().x(), m_curLine->from().y());
if (distance > maxDistance)
{
@ -271,47 +225,14 @@ void Display::update ()
if (maxDistance > 0)
{
// not append but insert between last line points
// -> append a point, then swap values
size_t vertices = m_hull.getVertexCount();
// TODO: not append but insert between last line points
m_hull.append(sf::Vertex(pos, sf::Color::Blue));
m_hull[vertices] = m_hull[vertices - 1];
m_hull[vertices - 1] = pos;
size_t points = m_convex.getPointCount();
m_convex.setPointCount(points + 1);
m_convex.setPoint(points, pos);
//m_lines.push_back(Line(m_curLine->from(), Point(pos.x, pos.y)));
//m_lines.push_back(Line(Point(pos.x, pos.y), m_curLine->to()));
m_lines.push_back(Line(Point(pos.x, pos.y), m_curLine->to()));
m_curLine->set_to(Point(pos.x, pos.y));
}
else
{
m_lines.pop_back(); // remove last element -> TODO: directly use stack?
}
}
else if (curStep == 4)
{
// fourth step: remove inner points
m_textStatus.setString(text + "remove inner points...");
// TODO: wip
/*size_t lines = m_lines.size() - 1;
Point pt1 = m_lines[lines - 1].from();
Point pt2 = m_lines[lines - 1].to();
Point pt3 = m_lines[lines].to();
for (size_t i = m_points.size(); i > 0; i--)
{
Point pt(m_points[i].getPosition().x, m_points[i].getPosition().y);
if (IsPointInTriangle(pt, pt1, pt2, pt3))
{
m_points.erase(m_points.begin() + i);
}
}*/
m_curLine = nullptr;
}
else if (curStep == 5)
{
@ -332,16 +253,14 @@ void Display::render (sf::RenderWindow &window)
{
window.clear(sf::Color::White);
// draw already calculated hull
//if (step >= 1)
{
//window.draw(&m_hull[0], m_hull.size(), sf::Lines);
window.draw(&m_hull[0], m_hull.getVertexCount(), m_hull.getPrimitiveType());
window.draw(m_convex);
}
// always print remaining points
/*size_t points = m_points.size();
for (size_t i = 0; i < points; ++i)
{
drawPoint(window, i);
}*/
//for (auto& pt : m_points) // points and labels should have the same size -> combine in one loop
size_t points = m_points.size();
for (size_t i = 0; i < points; ++i)
{
@ -349,18 +268,13 @@ void Display::render (sf::RenderWindow &window)
window.draw(m_labels[i]);
}
// draw line the algorithm is currently working on
if (m_curLine != nullptr)
// draw already calculated hull
//if (step >= 1)
{
sf::Vertex line[] =
{
sf::Vertex(sf::Vector2f(m_curLine->from().x(), m_curLine->from().y()), sf::Color::Red),
sf::Vertex(sf::Vector2f(m_curLine->to().x(), m_curLine->to().y()), sf::Color::Red)
};
window.draw(line, 2, sf::Lines);
//window.draw(&m_hull[0], m_hull.size(), sf::Lines);
window.draw(&m_hull[0], m_hull.getVertexCount(), m_hull.getPrimitiveType());
}
// show amount of steps and current status
window.draw(m_textStatus);
window.display();

11
Display.h
View File

@ -6,11 +6,7 @@
// windows - manual dl from https://www.sfml-dev.org/download.php
#include <SFML/Graphics.hpp>
#include "Line.h"
//class Point;
//class Line;
class Point;
#define OFFSET 10.f
#define WIDTH 800
@ -30,11 +26,6 @@ private:
//std::vector<sf::Vertex> m_hull;
sf::VertexArray m_hull;
sf::ConvexShape m_convex;
//std::map<Line, std::vector<Point> > m_pointsForLine;
std::vector<Line> m_lines;
Line *m_curLine = nullptr;
unsigned int m_step = 0;
void update();

4
Utility.h
View File

@ -6,12 +6,12 @@ static float sign(float x, float y, float x1, float y1, float x2, float y2)
return (x - x2) * (y1 - y2) - (x1 - x2) * (y - y2);
}
static float sign (const Point &p1, const Point &p2, const Point &p3)
static float sign (Point &p1, Point &p2, Point &p3)
{
return (p1.x() - p3.x()) * (p2.y() - p3.y()) - (p2.x() - p3.x()) * (p1.y() - p3.y());
}
static bool IsPointInTriangle(const Point &pt, const Point &p1, const Point &p2, const Point &p3)
static bool IsPointInTriangle(Point &pt, Point &p1, Point &p2, Point &p3)
{
float d1 = sign(pt, p1, p2);
float d2 = sign(pt, p2, p3);