From 1e6cab53da54347d358a946b414d248c398eb4d1 Mon Sep 17 00:00:00 2001 From: b Date: Sun, 19 Jan 2014 17:20:06 +0000 Subject: [PATCH] Everything is ready (again) git-svn-id: svn://botcastle1b/npb@26 0d794883-4e4e-4f65-aa7a-0e7f5947bab5 --- 403 | Bin 15624 -> 12489 bytes 403.cpp | 237 ++++++++++++++++++++++++++------------------------------ npb | Bin 15624 -> 15624 bytes npbd | Bin 31287 -> 31283 bytes 4 files changed, 108 insertions(+), 129 deletions(-) diff --git a/403 b/403 index 1f193989bf2e457ab3bd4ba5760ea6bfa981c59e..5a5a1bb1a5911ce5a50cba74cb8de15fb281d8a9 100755 GIT binary patch literal 12489 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 literal 15624 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 Ql8QeVs9&#k)l@kC2WpNMjsO4v diff --git a/403.cpp b/403.cpp index a08e577..3e0bf86 100644 --- a/403.cpp +++ b/403.cpp @@ -1,5 +1,5 @@ - // //It's NewpixbOTTification Time! - // // Take a picture and add a newpixbot to it! + // //It's 403fication Time! + // // Take a picture and add a Megan to it! // // // // Requires Dev Image Library, // // //on Pentium III libdevil must be @@ -9,14 +9,21 @@ #define INPIX_MUSTARD 1 #define OUTPIX_MUSTARD 2 -#define NPBPIX_MUSTARD 3 +#define MEGPIX_MUSTARD 3 #define ARGUMENT_MUSTARD 4 #define SEAISH_MUSTARD 5 #define ANIMATED_MUSTARD 6 #define FAIL 900 #define OK 0 -#define NPBPIX0 "npb0.png" +#define MEGPIX "403.png" +#define XM 553 +#define XA 262 +#define XB 226 +#define YM 395 +#define YA 131 + +/*#define NPBPIX0 "npb0.png" #define X0 411 #define X01 21 #define X02 96 @@ -36,24 +43,22 @@ #define X2 411 #define X21 213 #define Y2 404 -#define Y21 234 +#define Y21 234*/ #include #include #include void mustard(int mustard); -void loadnpb(const char *path); -void npbottify0(const char *path); -void npbottify1(const char *path); -void npbottify2(const char *path); +void loadmeg(const char *path); +void m403(const char *path); int main (int argc, const char *argv[]); -ILuint inPix, outPix, npbPix; +ILuint inPix, outPix, megPix; ILboolean q=true; ILboolean inH=false; ILboolean outH=false; -ILboolean npbH=false; +ILboolean megH=false; ILuint inX, inY, outX, outY; ILubyte *newdata; @@ -70,7 +75,7 @@ int main (int argc, const char *argv[]) ilInit(); if(!ilEnable(IL_ORIGIN_SET))mustard(FAIL); if(!ilEnable(IL_FILE_OVERWRITE))mustard(FAIL); - ilClearColour(255,255,0,0); + ilClearColour(255,255,255,255); ilGenImages(1, &inPix); inH=true; ilBindImage(inPix); @@ -83,136 +88,108 @@ int main (int argc, const char *argv[]) if(ilGetInteger(IL_NUM_IMAGES)>1) mustard(ANIMATED_MUSTARD); - if(inX<=X02&&inY<=Y02) - npbottify0(argv[2]); - else if(inX<=X12&&inY<=Y12) - npbottify1(argv[2]); - else - npbottify2(argv[2]); + m403(argv[2]); //ok mustard(0); } -void loadnpb(const char *path) +void loadmeg(const char *path) { - ilGenImages(1, &npbPix); - npbH=true; - ilBindImage(npbPix); - if(!ilLoadImage(path))mustard(NPBPIX_MUSTARD); - if(!ilConvertImage(IL_RGBA,IL_UNSIGNED_BYTE))mustard(NPBPIX_MUSTARD); + ilGenImages(1, &megPix); + megH=true; + ilBindImage(megPix); + if(!ilLoadImage(path))mustard(MEGPIX_MUSTARD); + if(!ilConvertImage(IL_RGBA,IL_UNSIGNED_BYTE))mustard(MEGPIX_MUSTARD); } -void npbottify0(const char *path) +void m403(const char *path) { - //newdata= new ILubyte[X0*Y0*4]; + unsigned long i,j; + outX=(inX+XB+6>XM)?(inX+XB+6):XM; + outY=(inY+YA+6>YM)?(inY+YA+6):YM; ilGenImages(1, &outPix); outH=true; - loadnpb(NPBPIX0); + loadmeg(MEGPIX); + newdata=ilGetData(); ilBindImage(outPix); - if(!ilCopyImage(npbPix))mustard(FAIL); - //if(!ilTexImage(X0,Y0,1,4,IL_RGBA,IL_UNSIGNED_BYTE,NULL))mustard(OUTPIX_MUSTARD); - //if(!ilConvertImage(IL_RGBA,IL_UNSIGNED_BYTE))mustard(OUTPIX_MUSTARD); + if(!ilTexImage(outX,outY,1,4,IL_RGBA,IL_UNSIGNED_BYTE,NULL))mustard(OUTPIX_MUSTARD); + if(!ilClearImage())mustard(FAIL); + + ilSetPixels(0,0/**/,0,XM,YM,1,IL_RGBA,IL_UNSIGNED_BYTE,newdata); + if(!ilOverlayImage(inPix,((inX/2=X01+(X02-inX)/2)&& - (i< X01+(X02-inX)/2+inX)&& - (j>=Y01+(Y02-inY)/2)&& - (j< Y01+(Y02-inY)/2+inY)) - { - newdata[4*(i+X0*j)+0]=0xFF; - newdata[4*(i+X0*j)+1]=0xFF; - newdata[4*(i+X0*j)+2]=0xFF; - newdata[4*(i+X0*j)+3]=0xFF; - } - else if((i>=X01)&&(i=Y01)&&(j=X11+(X12-inX)/2)&& - (i< X11+(X12-inX)/2+inX)&& - (j>=Y11+(Y12-inY)/2)&& - (j< Y11+(Y12-inY)/2+inY)) - { - newdata[4*(i+X1*j)+0]=0xFF; - newdata[4*(i+X1*j)+1]=0xFF; - newdata[4*(i+X1*j)+2]=0xFF; - newdata[4*(i+X1*j)+3]=0xFF; - } - else if((i>=X11)&&(i=Y11)&&(jX2)?(X21+inX+2):X2; - outY=(Y21+inY+2>Y2)?(Y21+inY+2):Y2; - ilGenImages(1, &outPix); - outH=true; - loadnpb(NPBPIX2); - newdata=ilGetData(); - ilBindImage(outPix); - if(!ilTexImage(outX,outY,1,4,IL_RGBA,IL_UNSIGNED_BYTE,NULL))mustard(OUTPIX_MUSTARD); - if(!ilClearImage())mustard(FAIL); - ilSetPixels(outX-X2,0,0,X2,Y2,1,IL_RGBA,IL_UNSIGNED_BYTE,newdata); - newdata=ilGetData(); + + for(i=outX-X21-inX-2;iZsaK!6?Fh;q8R&#r-F_#TzfI-WeY$$faSqxrZ@9!Ql-90|Sd9kZ@#VVCd;& z;n+Kyg#*ZCU}9mv0;HH(STplVfIL=SpaLciRt^xw!u}tmgo!-Mh8fO+>+A` zaSP*Hpa91&xE#|&1`Y+F8H_d{38u-Xl(;?1K(YyjKoX?uDG*zLMC5_WI8;Gu6Z}DH zCo(W_GVTY-WJUu;LFzdASvU$nBIRJUljW4d8C55jDO<}v1c{!i1Cn1RvT(S~V&QlI z5|L#BnK}8KvIV35WOfx*VQY~2CbK|ttjs+NSvdG+O}1AFXVjWJUBy&&1xVZyD!T+E zyB1kw1xRH3=8r0YER!QN?+NK=ZsaK!6@>uxaDNZ!ku^5{wwmBaQkOiUFUtb%{`0>3Jy$+3=Axa3=9m(K-|;G z!m)QY3kQ(Nz{JA-3P>@tux93!0C}v+K$T1!ta2cVgIPFaz^I5=@g%DRF!DfOIAp0!fgrr$B505|IZgpD?lP=H-A(KWD(UbODxhaFE7_G$;?gFFDS~_&nrlp?5KHvv$57Srp-LMZ&(-$ eCjT^4X7rydYoyLPS(||&aI&DD@a7n!HCzBY>SKBU diff --git a/npbd b/npbd index edc3fa290c8a44a5a803d19465455bbbd984623a..7d3edec7aad615c59de63fd25e70fc816c6a606b 100755 GIT binary patch delta 1129 zcmXX^S!h&A6s=oT@AZ3SOUK|6?T!l_leW{^NsGHd#f*-L#HEw;YaJ&Vx40!yg1bh= zxL^j_DFZSLNOm+fe?-^r}oOA}x zNe3b0=Q(2z4>uqd7U+*Fqi{x#NKfKO=BLNNpkAGhj2@1yynGWitj48?$6QpXA(tMr z0;pO^5j^UMI41H$fd!epkcyKBsMw85kSFV@HASu}f;`GZ0MEy(GloeqPk&9Py0fHB zrOEaXG>dDomVwPjYNOS_%aI@*sa^^jP z>#3q& zXs5Y!=^Jv!{lRn9FubsxfC#EQI$t$XbQNfGtXfr0)oSQBbdh>W)fD9L0zA4{)##ng zrQJ0Y_#-r%gho|Mbcs(rRZq0er$4EcMC*OJR`pTfQrK_uH>d<1yTLzOoBBZ2<#5@I z+s=mUr1Bm980Db-$6l1h3?4@9Pr~%8ZKaNfhYgcrt&U|f{2SLtGbM|D$C7h^z6p;? z#wTKy=T^M7Fys#2(w+1l8YqMAG{Hk|sj>1KKc5?*?{Q%d9eu-;u-ff#w{2jDYyfgp+ delta 1147 zcmXX^U1(HC6rMA8?&RL-;-)dHX?CNL)nv2Tu-Qn^wu(kXqoy&*n(U3npM;ngf0Gc5 zRoX>CjTm8N5)ex%kMd;2Sr4vzLW@2LC^<1XZG&H%=y0ao$t&! zd-Jd1?rX?Zg7@>P43x(IZdu%L+`bx+e@=!P({-C>y~FuQ*w`MsY%wPG17qtsW09P2 z=BI?i@W;PF!r|dojIEbUFLp%Xj1Hx1ID*aTa(J%yr6ZpJmh!3rD%gidF^{>(P(dzT z-u{C4TC(6#$6A4oJW)UaChMuRZl01^JOVtqi%P3VRZk(0GE3q6cq(I%u(s%T>4t0% zacfJFlkchG!9_f6QFMzga8A+1izd(q$!`rQM+|Ad!A3>G9y&S3Y{w1}=@i|-OVZF{ z{T&Jiuu^>bJB9ZsymX(!657;dY}LeMmf{I&E59Vgm75fvCX1_vU58jqn(z-2T&u>@ z7Ir!5=Jmp!NOqR^Y2qCr-;(}&0#SH=LW+p5s8r=tzru&B)xY{t zX9E7xPFF?C|D=rjjW?)|abTH%2(mo7Sv8S$J!tc+t*VN$DVQ;Eo0_9+1LSZ39^J0u zdZeo&nW0?#GOP|k_ZM%Xg=N$bf zJSrHEp_k`YKeN%~Hcsi*JVXI`&^&IuumQ)qj;xz_XL13nPCvVdAfHrIX*s~92+`u zI5|9eDtU6aFP}NM#>$`TTM#g