koma/mandelbrot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement zooming

Browse Source
This commit is contained in:
Akos Horvath 2022-07-09 20:58:17 +02:00
parent 00b4c837d0
commit dd1a608eda
3 changed files with 70 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
graphics.cpp
View File

@ -29,8 +29,10 @@ using namespace Mandelbrot;
using namespace mpfr; using namespace mpfr;
Graphics::Graphics(int w, int h, std::string title) : w(w), h(h), title(title), Graphics::Graphics(int w, int h, std::string title) : w(w), h(h), title(title),
from(Vec2mp(0.0, 0.0)), to(Vec2mp(0.0, 0.0)) from(Vec2mp(0.0, 0.0)), to(Vec2mp(0.0, 0.0)), m_start(Vec2i(0, 0)),
m_end(Vec2i(0, 0)), mouseDown(false)
{ {
SDL_Window *window = SDL_CreateWindow(this->title.c_str(), SDL_Window *window = SDL_CreateWindow(this->title.c_str(),
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
@ -208,6 +210,55 @@ void Graphics::plot(Mandelbrotc const &m)
} }
} }
void Graphics::drawSelectionRectangle()
{
if (this->mouseDown) {
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
if (m_start.x < m_end.x) {
for (int i = m_start.x; i < m_end.x; i++) {
SDL_RenderDrawPoint(renderer, i, m_start.y);
SDL_RenderDrawPoint(renderer, i, m_end.y);
}
} else {
for (int i = m_end.x; i < m_start.x; i++) {
SDL_RenderDrawPoint(renderer, i, m_start.y);
SDL_RenderDrawPoint(renderer, i, m_end.y);
}
}
if (m_start.y < m_end.y) {
for (int i = m_start.y; i < m_end.y; i++) {
SDL_RenderDrawPoint(renderer, m_start.x, i);
SDL_RenderDrawPoint(renderer, m_end.x, i);
}
} else {
for (int i = m_end.y; i < m_start.y; i++) {
SDL_RenderDrawPoint(renderer, m_start.x, i);
SDL_RenderDrawPoint(renderer, m_end.x, i);
}
}
}
}
void Graphics::zoom(Mandelbrotc &m)
{
if (abs(m_end.x-m_start.x) < 10 || abs(m_end.y-m_start.y) < 10)
return;
mpreal s_x = (mpfr::abs(m.f.x - m.t.x) *
((double)this->m_start.x / (double)this->w)) + m.f.x;
mpreal s_y = (mpfr::abs(m.f.y - m.t.y) *
((double)this->m_start.y / (double)this->h)) + m.f.y;
mpreal e_x = (mpfr::abs(m.f.x - m.t.x) *
((double)this->m_end.x / (double)this->w)) + m.f.x;
mpreal e_y = (mpfr::abs(m.f.y - m.t.y) *
((double)this->m_end.y / (double)this->h)) + m.f.y;
m.f = Vec2mp(s_x, s_y);
m.t = Vec2mp(e_x, e_y);
}
void Graphics::mainLoop() void Graphics::mainLoop()
{ {
mpreal fx = mpreal(-2); mpreal fx = mpreal(-2);
@ -217,7 +268,6 @@ void Graphics::mainLoop()
this->from = Vec2mp(fx, fy); this->from = Vec2mp(fx, fy);
this->to = Vec2mp(tx, ty); this->to = Vec2mp(tx, ty);
bool mouseDown = false;
Vec2i m_start = Vec2i(0, 0); Vec2i m_start = Vec2i(0, 0);
Vec2i m_end = Vec2i(0, 0); Vec2i m_end = Vec2i(0, 0);
@ -253,48 +303,23 @@ void Graphics::mainLoop()
} }
break; break;
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
if (mouseDown) if (this->mouseDown)
break; break;
mouseDown = true; this->mouseDown = true;
m_start.x = event.button.x; this->m_start.x = event.button.x;
m_start.y = event.button.y; this->m_start.y = event.button.y;
break; break;
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
mouseDown = false; this->mouseDown = false;
this->zoom(m);
break; break;
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
m_end.x = event.motion.x; this->m_end.x = event.motion.x;
m_end.y = event.motion.y; this->m_end.y = event.motion.y;
break; break;
} }
} }
if (mouseDown) {
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
if (m_start.x < m_end.x) {
for (int i = m_start.x; i < m_end.x; i++) {
SDL_RenderDrawPoint(renderer, i, m_start.y);
SDL_RenderDrawPoint(renderer, i, m_end.y);
}
} else {
for (int i = m_end.x; i < m_start.x; i++) {
SDL_RenderDrawPoint(renderer, i, m_start.y);
SDL_RenderDrawPoint(renderer, i, m_end.y);
}
}
if (m_start.y < m_end.y) {
for (int i = m_start.y; i < m_end.y; i++) {
SDL_RenderDrawPoint(renderer, m_start.x, i);
SDL_RenderDrawPoint(renderer, m_end.x, i);
}
} else {
for (int i = m_end.y; i < m_start.y; i++) {
SDL_RenderDrawPoint(renderer, m_start.x, i);
SDL_RenderDrawPoint(renderer, m_end.x, i);
}
}
}
// std::cout << "mainloop range " << this->from.x << std::endl; // std::cout << "mainloop range " << this->from.x << std::endl;
// std::cout << "mainloop range " << this->from.y << std::endl; // std::cout << "mainloop range " << this->from.y << std::endl;
// std::cout << "mainloop range " << this->to.x << std::endl; // std::cout << "mainloop range " << this->to.x << std::endl;
@ -304,13 +329,13 @@ void Graphics::mainLoop()
this->plot(m); this->plot(m);
m.stop_threads(); m.stop_threads();
// std::cout << "done" << std::endl; this->drawSelectionRectangle();
SDL_RenderPresent(renderer); SDL_RenderPresent(renderer);
SDL_SetRenderDrawColor(this->renderer, 255, 255, 255, 255); SDL_SetRenderDrawColor(this->renderer, 255, 255, 255, 255);
SDL_RenderClear(renderer); SDL_RenderClear(renderer);
SDL_Delay(10); //SDL_Delay(10);
} }
m.stop_threads(); m.stop_threads();
} }

