From 6179f12dbb43223e2689263379561fe5c52c0a67 Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Fri, 17 Sep 2021 01:10:02 +0000 Subject: [PATCH] Blocks render. --- Meteo_Engine.jar | Bin 6755 -> 7364 bytes src/sig/Block.java | 6 ++++++ src/sig/BlockClump.java | 6 ++++++ src/sig/BlockState.java | 33 +++++++++++++++++++++++++-------- src/sig/Board.java | 12 +++++++++++- src/sig/Panel.java | 2 +- 6 files changed, 49 insertions(+), 10 deletions(-) diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index feff0c0b65d19d53d23175db846c94bd9bd8c3d7..db589e5cf55a881dc764196e7bed7d258fd1b720 100644 GIT binary patch literal 7364 zcma)h1yqz<_dYEHLkJ8ET|;+?Al*YtDBayKfTSQXB3&YlfQ-^09nvv`bcldTNePUS z0>U5ez2Cif*Z=$0@63AFIqFh3*(AW(}BhKkV)((9}4?7 z1(6Evd*{GNVq(h4qJ<_8gLKt&_Whgun*MOD&s^o1;ng1-T|L*X;h~{jxqH8Y|F?Z% zUHuAkwCDTBdA@(`oanC=axU)H&b-zxmM~bb-nP!9Ht~g=eDVxhk+uS_*LU*4A~V#W z;*&HIAVn4ijsn0n(!n)@gezVPCKoWMxP_#HOz6A{_ zP=L}?S|9}ofOFvFSY|G9gfm(z^_7Kgxz765V1)J6*W9KZ1x>hX*uk-ITWYqx^^E47QdNt4wx$H4tS+eal7D7rk14awbJPQ&Tcf`8~?Cl?YDz}f}2$WQgT_#s= z*jN?C5_Xd8qdt2_`+n|coI@lFkAQBiG_J!qXV%dz(MayC;|d?|?)1MT}EmIcMJOeAu;PvTRCY+^8+ zByvVTmD0RRNct_1{ z&1&*KVoN*NdO6m*dHPn=Yo$*vo0UH)w%@U}sA=_sOBk->V@5Ie#1*x^V!>%O-GFFE zE;letZKHswB1cL!iTpk0iSo+woZIM~{V_i_tW3mqgy;tJDHi=)1rj|%Wm~F*$@L7S zs7l;kn2AD7&W|=6GwzHtqElItmH@U@*m0$|?#B?DPRq0i-&KB#Q-UnKjLJ(a$7E*= zp?rcARk1a}Ee5rh#Aa%{_8wQ8D?g^}g|@}0(~zJ8{UR0`noI<$=ls2eS# zNV_wespuPQ=?~-Kj6Vzrcjq@&bXU1XuueoT;BD*{W=`bWEJIuFwxMsvH#@U zpRwfMjJgg7*PQ!K!l@-SvF@InGg(u2G;{%ah(tU_Ct6Uz0A{ z09Ak=!$iWA29EGD5>{0GHCX=WGl|dr20= zq_pZ?@*YQCVB*ZmHl-Gg)da|ju2VJ_mRExmDgB{vwO;OCLdaoQ{rx!&=RSOq9Jco! zrOGhz`9)W9T|_>G7tnM(sae^KXVuDwM}O@-)s|V;Zq;YPlHH7IeR&?&%?z)gI4QbP zN!yZ)9G^NHeTFcj?}%s+b7A>LYe6W;mcx9GM+3!9!eo#(79#}+$5m?_9w6=lN|r}L zI0K|gDSxOdRfVP&p9z{$7inBHpJ9z#Vd4`N?b~mleo-Jwm|fDT}{x- zXg~ZRi5~!7fnnU>E&@XJm*s22NirB+-4DvV+(~3AJoz&}mv&Mf!aZQuTP-C*StF#IJztcq5+tSZv)=tOt(M^u98JiKA_y?NVh=>ZQwBhoq^kU1wd+G7M>OGm=Z`y1Zmta z&LY9cFe(O{zvYUg2v{sLhLK39WgMnP#CuCUA5=wA6|1v0KvjA3kcfd5Q`6B(ySp~~ zGlNu6f0i7U$aok9=No&oauiF6N@T~6b{AFmOvX)&Jf%y^#1z{c-HepOr336_;> z)HokpsxPD_3A)N3cedk7dKc?rP~_zS$^C>%1jcX8L_e$C33EPTk3 zUf9JbDh(*Q&toveLf5dJ2ZO^zvX|T)mAd66lE1jWpXHC~r{Z0H2Io*8@++|fPP#Pp zd~AdhTSwIaW>^jIYsl?flk1=}^#(Cjo!uSrOSzaSpM2ygnxttvOENX6!v-`8@|wekM@q{k#Alst>-6zKkKSQ)u@VRtfs z@2zV`oU_qs%S2I;c+6QL26_sOhFQ}y(DTk{?TICMjAh3JR~M%VmQ>}wnt{KxpqtG( z$+KCq-=mgL()JWxIs+a`ieo$Hvc?0B@OQTym>3$3J;vr0626#q_OG#?Vjbg4v(58S;+$VhN)F-^eXB(&JU<;@Ba2qE_^bK{;AV1)3 z+{PZ`FKQum(cTzmK$>3?+`MSfO}1N&rkmPRI^?J|lv@e+mOEKb`=z!yX2tQ=sZYvoPEM2EqVV}@vc+cc^Jyv<+*U_hDpd$?&q@nLDtbtQ(i8{;t z89K~@)6^TdV^lLSeykThW!h#gP+MWN>AMww%Hm#k>Qsiyacz zBL1%Hyn7#-u@t)`nF`!c@33>Iy%9++d4M+iuY2Iu$tkBrD>sd<|V5OC8@&u>%{ua#@6u0^5Wn5tJC-l?dh!8R9>|lx>go%zhm% z=^Um~&AUSC!XIJo5@+x+wK`JEHV8gytA~mN#&2bWv{${!LG;eYovZp7m){Owq6i!z zrU$2~Pk%vZN_yL47nv~`s)$zVR=w(;fGtHgy+;oWcUF?T?I!=R#*cZ<5PnE2LJWEpd@Wqr2yk-6_`D)VdC%>o*K6UHD~3m9s$5bLovVP|SA_6tF~ z&hl7e6gxBlyE6H}2*m--!-hhk9!uS3E;NSPx5e*Eg|T1@Hz80(2j(I;x8^o2cga88W*iVuFLye$>u2+1fC~6)yIB2 z?mWNSK^z2e_O_d4#z;W>Txbb7%;{SZ(^=?R1~DAIuj}70=wi;cX7`)OWqt*2>yAh- zqI@i0@I@n#t-nw4?$Vi%QeO6jn1$7prkG-#*5o5>F7H&la=l{0`%v79*NvU&5!-Bf zkZywcIuy}$M9|z5MoeEt1bm$TRj=Out6tTx^|p0~2>j;`XskslOLl?N?9yWD`24M3 zH#wG}Oc}clmf|XcfgRA(b7BGa4Sl}z&F<0m8vV&e_-NaYvT-@#@3&6q&*`P|?bDQ^ zNJQsg()Mj)_I7Q1AwO{}uoAov5Ee_xPY4evtH#|e(88&v8rlWZnI>&%<#BX2)Rv={ z6%{L31M}a}`1Dy>Q@`sINyIAr=Jj&wZ z5c$&Jo==zQi~=kASn_rQNz0by&AeeEZM(@uVsD@Y^?2gdRNsFb2_92RSx=W@+Y0RU z48Dzuc(f)K(pfx`&D~ws8EXrF=*gEZO%73bwoY zh9^lYP*S3#*IzH@G)MWvn;434?M&$4Og2cmG=q6OtV->a(uI6Gqoc{9_D2*%ODcm~ z+x#T@@K>u7#;_8m+)k^)$nOi_1DO*&0VaA`8wY9jZNFYn3FUp;&Qhmu3&)WVH2EU| z{7Y*m?@W@>`It)>8}nXAPh!m_!K3u$fVMfkAMzHmAfAp=PPqKQdiQk^GAH6UwaD+1Zq=-RS_&j&AtW?wtpy5${@H5-xs5fWO=| zdX}pkRxA8un0T1RwTaY}Y)*c?jv~PWFuGCnp@YHp$U5s2F}*w)whaf2KINH0*Lczy z)YuuJK3(8u0?B;|3iQyedkW!ttb(GxW)EUnKk4$SjLp9iQU1Gr@;iG3|HGa|&1?3+ zeHVRO#&AAjL{~95py!8uP{qeplpzK}sY$!1YjaYc@3_<~QUznuhdR4A&BR=>2R#V$ za}U?Sx3tjP%aD8P!=mdUBXjiY=IxjU9r&O^s$}q_2hj=@n3c?LJ19h4eJmJ6Bpks{ zE;m@1^63t!t5%ubDZSH0S<1-Z@Y^eWiHWhNSCRxLIoORSW5W9(7^8S#7TD?2!U-;D zL6B7%9lrHYZFRX#;$f7W-?H&zaGcKFwj$t~#__!LK8pR=w;x%C3Gnvo^E( zCSJd+n0>>bA4W_4!3Nys)y`wObhjMNRYJYTRj`yr=Z78~kcG zGJ(}xq($<|D9-6R&3qw z_Gy|d_#H|%&J-Q7-w>MF!Ug1nRpvdJ`AJkK0nID`l)}c2uq{ zf}9kk0H@c&Ue1VEw;UdfveN9rrxZ|EOMj8n5vCnOl4f&YW%Nc7-I!bz#L1{bGJ{{Zf;^n@`pmHkw8NR z*FzB>$&Kg!&0>ATnL_H_Irga6O7&ojlDdA%W$fSQsi} z-J2pv$(KIto0rm^b=;43)+MY7W0hzy-a`$7N-g((faI%?io0IUay{(e-t@40jYGs@ zTD3yQ78pqn`D4$3l9vylaR(L+u&?O0Tw|pHcpTVEmP7XTU&UiEYz5~)l7PQ#d zim7BS7P_5ksgxuX`mWzvS6X=MAVvPkEdD7V#iODN^B`{hyINf^tW5{k0@QY(-WLZp z^~*1IdfO-6;ZpeJjlDD(4Eg%|QvxeHr@kL&ld6$CvAX%X6tNqeY)Q$P@fM@IUSyIlv4iiw@w znkx8OgxtgGID_&? zzv4Ir*KB0whGXFilL6M#i4~0l_t!1K{RhIHEVNEm473hbD5h#k@1)(xFv#35zc4O? zmuagU10w1ZIRk}w1eF6H3-N7VqNVKWrO)sht?q9TD)CMS%@pwSX!_>_M>q=~jg=jL zvyT|j+Wdn{vt8c8L|0{5=l_XI+Lms%E`M^#G*L|pLx3z&%by_DR!RH&ua9xWIdS)5 z@u9+CVOH=lHr1Oagc+1QjX(G{F-Ryb&_Ytb`wDVp)r(0seQpx{_4C&$jz>H*wW1!k zo~wa@P{JXJ;D@UF-H1pY{CQv`evy9AK;ofhF4(Kwf`M`&e&WaDJDUTj`v-licXji< z7w}joWz=Yerdmg8{BF0U_g`qRBbcWXGFiKJacZjgDxY_LyOqCoGOXv7Y9W-$ByzB4 z!;KkF`^_tL$>W>l=PvYq#_U=MI%Nq?@L^%og#6_lk#dzj(?g}7{*{Y&Gz=3gi>w<< zWg^1usFEdAh~xycgyT2)qWQVxpR!^+c@<;>MRyAZJgBt!Bv?)%%T z5HLY**K0Dn<-x-~k|wQHYJ9SbLfciSXX9!!^m1DII-PrtBZbA#(a=h-9&I&r3^KIe zTS5Qn^IW%rejk7LcCH&k|AyY|!(1!B{|w2i>EF;BZJ}!mcxeBF_o9raJe#!|GQX{~LTmxc;|=n?l3y7GSq-Sh%6- z{oBILi^=aB*t&WzfB5i^Jn?Vv&ARNm`ub;_6aESQ?I!bY_{~iAJ6xRPCj75b?%(j6 u9>5`C;770NRqy$Al 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 LuClY7^7`sO<61;6 diff --git a/src/sig/Block.java b/src/sig/Block.java index e101ef8..ebc3b52 100644 --- a/src/sig/Block.java +++ b/src/sig/Block.java @@ -1,5 +1,7 @@ package sig; +import java.awt.Graphics; + public class Block{ BlockState state; int x,y; //Relative to its block clump @@ -19,4 +21,8 @@ public class Block{ public String toString() { return "Block [state=" + state + ", x=" + x + ", y=" + y + "]"; } + public void draw(Graphics g, double x, double y, int block_width, int block_height) { + g.setColor(state.getCol()); + g.fill3DRect((int)x+this.x*block_width,(int)y+this.y*block_height, block_width, block_height, true); + } } \ No newline at end of file diff --git a/src/sig/BlockClump.java b/src/sig/BlockClump.java index fd8d96c..e6e0074 100644 --- a/src/sig/BlockClump.java +++ b/src/sig/BlockClump.java @@ -1,5 +1,6 @@ package sig; +import java.awt.Graphics; import java.util.List; public class BlockClump { @@ -16,4 +17,9 @@ public class BlockClump { public String toString() { return "BlockClump [blocks=" + blocks + ", x=" + x + ", y=" + y + ", yspd=" + yspd + "]"; } + public void drawBlocks(Graphics g, int originX, int originY, int block_width, int block_height) { + for (Block b : blocks) { + b.draw(g,originX-x*block_width,originY-y*block_height,block_width,block_height); + } + } } diff --git a/src/sig/BlockState.java b/src/sig/BlockState.java index e49e35e..4876b6f 100644 --- a/src/sig/BlockState.java +++ b/src/sig/BlockState.java @@ -1,12 +1,29 @@ package sig; +import java.awt.Color; + public enum BlockState { - RED, - BLUE, - GREEN, - YELLOW, - ORANGE, - PURPLE, - WHITE, - IGNITED + RED(Color.RED), + BLUE(Color.BLUE), + GREEN(Color.GREEN), + YELLOW(Color.YELLOW), + ORANGE(Color.ORANGE), + PURPLE(Color.MAGENTA), + WHITE(Color.WHITE), + IGNITED(Color.BLACK); + + Color col; + + BlockState(Color col) { + this.col=col; + } + + + public Color getCol() { + return col; + } + + public void setCol(Color col) { + this.col = col; + } } diff --git a/src/sig/Board.java b/src/sig/Board.java index 5efff10..66f068f 100644 --- a/src/sig/Board.java +++ b/src/sig/Board.java @@ -1,5 +1,6 @@ package sig; +import java.awt.Graphics; import java.util.ArrayList; import java.util.List; @@ -37,6 +38,15 @@ public class Board { } BlockClump defaultClump = new BlockClump(initialBlocks,0,0,0); - System.out.println(defaultClump); + + blockData.add(defaultClump); + } + public void drawBoard(Graphics g) { + final int DRAW_STARTX = (int)(x - block_width*((double)width/2)); + final int DRAW_STARTY = (int)(y + block_height*((double)height/2)); + + for (BlockClump bc : blockData) { + bc.drawBlocks(g,DRAW_STARTX,DRAW_STARTY,block_width,block_height); + } } } diff --git a/src/sig/Panel.java b/src/sig/Panel.java index 6337878..4ad5d14 100644 --- a/src/sig/Panel.java +++ b/src/sig/Panel.java @@ -11,6 +11,6 @@ public class Panel extends JPanel{ public void paintComponent(Graphics g) { super.paintComponent(g); - g.drawString(Long.toString(Meteo.FRAMECOUNT),0,16); + Meteo.b.drawBoard(g); } }