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

mandel buxfix

This commit is contained in:
iggy 2011-08-05 12:12:36 +02:00
parent 9dae0c8638
commit 2285fae1a1
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
firmware/l0dable/mandel.c
View File

@ -26,10 +26,9 @@ void ram(void) {
lcdDisplay(); lcdDisplay();
mandelMove(); mandelMove();
mandelUpdate(); mandelUpdate();
// Exit on enter+left
// Exit on enter+direction
key=getInputRaw(); key=getInputRaw();
if(key&BTN_ENTER && key>BTN_ENTER) if(key== BTN_ENTER + BTN_LEFT)
return; return;
} }
return; return;
@ -51,10 +50,10 @@ void mandelInit() {
mandel.imin = fixpt(-2); mandel.imin = fixpt(-2);
mandel.imax = fixpt(2); mandel.imax = fixpt(2);
mandel.presscount = 0; mandel.presscount = 0;
mandel.presslimitzin = 40; mandel.presslimitzin = 15;
mandel.presslimitzout = 30; mandel.presslimitzout = 5;
mandel.zoomlevel = 0; mandel.zoomlevel = 0;
mandel.maxzoomin = 65; mandel.maxzoomin = 42;
mandel.maxzoomout = -12; mandel.maxzoomout = -12;
mandel.dirty = true; mandel.dirty = true;
@ -69,54 +68,55 @@ void mandelMove() {
//long delta_r = (mandel.rmax - mandel.rmin)/10; //long delta_r = (mandel.rmax - mandel.rmin)/10;
//long delta_i = (mandel.imax - mandel.imin)/10; //long delta_i = (mandel.imax - mandel.imin)/10;
long rs =(mandel.rmax-mandel.rmin)/RESY; long rs =(mandel.rmax-mandel.rmin)/RESY;
long is =(mandel.imax-mandel.imin)/RESX; long is =(mandel.imax-mandel.imin)/RESX;
char key = getInputRaw(); char key = getInputWaitTimeout(10);
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;
} else if (key == BTN_RIGHT) { } else if (key == BTN_RIGHT) {
mandel.imax += is; mandel.imax += is;
mandel.imin += is; mandel.imin += is;
mandel.dright = true; mandel.dright = true;
} else if (key == BTN_DOWN) { } else if (key == BTN_DOWN) {
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) { } else if (key == BTN_ENTER) {
if (mandel.presscount < mandel.presslimitzin) { if (mandel.presscount < mandel.presslimitzin) {
mandel.presscount = mandel.presscount + 1; mandel.presscount = mandel.presscount + 1;
} }
} else if (key == BTN_NONE) { } else if (key == BTN_NONE) {
if(mandel.presscount > 0 ) { //delayms_queue(15);
mandel.presscount = mandel.presscount - 1; if(mandel.presscount > 0 ) {
mandel.clickmark = true; mandel.presscount = mandel.presscount - 1;
} mandel.clickmark = true;
if (mandel.presscount == 0 ) { }
mandel.clickmark = false; if (mandel.presscount == 0 ) {
} mandel.clickmark = false;
} }
if (mandel.presscount > mandel.presslimitzout && mandel.clickmark && key == BTN_ENTER && mandel.zoomlevel >= mandel.maxzoomout) { }
mandel.imin = mandel.imin - (mandel.imax-mandel.imin)/10; if (mandel.presscount > mandel.presslimitzout && mandel.clickmark && key == BTN_ENTER && mandel.zoomlevel >= mandel.maxzoomout) {
mandel.imax = mandel.imax + (mandel.imax-mandel.imin)/10; mandel.imin = mandel.imin - (mandel.imax-mandel.imin)/8;
mandel.rmin = mandel.rmin -(mandel.rmax-mandel.rmin)/10; mandel.imax = mandel.imax + (mandel.imax-mandel.imin)/8;
mandel.rmax = mandel.rmax +(mandel.rmax-mandel.rmin)/10; mandel.rmin = mandel.rmin -(mandel.rmax-mandel.rmin)/8;
mandel.rmax = mandel.rmax +(mandel.rmax-mandel.rmin)/8;
mandel.dirty = true; mandel.dirty = true;
delayms(10); delayms(10);
mandel.zoomlevel = mandel.zoomlevel - 1 ; mandel.zoomlevel = mandel.zoomlevel - 1 ;
} }
else if (mandel.presscount == mandel.presslimitzin && key == BTN_ENTER && mandel.zoomlevel <= mandel.maxzoomin ) { else if (mandel.presscount == mandel.presslimitzin && key == BTN_ENTER && mandel.zoomlevel <= mandel.maxzoomin ) {
mandel.imin = mandel.imin + (mandel.imax-mandel.imin)/10; mandel.imin = mandel.imin + (mandel.imax-mandel.imin)/8;
mandel.imax = mandel.imax - (mandel.imax-mandel.imin)/10; mandel.imax = mandel.imax - (mandel.imax-mandel.imin)/8;
mandel.rmin = mandel.rmin +(mandel.rmax-mandel.rmin)/10; mandel.rmin = mandel.rmin +(mandel.rmax-mandel.rmin)/8;
mandel.rmax = mandel.rmax -(mandel.rmax-mandel.rmin)/10; mandel.rmax = mandel.rmax -(mandel.rmax-mandel.rmin)/8;
mandel.dirty = true; mandel.dirty = true;
delayms(10); delayms(10);
mandel.zoomlevel = mandel.zoomlevel + 1 ; mandel.zoomlevel = mandel.zoomlevel + 1 ;