Overview
Comment: | Add a few more commands into the picture editor |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d021d4aad77fdf244d03b3cf625bed0a |
User & Date: | user on 2021-06-13 22:31:57 |
Other Links: | manifest | tags |
Context
2021-06-16
| ||
18:03 | Corrections to default configuration, and some more stuff added to README check-in: 9889c7bed6 user: user tags: trunk | |
2021-06-13
| ||
22:31 | Add a few more commands into the picture editor check-in: d021d4aad7 user: user tags: trunk | |
2021-06-10
| ||
18:51 | Remember which levels have been solved in the user cache database check-in: c20acae981 user: user tags: trunk | |
Changes
Modified picedit.c from [950f3bbcaa] to [89c03fa222].
︙ | ︙ | |||
89 90 91 92 93 94 95 | *cur=sqlite3_malloc(sizeof(Cursor)); return *cur?SQLITE_OK:SQLITE_NOMEM; } static int vt_graph_connect(sqlite3*db,void*aux,int argc,const char*const*argv,sqlite3_vtab**vt,char**ex) { *vt=sqlite3_malloc(sizeof(sqlite3_vtab)); if(!*vt) return SQLITE_NOMEM; | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | *cur=sqlite3_malloc(sizeof(Cursor)); return *cur?SQLITE_OK:SQLITE_NOMEM; } static int vt_graph_connect(sqlite3*db,void*aux,int argc,const char*const*argv,sqlite3_vtab**vt,char**ex) { *vt=sqlite3_malloc(sizeof(sqlite3_vtab)); if(!*vt) return SQLITE_NOMEM; sqlite3_declare_vtab(db,"CREATE TABLE `GRAPH`(`X` INT, `Y` INT, `C` INT);"); return SQLITE_OK; } static int vt_graph_disconnect(sqlite3_vtab*vt) { sqlite3_free(vt); return SQLITE_OK; } |
︙ | ︙ | |||
539 540 541 542 543 544 545 546 547 548 549 550 551 552 | cy=0.5*(y1+y0); rx=0.5*(x1-x0); ry=0.5*(y1-y0); for(y=y0;y<=y1;y++) for(x=x0;x<=x1;x++) { if(pow((x-cx)/rx,2.0)+pow((y-cy)/ry,2.0)<=1.0) p[y*s+x]=c; } } static Picture*do_import(Picture*pic) { SDL_Color*pal=screen->format->palette->colors; int a,b,i,j,x,y; Uint8 buf[16]; Uint8*q; const char*cmd=screen_prompt("Import?"); | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 | cy=0.5*(y1+y0); rx=0.5*(x1-x0); ry=0.5*(y1-y0); for(y=y0;y<=y1;y++) for(x=x0;x<=x1;x++) { if(pow((x-cx)/rx,2.0)+pow((y-cy)/ry,2.0)<=1.0) p[y*s+x]=c; } } static void flood(Uint8 x,Uint8 y,Uint8 mx,Uint8 my,Uint8 mw,Uint8 mh,Uint8 c,Uint8 c0,Uint8 b) { sqlite3_stmt*st; if(c0==c) return; if(sqlite3_prepare_v2(userdb, // This isn't as efficient as it should be, since it has to scan the entire table every time. "INSERT INTO GRAPH(X,Y,C) WITH R(XX,YY) AS (" "SELECT ?1,?2 UNION SELECT X,Y FROM R,GRAPH WHERE C=?4" " AND ABS(X-XX)+ABS(Y-YY)<>?5 AND ABS(X-XX)<2 AND ABS(Y-YY)<2" " AND X>=?6 AND X<?8 AND Y>=?7 AND Y<?9" ") SELECT XX,YY,?3 FROM R;" ,-1,&st,0)) { screen_message(sqlite3_errmsg(userdb)); return; } sqlite3_bind_int(st,1,x); sqlite3_bind_int(st,2,y); sqlite3_bind_int(st,3,c); sqlite3_bind_int(st,4,c0); sqlite3_bind_int(st,5,3-b); sqlite3_bind_int(st,6,mx); sqlite3_bind_int(st,7,my); sqlite3_bind_int(st,8,mx+mw); sqlite3_bind_int(st,9,my+mh); sqlite3_step(st); sqlite3_finalize(st); } static Picture*do_import(Picture*pic) { SDL_Color*pal=screen->format->palette->colors; int a,b,i,j,x,y; Uint8 buf[16]; Uint8*q; const char*cmd=screen_prompt("Import?"); |
︙ | ︙ | |||
624 625 626 627 628 629 630 | "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" ; static const Uint8 gridlines[32]= "\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF" "\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF" ; | | > | 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 | "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" ; static const Uint8 gridlines[32]= "\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF" "\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF\xF8\xFF" ; static const char*const tool[11]={ "Draw", "Mark", "Pick", "Line", "Rect", "Fillrect", "Circle", "fIllcirc", "Ellipse", "fillellipSe", "flOod", }; static Picture*pclip=0; Uint8*p; Uint8*q; Uint8 sel=0; Uint8 cc=0; Uint8 t=2; |
︙ | ︙ | |||
672 673 674 675 676 677 678 | j=snprintf(buf,255,"%c%d%c",i==sel?'<':' ',pict[i]->size,i==sel?'>':' '); draw_text(x<<3,0,buf,0xF0,i==sel?0xFF:0xF8); x+=j; } draw_text(0,8,"<ESC> Exit <1-9> Sel <SP> Unmark <RET> Copy <INS> Paste <DEL> Erase",0xF0,0xFB); draw_text(0,16,"<F1> CW <F2> CCW <F3> \x12 <F4> \x1D <F5> Size <F6> Add <F7> Del <F8> Mark <F9> In <F10> Out",0xF0,0xFB); x=0; | | | 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 | j=snprintf(buf,255,"%c%d%c",i==sel?'<':' ',pict[i]->size,i==sel?'>':' '); draw_text(x<<3,0,buf,0xF0,i==sel?0xFF:0xF8); x+=j; } draw_text(0,8,"<ESC> Exit <1-9> Sel <SP> Unmark <RET> Copy <INS> Paste <DEL> Erase",0xF0,0xFB); draw_text(0,16,"<F1> CW <F2> CCW <F3> \x12 <F4> \x1D <F5> Size <F6> Add <F7> Del <F8> Mark <F9> In <F10> Out",0xF0,0xFB); x=0; for(i=0;i<11;i++) { j=snprintf(buf,255,"%c%s%c",i==t?'<':' ',tool[i],i==t?'>':' '); draw_text(x<<3,24,buf,0xF0,i==t?0xFE:0xF8); x+=j; } p=screen->pixels+40*screen->pitch; q=pict[sel]->data+pict[sel]->size; for(y=0;y<pict[sel]->size;y++) { |
︙ | ︙ | |||
765 766 767 768 769 770 771 772 773 774 775 | break; case SDL_MOUSEBUTTONDOWN: if(ev.button.x>=screen->w-161 && ev.button.x<screen->w-1 && ev.button.y>=40 && ev.button.y<200) { x=(ev.button.x+161-screen->w)/10; y=(ev.button.y-40)/10; i=y*16+x; pick: switch(ev.button.button) { case 1: cc=i; break; case 2: for(x=(m.y+1)*pict[sel]->size+m.x;x<pict[sel]->size*(pict[sel]->size+1);x++) { | > > | > > | | > | 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 | break; case SDL_MOUSEBUTTONDOWN: if(ev.button.x>=screen->w-161 && ev.button.x<screen->w-1 && ev.button.y>=40 && ev.button.y<200) { x=(ev.button.x+161-screen->w)/10; y=(ev.button.y-40)/10; i=y*16+x; pick: y=SDL_GetModState(); switch(ev.button.button) { case 1: cc=i; break; case 2: for(x=(m.y+1)*pict[sel]->size+m.x;x<pict[sel]->size*(pict[sel]->size+1);x++) { if(!y || ((y&(KMOD_CTRL|KMOD_SHIFT)) && (((x-x/pict[sel]->size)^(y&KMOD_CTRL?1:0))&1))) { if(pict[sel]->data[x]==cc) pict[sel]->data[x]=i; } if(m.w && x%pict[sel]->size==m.x+m.w-1) x+=pict[sel]->size-m.w; if(m.h && x/pict[sel]->size>m.h+m.y) break; } break; case 3: for(x=(m.y+1)*pict[sel]->size+m.x;x<pict[sel]->size*(pict[sel]->size+1);x++) { if(!y || ((y&(KMOD_CTRL|KMOD_SHIFT)) && (((x-x/pict[sel]->size)^(y&KMOD_CTRL?1:0))&1))) { if(pict[sel]->data[x]==cc) pict[sel]->data[x]=i; else if(pict[sel]->data[x]==i) pict[sel]->data[x]=cc; } if(m.w && x%pict[sel]->size==m.x+m.w-1) x+=pict[sel]->size-m.w; if(m.h && x/pict[sel]->size>m.h+m.y) break; } break; } goto redraw; } else if(ev.button.x>=pict[sel]->size+2 && ev.button.x<pict[sel]->size*(z+1)+2 && ev.button.y>=41 && ev.button.y<z*pict[sel]->size+41) { |
︙ | ︙ | |||
866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 | if(i==1) { xx=x; yy=y; } else if(xx!=-1) { fill_ellipse(pict[sel]->data+pict[sel]->size,pict[sel]->size,x,y,xx,yy,cc); draw_ellipse(pict[sel]->data+pict[sel]->size,pict[sel]->size,x,y,xx,yy,cc); } break; } goto redraw; } break; case SDL_KEYDOWN: switch(ev.key.keysym.sym) { case SDLK_ESCAPE: return; case SDLK_LEFTBRACKET: case SDLK_LEFTPAREN: --sel; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_RIGHTBRACKET: case SDLK_RIGHTPAREN: ++sel; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_1 ... SDLK_9: sel=ev.key.keysym.sym-SDLK_1; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_c: t=6; xx=yy=-1; goto redraw; case SDLK_d: t=0; xx=yy=-1; goto redraw; case SDLK_e: t=8; xx=yy=-1; goto redraw; case SDLK_f: t=5; xx=yy=-1; goto redraw; case SDLK_i: t=7; xx=yy=-1; goto redraw; case SDLK_l: t=3; xx=yy=-1; goto redraw; case SDLK_m: t=1; xx=yy=-1; goto redraw; case SDLK_p: t=2; xx=yy=-1; goto redraw; case SDLK_r: t=4; xx=yy=-1; goto redraw; case SDLK_s: t=9; xx=yy=-1; goto redraw; case SDLK_TAB: if(ev.key.keysym.mod&KMOD_SHIFT) --sel; else ++sel; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_SPACE: m.x=m.y=m.w=m.h=0; xx=yy=-1; | > > > > | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 | if(i==1) { xx=x; yy=y; } else if(xx!=-1) { fill_ellipse(pict[sel]->data+pict[sel]->size,pict[sel]->size,x,y,xx,yy,cc); draw_ellipse(pict[sel]->data+pict[sel]->size,pict[sel]->size,x,y,xx,yy,cc); } break; case 10: // Flood if(!m.w) m.x=m.y=m.h=0; flood(x,y,m.x,m.y,m.w?:pict[sel]->size,m.h?:pict[sel]->size,cc,pict[sel]->data[(y+1)*pict[sel]->size+x],i); } goto redraw; } break; case SDL_KEYDOWN: switch(ev.key.keysym.sym) { case SDLK_ESCAPE: return; case SDLK_LEFTBRACKET: case SDLK_LEFTPAREN: --sel; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_RIGHTBRACKET: case SDLK_RIGHTPAREN: ++sel; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_1 ... SDLK_9: sel=ev.key.keysym.sym-SDLK_1; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_c: t=6; xx=yy=-1; goto redraw; case SDLK_d: t=0; xx=yy=-1; goto redraw; case SDLK_e: t=8; xx=yy=-1; goto redraw; case SDLK_f: t=5; xx=yy=-1; goto redraw; case SDLK_i: t=7; xx=yy=-1; goto redraw; case SDLK_l: t=3; xx=yy=-1; goto redraw; case SDLK_m: t=1; xx=yy=-1; goto redraw; case SDLK_o: t=10; xx=yy=-1; goto redraw; case SDLK_p: t=2; xx=yy=-1; goto redraw; case SDLK_r: t=4; xx=yy=-1; goto redraw; case SDLK_s: t=9; xx=yy=-1; goto redraw; case SDLK_TAB: if(ev.key.keysym.mod&KMOD_SHIFT) --sel; else ++sel; m.x=m.y=m.w=m.h=0; goto redraw; case SDLK_SPACE: m.x=m.y=m.w=m.h=0; xx=yy=-1; |
︙ | ︙ |
Modified picedit.doc from [cb491484cb] to [4b94bea7ec].
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 | Click the left button on one corner of the bounding rectangle of the ellipse, and then click the middle or right button on the other side. Filled ellipse (S) Click the left button on one corner of the bounding rectangle of the ellipse, and then click the middle or right button on the other side. === Dependent pictures === A depedent picture depends on one or more independent pictures. It consists of any combination of the following items, in any order: * Base: This one must come first, and is the independent picture which | > > > > > > > > > > | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 | Click the left button on one corner of the bounding rectangle of the ellipse, and then click the middle or right button on the other side. Filled ellipse (S) Click the left button on one corner of the bounding rectangle of the ellipse, and then click the middle or right button on the other side. Flood (O) Click any button to flood an area of a solid colour with the current colour. Which button decides the directions to use, where the left button means the von Neumann neighbourhood and the right button means the Moore neighbourhood. For clicking in the palette or the Pick mode, with the middle or right mouse button, you can also push CTRL or SHIFT keys with it in order to affect only odd or only even coordinates. === Dependent pictures === A depedent picture depends on one or more independent pictures. It consists of any combination of the following items, in any order: * Base: This one must come first, and is the independent picture which |
︙ | ︙ |