6
graphics.h
View File

@ -39,9 +39,15 @@ namespace Mandelbrot {
Vec2mp to; Vec2mp to;
bool running; bool running;
bool mouseDown;
Vec2i m_start;
Vec2i m_end;
Graphics(int w, int h, std::string title); Graphics(int w, int h, std::string title);
void plot(Mandelbrotc const &m); void plot(Mandelbrotc const &m);
void mainLoop(); void mainLoop();
void drawPoint(const Vec2i &pos, const rgb &col); void drawPoint(const Vec2i &pos, const rgb &col);
void drawSelectionRectangle();
void zoom(Mandelbrotc &m);
}; };
} // namespace Mandelbrot } // namespace Mandelbrot

5
mandelbrot.cpp
View File

@ -44,9 +44,8 @@ void Mandelbrotc::start_threads(bool first)
for (int i = 0; i < this->thread_count; i++) { for (int i = 0; i < this->thread_count; i++) {
std::thread t = std::thread(&Mandelbrotc::calc, this, i); std::thread t = std::thread(&Mandelbrotc::calc, this, i);
this->threads.push_back(std::move(t)); this->threads.push_back(std::move(t));
std::cout << "thread created" << std::endl; //std::cout << "thread created" << std::endl;
} }
this->done = false; this->done = false;
} }
@ -71,7 +70,7 @@ void Mandelbrotc::calc(const uint8_t tid)
} }
} }
std::cout << "thread " << tid << " done" << std::endl; //std::cout << "thread " << tid << " done" << std::endl;
if (tid == thread_count-1) if (tid == thread_count-1)
this->done = true; this->done = true;
} }