From 092958d7aba352a00b34302117fec95330b79ab9 Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Fri, 17 Sep 2021 02:58:09 +0000 Subject: [PATCH] Adjust positioning, identify bounds of box. --- Meteo_Engine.jar | Bin 7678 -> 7807 bytes src/sig/Block.java | 2 +- src/sig/BlockClump.java | 2 +- src/sig/Board.java | 4 ++++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index 2c116f28b1fe71ace9ded74bd188d08239e51678..61b8f1b825cdccf300c2b0692e29e117c60c5d5b 100644 GIT binary patch delta 3011 zcmZ8jc{J4T9v&vlWUNibFq3R4CR?V)F3V8U$TrB9JulXBetz0=MZe@7`6A~+8l^QdUQjFrdt`*FP zT3o$tUXw}MkSv~86>{q^ahfYlknSiJ+`X)D_!+%$9@`@tcNpNz6(3HStNs!UX2)4@P{}iH z7=|bNp@HDMK3gD%U_5e+nzDdMTjx~mbj_1B@4}UoXE)EsDYZ}?cHXxwm%u&8G$H^M z`2yBDS(Gm+NVm|lO*c5BAi!uXm6dcOmVa48$Nt_5sM82Je`fN~?hd^(hzT0kLJJlO zG#3}trN%_9l|XqQW2E6GLbN#zYhrlhx8bh{a#*Y&@Xd;!dLz=}$(*cej4iJ=~GH{okCk3QT#(M*7CIl`>9|5*^7z_eoI6$EP<_`_v5(V_gfj$&@7qXMT zf0((qxu6p~+~M&IhovHXRmu&);C8b-=9N(8USz34%v$bYSEolk#t^)K$M2piEP0Pe z-NsIAOy8YUc@dJu!a(>K5+iY6@6f@?kLJPu}K z3Vxwz^$yrWH*sAGfRjx(7<%d#eA8LT-$7q#bU;sl`$&M3slF~lFgis(U3vSUp5Zmy zum^qj%N(fE-xH8mDCHY=rr4^uK7Oy(0;1)H9p*_sbKUjXk0q<6cULGZtHDbLHLDPT z{sl$q<07`E>8V++bc;bVGGM0QCHf-2$-Tp5f@2)k5~@-TG|osjrYrM2%63^wNSxF> z=%s|H@~)J<_|hck&|mSt|1t@jN~{s_3L%VI%zJNqwPu|#AO0})qJb0%@#>|?l9Cde zi`Nr=S*Dlj29|3)Dd~r}T*52txWXi)n94GG5T%VKp|pxmvDNO10RZ$&>!)#vM2*t3*vF|~VWY?!Jh2&x zW!Ehy+(T`jWy2y*#Y|loHW?NqEhSPE4?MJcnV{1BwLipS6zsE!xLW@}rtNvSVzFHS z%iDoHhdx`;^z$7fSM8{bAEAcqalP!tkSKeD2Ri2r1E@{%-H!WpI>wJPpSNBH4;nLf2LshT}0`q;eIvRVf+9RRNh)KK!Udq9@-cYpB6F~2NQd}+`415+A`rFNq7w|*4UDhL)NYFbg#Hj*(y1MHn>sP zVD{NI;B)m^-li!xL{?Z}YtpmuH1DOYw-q{d^BmM!ea6VQNZI+5nDu@cIzv%%11bYi zyupylQbUFpdgDJIGUVb59w}TodKc<9c9^W*zZk{vf`sq*hk86zB1_L@bDoSrKwV7qdQ-HL02eA zJqO~?@v8Egqh^_k!*gmt{HE#@z2l6K%U_ zqm&TB8?^PokPYLgM8#+=)JZvCVjR>ftPm~zexlb*xO*G>u^`RUI;UX3J5Y`=v2IgZ zX3b;nhTD9*;n7)3Ql{MqGrmeDyFc}e1PF4rB+k=4M=eM-W)A^jMndJ=iRz!O1Vg8UrF&U7xrNudq7qpoXkENfK^PjOeU1d{QKvbY^Sun1^o`jS*Wlnk~8FH(6 z$I-iD2*-_tyH^C2QSuae{~VSVjGEOsubUG+~7(3fnl9XE# zyuEIE@Myk)Sd=2R9H|9r!`AmJtvNY3%jaJ#?Jvu^=&8jrls$6! zWpO@Z<$US7!a|W2yy|?I>_(|USkUbiA`S!LCa2SS$++oF z$_H@MNtU>4$xN6i^m@Exz0uH~aP;h)2S!!{uPmUY6MVCJOjG}dz<0;5XVW!RcYdCY zSsMihV5GZ?Og#AVB?Yz-O)_>5?&i&O5$TEY-Nsw|CBK8jV|>*NP|%(4CGjKEglef} z1`tNqg(atA4S$UYw%=mZ=)SE@oywBxI`&(@ZwFno6^TRrmHh*4nwCO6HH35!k*KB8 z2O|Ih$9SASL_2kh7oTG>FV>_ZwSAH`y`J*;>Dk~{H?!*ZZda*OvH%Y~r526NGh@051AQkmv!e&XlKb4Mu4tU7P@ZRX&Z_zUMoX zh2f66iU=#8HFg%;aKnrIZ;XPOQA=svjd2lUYH Xp#RQmMWfh_MQBrKaZZNlev^LzdOvMW delta 2880 zcmZ8jc{tQ-8y>@qnT*{qlR@@fCNx-1q$+XfZSqmL|+Bd>|MM2AX2aKxl%0 zA-?e!l7{&CNf;&p090amRw>|5{(+J!^Z|og**pk=JTUYu+$a8;Pc9E%K^vfxY%QCX zrWMWku|7{MMOmNt`gz_~{?FI$H%8}xC=3{NRw_DV=1VdAbM&S%0_rEQ_pb5yqAuu! zuWV@FE_Y{oj8mQXk#k5b_dPr)6~%TH!;8S8{ZC^_2zUY@3#B-b=VfC>UC#BCN3Z!z zgwVh-J#{p0p&{g(>t^l=EU?C!AUhGr82NFvt8sx@x>>gw(~dlm`H_?KR(-KV*=qPu z5y-zNU35dEv!6)3FpGrlJf$)9ag{sD52eh~iH*5Gzh4x$S67C?C?1ShBxKb}r2gdSR=S4VEV=KwCc|$9}n?$bG`tu z-T`^=rv$aFafhg3TJe5Y?1=RNbR#HnVr{})>4tRnUuzGCn^wO+!v!q%=;cc(XQcFc zGyx?qmfm^Cz&xTv)vu>7n)EzAF>YcNp5!6#iwZPZDdMc8=on}44>Er>TwIv+9Xh!^ z94gI1rmn}~R`9o3L?$cynBt7qb;`ti_UQ)3T&=}qI(>9{==q-L#)v4>Q77Iq__~n{ z?DX3CWG;vCGmWaJ44*;E`ic({3(_l?WdKnCeX9>=}51kx+7=1a|S zY}X3y3HVYG=3aF2m1=10m*c8-Ej%4m$?RcQJL`mGs^q<4Z@U0^j;V=kVRuc;S@~MB zqv$4Oz*aORv!Y|L)zX9&hRG`_L^6Xw3J?(J-})ilVig4Ry@P%Hlw7=>0t0Vat()_n z=VF)>LLx5PDP%>IB;`D_FH20~;~D@LLB@_QN;2NnI%ia^2*?m%)D#X|Jt+|2U_t$TLtc=1&V*NQAuk(%IN^G1r-i?WJ9arXCCpqn$(CNkmMq32mW_%FYPmlts}dyfe0*Sgvqi?REYnuHWDu2^X*iblH0 zI!-E@(PenVY_o@xb>OiulloWvTpbAQig*dRaGfV;1cj(8c745V2yfdiCw&)ox4N$d zD6yq2#i~OyP=$D&29ynr4L5D8?Xk74Ox6Q~k8Ug~zwgO#kdAd|tn!R3nliC*ZK3mlG{jiIdx4 z;Qpj?^xj@le}Nh*q$@{fQl@_9`Z{h#pL`8_YM}lK*QVd_}imr8F$I93OBs zS|(NaN2B+)XtHL%lwK5veaWaC<$V|Hl8bU!&5_%fiVoSmhBCkYW<8{jVUQWYqNZS0 z;X{e5PUx}ryCLC~QEym3*G%+f?ncXSG6syH3X!q&?6IR{ z5j@%L1~~XG21G9%)zHDoag~Sa7U8&SX^{_;LfKwweSs@sU%_s6z+(_1*!~jp1d$ao z_kPz%yZ!@}C5@T>_!lcjYBNw`7xh<03r5ACq&msNdsSUUn~YHMaa%BtNWUL37I8m# zN3Glc_^7-qaHxu^Xae6yFb@cX`afCFZm|Y4{}U-3YzV+=&PvdRkKr4oh(Fm1H-lN1 zOi7uD+7P^X+xVU3$uY(dCbd}!uV-A(atEoytOcJ~)1yTbzL zn;yZm{j$Xtqn`YwJ*fbf2d@4lkc1MSm_uub|OL+;VvY4`k8ni)}sutAH0uXzi zbYyyLM>|KF{xA+ERB*@63q-u;5+6HH+1-6h*6Vtgc{-1YJ`_#6sfg+15E1 zKliUXa=OF;81d?iw1m!iKp!FCJYbRdh~jX1suYOz;}wsChbo&cTZoy4gO}6KC4DvF z6)Eo0OOV5K61vtg*hVAymtCtG)opi1eHOOmGaX3`cK@%6)qC1u%^oW2>Ln6RaI`xo zjvanU(%z+Qj!xsvKYc65D8G>9$x%r7us!hW_74scMM&h3wFqID jyhzhR#}3KQUqp{|RQPwDhA;*^h$h(zi$e7U51afA_`x0) diff --git a/src/sig/Block.java b/src/sig/Block.java index ebc3b52..c0f6dc0 100644 --- a/src/sig/Block.java +++ b/src/sig/Block.java @@ -23,6 +23,6 @@ public class Block{ } 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); + 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 e6e0074..1a9561c 100644 --- a/src/sig/BlockClump.java +++ b/src/sig/BlockClump.java @@ -19,7 +19,7 @@ public class BlockClump { } 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); + b.draw(g,originX+x*block_width,originY-y*block_height,block_width,block_height); } } } diff --git a/src/sig/Board.java b/src/sig/Board.java index 66f068f..b39ebad 100644 --- a/src/sig/Board.java +++ b/src/sig/Board.java @@ -1,6 +1,7 @@ package sig; import java.awt.Graphics; +import java.awt.Color; import java.util.ArrayList; import java.util.List; @@ -44,9 +45,12 @@ public class Board { 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)); + final int DRAW_ENDX = (int)(x + block_width*((double)width/2)); for (BlockClump bc : blockData) { bc.drawBlocks(g,DRAW_STARTX,DRAW_STARTY,block_width,block_height); } + g.setColor(Color.BLACK); + g.fillRoundRect(DRAW_STARTX, DRAW_STARTY+block_height, DRAW_ENDX-DRAW_STARTX, 3, 3, 1); } }