ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix zoom: long click = in, double click = out

This commit is contained in:
Kilian Neuner 2011-08-03 19:02:05 +02:00
parent c856eb4f99
commit e34df30333
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
firmware/loadable/mandelbrot.c
View File

@ -36,7 +36,8 @@ void ram(void) {
struct mb { struct mb {
long rmin, rmax, imin, imax; long rmin, rmax, imin, imax;
bool dirty, dup, ddown, dleft, dright; bool dirty, dup, ddown, dleft, dright, clickmark;
int count, limitZIn, limitZOut;
} mandel; } mandel;
void mandelInit() { void mandelInit() {
@ -48,12 +49,16 @@ void mandelInit() {
mandel.rmax = fixpt(1); mandel.rmax = fixpt(1);
mandel.imin = fixpt(-2); mandel.imin = fixpt(-2);
mandel.imax = fixpt(2); mandel.imax = fixpt(2);
mandel.count = 0;
mandel.limitZIn = 40;
mandel.limitZOut = 30;
mandel.dirty = true; mandel.dirty = true;
mandel.dup = false; mandel.dup = false;
mandel.ddown = false; mandel.ddown = false;
mandel.dleft = false; mandel.dleft = false;
mandel.dright = false; mandel.dright = false;
mandel.clickmark = false;
} }
void mandelMove() { void mandelMove() {
@ -65,7 +70,7 @@ void mandelMove() {
char key = getInputRaw(); char key = getInputRaw();
if (key == BTN_LEFT) { if (key == BTN_LEFT) {
mandel.imax -=is; mandel.imax -=is;
mandel.imin -=is; mandel.imin -=is;
mandel.dleft = true; mandel.dleft = true;
@ -77,23 +82,37 @@ void mandelMove() {
mandel.rmax += rs; mandel.rmax += rs;
mandel.rmin += rs; mandel.rmin += rs;
mandel.ddown = true; mandel.ddown = true;
} else if (key == BTN_UP) { } else if (key == BTN_UP) {
mandel.rmax -= rs; mandel.rmax -= rs;
mandel.rmin -= rs; mandel.rmin -= rs;
mandel.dup = true; mandel.dup = true;
} else if (key == (BTN_ENTER + BTN_UP)) { } else if (key == BTN_ENTER) {
mandel.imin = mandel.imin + (mandel.imax-mandel.imin)/10; if (mandel.count < mandel.limitZIn) {
mandel.imax = mandel.imax - (mandel.imax-mandel.imin)/10; mandel.count = mandel.count + 1;
mandel.rmin = mandel.rmin +(mandel.rmax-mandel.rmin)/10; }
mandel.rmax = mandel.rmax -(mandel.rmax-mandel.rmin)/10; } else if (key == BTN_NONE) {
mandel.dirty = true; if(mandel.count > 0 ) {
} else if (key == (BTN_ENTER + BTN_DOWN)) { mandel.count = mandel.count - 1;
mandel.imin = mandel.imin - (mandel.imax-mandel.imin)/10; mandel.clickmark = true;
}
if (mandel.count == 0 ) {
mandel.clickmark = false;
}
}
if (mandel.count > mandel.limitZOut && mandel.clickmark && key == BTN_ENTER) {
mandel.imin = mandel.imin - (mandel.imax-mandel.imin)/10;
mandel.imax = mandel.imax + (mandel.imax-mandel.imin)/10; mandel.imax = mandel.imax + (mandel.imax-mandel.imin)/10;
mandel.rmin = mandel.rmin -(mandel.rmax-mandel.rmin)/10; mandel.rmin = mandel.rmin -(mandel.rmax-mandel.rmin)/10;
mandel.rmax = mandel.rmax +(mandel.rmax-mandel.rmin)/10; mandel.rmax = mandel.rmax +(mandel.rmax-mandel.rmin)/10;
mandel.dirty = true; mandel.dirty = true;
} }
if (mandel.count == mandel.limitZIn && key == BTN_ENTER) {
mandel.imin = mandel.imin + (mandel.imax-mandel.imin)/10;
mandel.imax = mandel.imax - (mandel.imax-mandel.imin)/10;
mandel.rmin = mandel.rmin +(mandel.rmax-mandel.rmin)/10;
mandel.rmax = mandel.rmax -(mandel.rmax-mandel.rmin)/10;
mandel.dirty = true;
}
} }
void mandelPixel(int x, int y) { void mandelPixel(int x, int y) {