Overview
Comment: | Many more corrections and additions in picture editor |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
94bf9553473995a8c336ff24b48e8f5f |
User & Date: | user on 2021-01-17 04:12:57 |
Other Links: | manifest | tags |
Context
2021-01-18
| ||
00:46 | Add documentation for picture editor check-in: 65cf966d49 user: user tags: trunk | |
2021-01-17
| ||
04:12 | Many more corrections and additions in picture editor check-in: 94bf955347 user: user tags: trunk | |
2021-01-16
| ||
23:19 | Another more work in picture editor check-in: 776f8eb358 user: user tags: trunk | |
Changes
Modified picedit.c from [9bc35f41ff] to [8ece4cf928].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | #if 0 gcc ${CFLAGS:--s -O2} -c -Wno-multichar picedit.c `sdl-config --cflags` exit #endif /* This program is part of Free Hero Mesh and is public domain. */ #include "SDL.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include "sqlite3.h" #include "smallxrm.h" #include "heromesh.h" #include "quarks.h" | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | #if 0 gcc ${CFLAGS:--s -O2} -c -Wno-multichar picedit.c `sdl-config --cflags` exit #endif /* This program is part of Free Hero Mesh and is public domain. */ #include "SDL.h" #include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include "sqlite3.h" #include "smallxrm.h" #include "heromesh.h" #include "quarks.h" |
︙ | ︙ | |||
212 213 214 215 216 217 218 | if(pict[i]->meth) load_rotate(pict[i]); } fclose(fp); } static inline void show_cursor_xy(int x,int y,int xx,int yy) { char buf[64]; | | | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | if(pict[i]->meth) load_rotate(pict[i]); } fclose(fp); } static inline void show_cursor_xy(int x,int y,int xx,int yy) { char buf[64]; if(x>=0 && xx>=0) snprintf(buf,64,"[%d,%d]:(%d,%d) %+d%+d%63s",xx,yy,x,y,x-xx,y-yy,""); else if(x>=0) snprintf(buf,64,"(%d,%d)%63s",x,y,""); else if(xx>=0) snprintf(buf,64,"[%d,%d]%63s",xx,yy,""); else snprintf(buf,64,"%63s",""); SDL_LockSurface(screen); draw_text(0,32,buf,0xF0,0xF9); SDL_UnlockSurface(screen); SDL_Flip(screen); |
︙ | ︙ | |||
237 238 239 240 241 242 243 244 245 246 247 248 249 250 | p[y0*s+x0]=c; if(x0==x1 && y0==y1) break; e2=e+e; if(e2>=dy) e+=dy,x0+=sx; if(e2<=dx) e+=dx,y0+=sy; } } static inline void edit_picture_1(Picture**pict,const char*name) { static const Uint8 shade[64]= "\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" "\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" | > > > > > > > > > > > > > > > > > > > > > > > | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | p[y0*s+x0]=c; if(x0==x1 && y0==y1) break; e2=e+e; if(e2>=dy) e+=dy,x0+=sx; if(e2<=dx) e+=dx,y0+=sy; } } static void draw_circle(Uint8*p,Uint8 s,Uint8 x0,Uint8 y0,Uint32 r,Uint8 c) { int i,j,x,y; for(i=0;i<s && r>=0;i++) { j=sqrt(r); r-=i+i+1; x=x0+i,y=y0+j; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; x=x0-i,y=y0+j; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; x=x0+i,y=y0-j; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; x=x0-i,y=y0-j; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; x=x0+j,y=y0+i; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; x=x0-j,y=y0+i; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; x=x0+j,y=y0-i; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; x=x0-j,y=y0-i; if(x>=0 && x<s && y>=0 && y<s) p[y*s+x]=c; } } static void fill_circle(Uint8*p,Uint8 s,Uint8 x0,Uint8 y0,Uint32 r,Uint8 c) { int x,y; for(y=0;y<s;y++) for(x=0;x<s;x++) { if((x-x0)*(x-x0)+(y-y0)*(y-y0)<=r) p[y*s+x]=c; } } static inline void edit_picture_1(Picture**pict,const char*name) { static const Uint8 shade[64]= "\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" "\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" |
︙ | ︙ | |||
294 295 296 297 298 299 300 | x=strlen(name)+1; for(i=0;i<16;i++) if(pict[i]) { 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); | | | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 | x=strlen(name)+1; for(i=0;i<16;i++) if(pict[i]) { 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",0xF0,0xFB); x=0; for(i=0;i<10;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; |
︙ | ︙ | |||
376 377 378 379 380 381 382 383 384 385 386 387 388 389 | x=-1; set_cursor(XC_arrow); } else { x=(ev.motion.x-pict[sel]->size-2)/z; y=(ev.motion.y-41)/z; set_cursor(XC_tcross); if(ev.motion.state && !t) { pict[sel]->data[(y+1)*pict[sel]->size+x]=(ev.motion.state&SDL_BUTTON(1)?cc:0); goto redraw; } } show_cursor_xy(x,y,xx,yy); break; case SDL_MOUSEBUTTONDOWN: | > | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 | x=-1; set_cursor(XC_arrow); } else { x=(ev.motion.x-pict[sel]->size-2)/z; y=(ev.motion.y-41)/z; set_cursor(XC_tcross); if(ev.motion.state && !t) { if(ev.motion.state&SDL_BUTTON(2)) break; pict[sel]->data[(y+1)*pict[sel]->size+x]=(ev.motion.state&SDL_BUTTON(1)?cc:0); goto redraw; } } show_cursor_xy(x,y,xx,yy); break; case SDL_MOUSEBUTTONDOWN: |
︙ | ︙ | |||
414 415 416 417 418 419 420 | } 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) { x=(ev.button.x-pict[sel]->size-2)/z; y=(ev.button.y-41)/z; i=ev.button.button; if(i>3) break; switch(t) { case 0: // Draw | > | | 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 | } 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) { x=(ev.button.x-pict[sel]->size-2)/z; y=(ev.button.y-41)/z; i=ev.button.button; if(i>3) break; switch(t) { case 0: // Draw if(i==2) cc=pict[sel]->data[(y+1)*pict[sel]->size+x]; else pict[sel]->data[(y+1)*pict[sel]->size+x]=(i==1?cc:0); break; case 1: // Mark if(i==1) { xx=x; yy=y; } else if(i==3) { m.x=(x<xx?x:xx); m.y=(y<yy?y:yy); m.w=abs(x-xx)+1; m.h=abs(y-yy)+1; |
︙ | ︙ | |||
440 441 442 443 444 445 446 | xx=x; yy=y; } else if(xx!=-1) { p=pict[sel]->data+(j=pict[sel]->size); if(xx<x) i=x,x=xx,xx=i; if(yy<y) i=y,y=yy,yy=i; memset(p+y*j+x,cc,xx+1-x); memset(p+yy*j+x,cc,xx+1-x); | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | xx=x; yy=y; } else if(xx!=-1) { p=pict[sel]->data+(j=pict[sel]->size); if(xx<x) i=x,x=xx,xx=i; if(yy<y) i=y,y=yy,yy=i; memset(p+y*j+x,cc,xx+1-x); memset(p+yy*j+x,cc,xx+1-x); while(y<yy) p[y*j+x]=p[y*j+xx]=cc,y++; xx=yy=-1; } break; case 5: // Fillrect if(i==1) { xx=x; yy=y; } else if(xx!=-1) { p=pict[sel]->data+(j=pict[sel]->size); if(xx<x) i=x,x=xx,xx=i; if(yy<y) i=y,y=yy,yy=i; while(y<yy) memset(p+y*j+x,cc,xx+1-x),y++; xx=yy=-1; } break; case 6: // Circle if(i==1) { xx=x; yy=y; } else if(i==2) { draw_circle(pict[sel]->data+pict[sel]->size,pict[sel]->size,x,y,(x-xx)*(x-xx)+(y-yy)*(y-yy),cc); } else if(i==3) { draw_circle(pict[sel]->data+pict[sel]->size,pict[sel]->size,xx,yy,(x-xx)*(x-xx)+(y-yy)*(y-yy),cc); } break; case 7: // Fillcircle if(i==1) { xx=x; yy=y; } else if(i==2) { fill_circle(pict[sel]->data+pict[sel]->size,pict[sel]->size,x,y,(x-xx)*(x-xx)+(y-yy)*(y-yy),cc); } else if(i==3) { fill_circle(pict[sel]->data+pict[sel]->size,pict[sel]->size,xx,yy,(x-xx)*(x-xx)+(y-yy)*(y-yy),cc); } break; } goto redraw; } break; case SDL_KEYDOWN: switch(ev.key.keysym.sym) { |
︙ | ︙ | |||
488 489 490 491 492 493 494 495 496 497 498 499 500 501 | p+=pict[sel]->size; q+=m.w; } goto redraw; case SDLK_INSERT: case SDLK_KP0: paste: if(!pclip) break; if(!m.w) { m.w=pclip->meth; m.h=pclip->size; if(m.w>pict[sel]->size) m.w=pict[sel]->size; if(m.h>pict[sel]->size) m.h=pict[sel]->size; } p=pclip->data+pclip->meth; q=pict[sel]->data+(m.y+1)*pict[sel]->size+m.x; | > > > > > | 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 | p+=pict[sel]->size; q+=m.w; } goto redraw; case SDLK_INSERT: case SDLK_KP0: paste: if(!pclip) break; if(!m.w) { if(xx!=-1) { if(xx+pclip->meth>pict[sel]->size || yy+pclip->size>pict[sel]->size) break; m.x=xx; m.y=yy; } m.w=pclip->meth; m.h=pclip->size; if(m.w>pict[sel]->size) m.w=pict[sel]->size; if(m.h>pict[sel]->size) m.h=pict[sel]->size; } p=pclip->data+pclip->meth; q=pict[sel]->data+(m.y+1)*pict[sel]->size+m.x; |
︙ | ︙ | |||
509 510 511 512 513 514 515 | } goto redraw; case SDLK_DELETE: case SDLK_KP_PERIOD: if(!m.w) break; p=pict[sel]->data+(m.y+1)*pict[sel]->size+m.x; for(y=0;y<m.h;y++) memset(p,0,m.w),p+=pict[sel]->size; goto redraw; | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | } goto redraw; case SDLK_DELETE: case SDLK_KP_PERIOD: if(!m.w) break; p=pict[sel]->data+(m.y+1)*pict[sel]->size+m.x; for(y=0;y<m.h;y++) memset(p,0,m.w),p+=pict[sel]->size; goto redraw; case SDLK_F5: resize: m.x=m.y=m.w=m.h=0; xx=yy=-1; p=(Uint8*)screen_prompt("Size? (1 to 255, or P to paste)"); if(!p || !*p) goto redraw; if(*p=='p' || *p=='P') { if(!pclip || pclip->meth!=pclip->size) goto redraw; i=pclip->size; } else { i=strtol(p,0,10); } if(i<1 || i>255) goto redraw; free(pict[sel]); pict[sel]=malloc(sizeof(Picture)+(i+1)*i); if(!pict[sel]) fatal("Allocation failed\n"); pict[sel]->size=i; if(*p=='p' || *p=='P') memcpy(pict[sel]->data,pclip->data,(i+1)*i); else memset(pict[sel]->data,0,(i+1)*i); goto redraw; case SDLK_F6: if(pict[15]) break; for(sel=0;sel<15;sel++) if(!pict[sel]) break; goto resize; case SDLK_F7: if(!sel && !pict[1]) break; free(pict[sel]); for(i=sel;i<15;i++) pict[i]=pict[i+1]; pict[15]=0; goto redraw; case SDLK_F8: case SDLK_KP_MULTIPLY: m.x=m.y=0; m.w=m.h=pict[sel]->size; goto redraw; case SDLK_LEFT: case SDLK_KP4: --cc; goto redraw; case SDLK_RIGHT: case SDLK_KP6: ++cc; goto redraw; case SDLK_UP: case SDLK_KP8: cc-=16; goto redraw; case SDLK_DOWN: case SDLK_KP2: cc+=16; goto redraw; case SDLK_HOME: case SDLK_KP7: cc=0; goto redraw; } break; case SDL_VIDEOEXPOSE: goto redraw; } } } |
︙ | ︙ |