From b24c34e7a9ce14fc23f5a1764dde1c134913087b Mon Sep 17 00:00:00 2001 From: Wang Yuyang Date: Thu, 25 Nov 2021 17:25:01 +0800 Subject: [PATCH] add-SuperJumpPaddle --- bin/Scene/Objects/Player$2.class | Bin 1730 -> 1836 bytes bin/Scene/Objects/Player.class | Bin 12947 -> 12972 bytes bin/Scene/Objects/SuperJumpPaddle.class | Bin 0 -> 3588 bytes bin/Scene/Scene$4.class | Bin 1073 -> 1073 bytes bin/Scene/Scene$5.class | Bin 754 -> 754 bytes bin/Scene/Scene.class | Bin 8645 -> 9034 bytes bin/main/Main.class | Bin 4465 -> 4450 bytes bin/main/TextureLoader.class | Bin 3182 -> 3243 bytes res/iron_trapdoor.png | Bin 0 -> 207 bytes res/piston_top.png | Bin 0 -> 280 bytes src/Scene/Objects/Player.java | 4 ++ src/Scene/Objects/SuperJumpPaddle.java | 80 ++++++++++++++++++++++++ src/Scene/Scene.java | 36 +++++++++++ src/main/Main.java | 2 +- src/main/TextureLoader.java | 2 + 15 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 bin/Scene/Objects/SuperJumpPaddle.class create mode 100644 res/iron_trapdoor.png create mode 100644 res/piston_top.png create mode 100644 src/Scene/Objects/SuperJumpPaddle.java diff --git a/bin/Scene/Objects/Player$2.class b/bin/Scene/Objects/Player$2.class index d3954f0d4e3cdfb95843a1d19badc638cee2b994..c43ab09f9072c151f1014334f1c17a73893b3e27 100644 GIT binary patch delta 771 zcmYk4%TE(w6vcltop$VWC>61S1$kQpwD>?21Qk>&f(ob=pACT;7{|h&OcN!Lc$=rMHckZ3sbMpO2dE+hqx%l}Tu#F)%S?saH zUOUv;q23^yeFpnEFjk!1TuXzSFb554Y1Haw!A%;6beasw&Gz+Sr~J%5K7%71)oC%v zpw*y_V>W+W=Y&o~=j67>i#0^KGTDYVMed|!}DCYOon^q5@Xs@0_y_$~ib=$E}ktO;S)}i@)_F^K-XYZEG zvR*RF)}mLHFG#U;Z?N8KWep`#yQG3qN+tS}9RbSNBozc~wZbceD7U9Td4-NC+*fbd zT^ICDPVvIZbJmQ!$6GRsk{~tB*Ykmub}>&{`|{-tx%K>yKeB3$^aQR-x8Ln|cBiv? ze40!n!J0Tml_%3PM`n_aFa3!xb=b3>1St_4I1;Q)5QxmkQg?a41fC2W*m^q2uzov> zMj}FVaZh|5t4t7d|AJ+n!LtA86)3jEdD%W3h ZRoH4_Rd!J$S(Dedn~j1DQI;iH&Oezj`@cdq;s+?g1`a~o$e=P}=R&iT&GosN92%6^^y@Cn$=aEJt* z+U(G#OPif8N%Ah;?0S@~>uzVaLyt>4y;gn}Tp|>7y2q9l`iZ*iWuHTzi^qPK102-& zA&0{bM;!WR9v2Lw&;MaG=Z-3laa^&A)rvY&ish_OtR$_-(Bx253~)kml2d-cOxK>~ zj7A0(XF2C^UU7ko1}T5kNL4E?>6#(MWv(c$a?QZ=f0;4=i}}Vc1seSCfj=z?*~efR zRy3+dir}c8TJbWt;zf^aV#=3cjj-!|%g*&?B@aplcW4mnRTxPc$w`Lv)pdrv>uAzd zU_8V@3HClx2<7V|lP?(eZ`vJB<1EHUBK|i!Ik0$+C1rxGAur_FLot?4Oc8g>RF`nu z!twANH5ItD@UygVT~~(7R26j)C{tS|UYwC}w?x)m5fwlS9i+zZ3}$Zk^FYpOoMG-W zg3k>mg!x3c&xAe67*Dy!bNM?Z*-KvYifOTW!Gee%!={<_gjpo~4RT;MF-F-akt5yG zY?3IXSNwkvChz1fwTL2%w>@kTI6$iqJc56*0@geumSxFR*c$weV+y)WP?I*ci?`&m Obg)(;S6U>*%kvMFl4&yl diff --git a/bin/Scene/Objects/Player.class b/bin/Scene/Objects/Player.class index 97eec8a51ff7940b5334513b89e69b3d5333f431..51bbf6a96d528b634b013461615d5849000556bc 100644 GIT binary patch delta 1455 zcmWNRc~DkW9EN}Id+)jTeo~1jG$J^e3t}LpgqoxhB!)^^xI}6i?qP@(L&o@-p^+3W zUxh?&F@gx9EGh~rB`%5Rs9gTh@GhZy(F78qwo>C~@QY3w3r>n*%Qk9A!WjW9KI-KRA%RX_F{o)}N(nBicIXNJK zQYE2sSjNjSiIL+HCnsc%)XRKnkVSGqQskm6mu7Lv71<;$k}IuJE^T)Drk%VkXXK7F zNxNK@dvaIqL*yY$2t1*~4+GMLN64fH_GfQj-o&6;g1HqfEEOz4MBK-K@<#T7X;H6A?$beh31(;p zW@^u1mgb4MnjhwAA(*cX!-v`^#B1Y_puLSnS{xF!1bnO|AzAwjOSBZEXihBEmSdT= z0;yUiR%p3c>D2O(rtQTl?GVzn8f0i^uv)u>HCh|iY3<0=O{~|wkfnD=w%!Xr>3-Ot z2Vt{56gm1xT~>~mZDXyM4MWN+iE@TsC@jZcB5TY;(j9_*)M$y9<&925|b~EDWWh|h#k-{EEI(>``_B6iZ^F}uN z8avp}sHC59i2lY=4lvF#&}iU5;~ImEcD`ghVu;bfp(go?sTgWn9AUcgHPe^jW&k71 zAdWVjLl|j>Gs=8}W6fBOGv_ecT*w&H$%$qLCz)$G#mwZp=0;963;4cS!Z@>XOcC7$yNkYEc?4z)40rv=NDE2 zzqFE=8elEwS5_L+tSo+QZDqPu$ko-a)YbVKfw_trd?@a zZE5g;Ep&HxluJUExOG=ux~A=sWv=>wzD^H`uoIib!7bv!pQQ(Lq%XHhf96Us^CXPh zB%1m19=FR(7RUk?N+Ng25*Ep~+$k>Zl8r2uVwOlXOXVcXr#qQfpo+tS`EjG}Lf6$*77|K5x&PGPDiSO_tW7*6P_&1YynM-+vE7`&f zUgZ{EV?I5vvzVfhN}WApVw;+QS*fZvdN2+o2P*$+Ar@hGvt)_8AY|KHJH*8V4oW Y_PDm#FAf$*hq!`*0@1m2YS0kve-in2IRF3v delta 1428 zcmW-hc~F*B7{#A+-uJ%uMKTq`5~0yTTn0qVCDT+Sccl!B2A5P4%_Y=wOY&>n#gWv{ zT*8sGWD!IbNmLY51{ch7K`~`C7s^t@QYTls(?564+IBJpxe66CCWBh|ao&;RQY)wA zu5sKmuMf=mFGL+WTD1XpRTlnMMYyL*@KBw^BUO#Z>I$B!8az|C z3H6w^L%Plj9{M=1vYr#d=bSLscRKNTr#Blp{pjb!vau6Se`gY#I!O$0RV*;jkIvY(FRKs}IybQ}lk1P;|x8Ld5x(J36RS2I?x=lgmyN9b&h)&(4=%NVcE z@I!r$3A&mS^mR_uwVbRUaEhxr)osi~H-MkGq5RbC&Y5mc&UWA8Ja;hXyQAoFr|=6m zkqg{eTo~#u;1YKkm%1Cd%-zOhH-{*POwnUut+ZPd%4bHxy3zlpL^lM5;Wj`1n~gcv(&`s zpo!2A9t`7Q#IX!xS&oT3g6TYp#U?&0cpU3kfh?Xt34g?4oDn)EQ+PQeT;lsuX2-EjL|O zZu&8TNq|w>uuBAuat*<8u#ECC97n=7f9n~V(NL0VI<&@Y>?m%Xc>9Nk70wLrYW)X1 CH*MAc diff --git a/bin/Scene/Objects/SuperJumpPaddle.class b/bin/Scene/Objects/SuperJumpPaddle.class new file mode 100644 index 0000000000000000000000000000000000000000..a3b7f2b4c7ce706b55460799f6f2f68495ee5ae4 GIT binary patch literal 3588 zcmd5;S$7mw5dJ!uNhdQ6At4I^!Xg+aVHuVnN-%685FC=oAe*vuW;!z+n(m>ehXfQ6 z_YK7jH&pb+S4Bur&hhxcbgU2k@_tvet^;O-fy7$*VfBXqR zJHA%&WCShPr(%Bu+b#6Scoq*WMERO6WF z4T@k!ma|nbF(l-;>}tuv30bgZS6hWsg}EXyR|MuFC*)*=@~%kbMJitf4}}O$VK{;j zoK|s0#WM;jvWA(-dJ2?o1))@7z)-LxF`(y-xHB+hq`dsvu6UQ3&sqBEgqipD8Y9~% z)IrUSrfqti3Xa4A`5msF%bKZtU!WK7cTC%BAMCi7)qS+=xKwW4M_AjOG+|XIOxx%! zoER|Nz50MfPHnDE5oHDz98hP81Sjvu}KzQ0N`4 z6ZYNeIF_N?Ov$k0Wer!soI9y0D05Z|StDevkah(#lAfMA&g$}eOVBgfZrKqwrmSN7 zE00O`M3PRyO&Q&$G>5uL&1R)ktAcu|9&31rbiquPZnV@p)*p7YFb8;$P(eNr>Q?Tf6HLT$w#5BB) zH#EG7w^Urv@V0Q?5pq#>e^-pYhxZlCpE9wFtzRI1py5MY((n;J*6@jJ_o;@@a9PFY z8ot0;6<=z&g0B=bPusAWGQs-f6KB84SiGTvDjY&SnNpsx~rcsJi|44UB!BO z{H4a*{om$T4wEB1oHacjU(*zA&KF@Kg$7JJtst5)uzbt3Tkfa(hAC{ zsi0+I`cIL$MHUk+V#GoJJ}t-`xU5y+J_z4ZQ6yrzoKB%UHaMG z{i(2c@pxHAG}g+uOC{0yk)j7dqWF|ylc$T+e#4{}LBG%EnbzH!cmbbBJ;c|-_#ygz zsMt^F)G6I67=1jHhS;I0It~`|;nl)NVHv8VoH(kL%H_9$uQyga=?czL2=Nz~-L`D` ziZPV6-9-7pF@&xo{2ke4SV=mQuRdTtR5Wp$X2dyb3)HX*t2yHaScA3PR7UL_mHDG} zc$m6ka6LI<@I1o&1?t6MQ)mnolT4ORFu926n@~q@#AJJ*STb2(GFe|TS&zUZ4d4+x zN{}0jL9aL4IQZt0_DNbsAtx5hbt&23df02C5}sjU`}> zC18yuV2#+ss7TNoeTd-+5QWo0Hv@>932_Uyl1k)$XCx)6=W3!|H&9tK3tg2u#)Dq$X24E?VejT0OLb{vI?B^NibnrOca_QCxH@H(f?+CP7g16mQq00sia01pDk02Knu02l(yljs9U DGb0T# delta 45 zcmV+|0Mh@l2(bvTJOcrrlRX1F1)=~00;7|C16mQM00si601pDG02KnQ02l(Uljs9U DAY%+c diff --git a/bin/Scene/Scene$5.class b/bin/Scene/Scene$5.class index 09fa3f76443e1314014cadee07e4563a790d9f9a..d2d498425eb17b2b0e2618abca21186cc753272a 100644 GIT binary patch delta 37 rcmeyw`iXUeIuqlA$r?=7tdAL(nVw9}U~*-B0c5=dvScTpXHo_L@*E5> delta 37 rcmeyw`iXUeIuqlb$r?=7tos?5nGQ_OU~*+W0%RQpvScTpXHo_L

LW diff --git a/bin/Scene/Scene.class b/bin/Scene/Scene.class index dc0bcfea443ac3ba22e8e7aa845d8d54e40236b8..5e204c8c0c4700bfe0ce0f4fde4d839c53f6140c 100644 GIT binary patch delta 2063 zcmb7FYitx%6#nk)-JRV#({?+S3Z+Gs8e>{be`t)x2-vcXMT2N#;wBQIWof}e5hyAm zi{cwlbPz>A3O=d`0=uw9Rw%T)fKUVqC_YepE1=*LMMTe;ZFz*4$Zm38_uTKC^WC{K zsj{u*k*z1!t_N_XxX6cDSjS?$!ZT>mu|da1S*8IBZnWxXlclTJ@uF2hBFVWag-zJ3 zV~Z@k0gwZZb3!JPI^I>VSZ|f7{Qk5er$PqFQpibf-KL{mMUaQ2OkKJGGL=OlNP=;< z%OJ&cyeEV6X?MBY30c;c!2^^Z+}4{?XEaib3d$6v=-8o9#07WCvPqnH89TcaN@&9X zipVynxgvD%8i^8g$m}Gqw9;HMMR+=P+gYN!?9j2tE*1q5GWN=(v$34<-j`)t7`%c( zor&jwc6}h*obVtDCpnyS!uu2|Ig!@nfLz{JNi~z?>iAHmsI)=|RO2HZA1e$&i^3iF zgvEXxpDIL#@j-m1P|f;)Ox5%!dcyczk?4>?a&>&6Fp7KoQkEYaN{Dsre5Fv&aGUV8 z!Z-NVM>Bt?@I4OdIK&JeR+xz&WIsB5g$DfSqpTxxV{h*5sKR6}_)|z>3R+}&#VpAF zw8ZYuEPi3}t6bmSzMZY#-%(aNXlN{?c(GHcdOC zWju%3CTtdsSY$`sS9==qw?Kh?)K_3}@T7?sFjvPvrhpLkVfStMFJhiRc4c*VOt|Fc zs!`$U3FAu!4K6b=9}Dauo;p{f(Cl{4K5wINnL-loQoT=M!Py%s8^(sm4Qv=acJQ#_ z!|TGPaATp}uJ`RBJVMun*AzZ1GKCU`E=*Hoh)lcCTWHO}^QOoWerio*o5B(o*tdJH z3gn1xrpOf+nxZ>fJy_(4o~Fnb1*YhQHTH6EH`hy87~AY!C_J9p@W`6lShXtEZk$DT zjVaG#8pz56apGvIMcT*nJDTQpG>z$Kf+OvPVD3mRwvU>*SG-Iy4|za0yh74+Y&TxT zYvlRRgx5J2uQ)2P|zTdTP56&~~Fj z+k;!Ry%?hHLzTAwj47&liU>7Itzs2ccQWjTD{!qOwD_rsg2V(*#1GeGn&<(Z=rmD^ z7qtUa`p_Bh8C~axj5NC6i)O6pBq^UX|00r@SwV(yIPbh7l=}8Lsgx@8Z3bpBQYgkjQ2Z_Zv9+GiPW4aB4&YJ=clM@LU)+1^6QR}fd9?uq;aXb;n zlQC##!CY=l|8E#VnbCz(N+|xEE)bExOzP#S7$#cNV|bcrOV2uxKE$wtfr=gpifMQU U&yp^pkNRZN{0gbJn*zQ51y)?+XaE2J delta 1760 zcmaJ?c}yHt82`Q5$IkBCSr(>%6@l#5e+<+R6Jz|tN(Gh(sYXL;Bx*!Wt>V>sAl75? zsMU(Lb!?SG!TYwbTXv<3TUvH4(nVXXTJKwHJzCEy*6R1ow3NogndG~_-*>z>nenht!95Vu$2@nYrVcg9!Og0^3 zGTcMib#g0Y&B+WNqWJKZAcc1Hk&Oz<429@;O`)6%j?0=Q95|bmEee&CP)im$YByJo zEc=L5A}jOL?Ab(f$qeD?n6Lt3rp)Si-Kr3!5fa{zX*;ow@wUpEF$S+^P<4vhtxq3+IjCBZZIgiI;}^RN*sxuHy?{<(CS}@Rh8h zQ&w1nue}uYjgFlPtql6DLK}u;UHwYPxj~L;!!9P@5t)PUWh$GUVEqSqN}uEYk=5Ny z_Q*Npl^f<|Cv^P8g@(A~&pLk5@oTJC+pYOm;64NQGU-CM)tz&qy9>Vwlv>BBQj?9p z8@L~qj=cu{z@L`KJ>T^JR$I;PBKI0RC{Sjd;VQK{-Sb>sn6!4fcX+z+mw|nRHm1+A z0-lpf@Hh7B_{R`Hw;_bkbm20D6gixo@|6`BScz4Ja0{I(3XdVYLRp=j6GA>=7{V`d z4G~}|k4e5T4KYI$7@`nSYmcYU^$sh@y}krgMFN*nz@b5Nxqod1Dz()(U+b~ED{|oRywek!5A@{43wY6)oc5>NQ4Lh9 zr73~SD&n|23N4N+qPQ}St2*J0LfEQ^B(bO|ip6nUZC-QXe}x3D9mI80+oB_NQ&YV# zv;mk}6h~<>gtS4_YeUl-Y?x}W0WV?gfu*@1LbR^_sZPUioo2VnYiXrcujf_|Z9uV8 z8>V8Lr-Azqo(TL7c%BCXpo!39Z44Dgrd<;9#2gPDN(n{qBPq0>xH#-Od9ZHk=I!Mn z>FG|Qjk>ylcjPmdm^ack;LQw8LPI zHJAP`%$*KQyID;rc?AbSL=wxWm%CzEY%Y!AZr+kJK?D6yfFjJm5%kWqw$G|Ma*!+< V;^-h=PJgLZ;{1KJShJ5V`xmP%jyV7T diff --git a/bin/main/Main.class b/bin/main/Main.class index 53153134bc3e737d8552d9bb42d60566ee15dba0..a4527a81878adf0b403e91697a3659814db42e2f 100644 GIT binary patch delta 964 zcmZ9KU2KzO6vuz(Io-OxeWC3posk%^5J zne2iX8_|*wM~tZ#CT@MTt*gNJN=Vp+(JP5pCR6+X#jh(VK5y4y!p;BupXdKS&pGGG zxsv!kF&>ee!-st8@E+q1873S8l!AB;N#5}fp9T5c;X%qFTBtZw`ND@u|5)?kOCOE} zP9K86nYe|sktssZqN2r}icfs;O*3Ub~wkFXMZs0 z@+X5r^x5qGZ1?W$o~OIF@7nuR);fmx%jIu|y`I*T$rsvY@g*9dR0#*78v=(Ji^!5hrEU~uCLx%|liUhRE z!yap+i8(EGqn3)!YiKu@NY5pCq#KDj24-I?VC6`SXeQjgE*!4VUZ$f+{Qt}LN1C@K z{1OEc*R@BlYq9$K9*@Ojm&f{OxKVa~jSZQu3LDF8vKc9FJrN6x zSJ+ZztDV&jGf=Ew+O)jPBREWaIC)PhfOJkLVcNbVASR zdA6av2-0U41MVhD7YkU%LY9-Co_{d+uX&rRCQscIxMn^O%qQX+Pv)7jM9guCny;nZ zT#ycPSr(XoB(4GJ)Ue#5H_1Z1OK#Jo+@Wb%tUF|h4$4y9DP6i-mg$hJ(3hoKN8}zo zB=_nOxlhNWM~_Oceq{N_vQj6WlvR3CR_i(G)AN$lX<4IRS^kZr^;=oTOSbD?TJ)&h zn^$=a)#*9r?-2)h9n1mQ!5h4Zm{Hlnh-HSiZ04PGTs5Ql{^(RZ-TdC>%FKpTJ|0VT OCan|NxW5^DXXAg$Y4U#n delta 968 zcmZ8fS!_&U6#mYCroHCQW$v^w6(Sf7Vrf$?skN42T6D3zOo*72w1i5kR7ec9#)E`O zF(eWpnFdMQx!f6TQQL#?)`SPkgBbf(%Y%gBztgeA%Xhx>e`o!3o_cycZB7a*XjM^+ zHVfKSoIzB@F&HZRxTwO0OA1UCB{*U^F$HlIb8y*?40NdIM3)6uEcdDf*DUC^-8>4| zZn-7gc6P%qYhAbChJu?aD$#89xuxK?3gZyDZC--DF0dt#zdle`lfSICeobJthDIbb zJjYfIFYr>sD~r9h;0?AC92){_>+;JbB8AJ2lzevQIv z5r*fFw&;)MN**^*?xI=)6}ltUcECT|$_c{A3r1094f#`US?PD#SGjC$F;vB|Snev9 zDT^fERZK9kG?GlDLz9nEp_#K>Jp8}V8|l!F)ZZ;@hv389!soGsySRt%V+k1B0Gfj; z0Arzt%mLxxH_?pm;v{~EQ%H)l_$kg2M2s|XmHLb8

*E7mq1RBq&>aqk&B1W+&ya zn+EeR8p1_1jD0kct0*#7 zMhz8n7ft1RG>v;`Cf}#&{D5ZgL&=}eJbp$#Y?tE}A%ic-+u4a-V1DqMS+|5H>;^;= zRbvnKg2X{uj(w5|?3bCNko`k6hYIv=cWL@x)3?%Rd?Cf<%_)(QKtD`Q+oC@E3r~Od A$N&HU diff --git a/bin/main/TextureLoader.class b/bin/main/TextureLoader.class index 9a9f2eb6547440f31c91b36b231b3de560a6134b..8cb7455a07ad45c77e5dbe2a5a8ea1853bbd9ca0 100644 GIT binary patch delta 1127 zcma)4*-leY6kX@`mOJD|Lrsjz1E5u)MJk90QU_4fN>OkE5);xuHJC`7QpLHBh%;D6 zoaKQBU&JPrXyl1RqV@|+`~(wUjZxRR44N1dAMW1!?6Zfp*12EiJ)ghe{g2mU0Ln3B zVg;HFMlCv8O_UGhHSEz5*KttCAssy$4x3nrW*tYQKPt^J9ml0Vq2Z*7A|!O2GI1Jb zbeuJD4(E0B>bPK{4;M{b!etXza8<)K4cABBwhHG-fnedl*FdU6afsYisJ2jnl>)Ov zJ>l-if$-i?d$=Upwa-Egf~j6dpUBPbj77TI;;~S)BNB?zT3+rk~(O@4M3dGA>m zL{PxdxOEeU#KPS^4ficPz(Wm>EbPEz4NojQ#j{jdR*RA-r+R>ZDe==+@}!^&PR67~ z>u1JCFX)|~R}dq1$!gjxJDH6&jIGH6ti?K>4Dzn!AU2B(y~13^lY-)Mj6!uerOBd6 z8peqxSDrlP)2RNOY~{lc+;6b3^%WMm+-WS%Nn?qtfI%9CtT`vd@Xt@f(1YGIJR@AI zVjS=IiYg?iK`cpTj5g;o^q@3ZYR*YiQmZQF{TO1!82vcbv!ezR1o;sgYyx?3P^LoO zY~aiZPOHO4n^Xpys12~0-y}_$sp2WXZx+<=cp$!^pjN{cbxOf{D$1vq5+qo3nSx3U z)_Yt;UF;|ePBUCeVxDPoB`=|PUB2nNWq;n4j-o7$<;}n4U%&?dkr+glODvVBCzAj< zHQ0>iPOePwxRr$lA9NcdfkvKG`XU=-lLX1kQDSt^7f)ksAev(De}b9IZg8@JCgk%! zE1>sc7lDw!)Ru#%fXHaO4aC4A89bF7pzn4Kfttkw-8FJ Y)S+T(y?bW8duDykU+V=i%R#$;0h}(xNdN!< delta 1040 zcma))Nl#Nz7>3_-d)qtYMx`+XA%-HALR&$rGAM$AQbmS3Ff`E^Vu~B5h>BLUqKGI} zf#QJU!UYRABBl_CEM%uY!Igi&A7G67-dkEpjEReTzVi*|`=0mQ^JdMr9M`9xa|-~r z;FXTeXwwityNV8-wo^q|9nEbHDLAjgg*FuzOncE>dR1I9?PUc~9Ufd!(Wm1ouBnLW zxQ>1mH&oozF@Re-260=*5bh|rt6+F)F)T!MdaV=^`IV?LIDM&zVz^?ylpJ z(zB;e7^p?#blf&15>@u`)p6W25XXH1IhB2Yk;GSf&Z<#V2}nmu6^t23U_7BYN_-Cu zJVK*@Ez}a^iF1*jG6jzfJi&y5rv?t-nS$pAUf|{QQAekAGC=i!fNsLjmeZ3^0Xz3( zz8s<}5(1=xWadKyLSWFsCH^RyCUi-`hlBq&$sWl5i3 z!#xjIcm@T|bx9QFCE<3i=O&4wS;zxIO#b>Z3AM?WMDY|m%b3FlUbhT$?ikz&Nk0|~ zpqKc4MDHj3AmN9JKEkOJtb0#8hh02Ziv`krM4d(If{h)DnW4Mk?q9`K^Hb17qSlJar28$|#R9C}AJ(j(;pAmH>83Y`xc6l7!b5XiDp(ltOP> zqW>KvpL0VxSGqh`Hj9l(Z0h)P&$+y5kVGR{K3OU`v3#%9v^eg6rQ&C_6K4Y5`f@I`sh3Lg$-?v{<0K+Ijp0?|-t zAxX=SG@d=Ugw#zS6Um)H`Zvy7)=B0&XrLTYU%P@h7@sPLO%O64E^Y{)Lq7)WA<`Spd}2Ru6{1-oD!M< D>;F)k literal 0 HcmV?d00001 diff --git a/res/piston_top.png b/res/piston_top.png new file mode 100644 index 0000000000000000000000000000000000000000..320c97b42b485ff733583582bf4d2cf004c25959 GIT binary patch literal 280 zcmV+z0q6dSP)r&ph|* zv>P}dHw(Z4SSt_U47k7oct56r*Zt5hr){q|f?VKs9B|;3=WRdsSo!Lug)e)Vivmhjc`nmq#8BYfXV+PZJD|Bi8!3@Ztz6Ol%0|jVVkMWoAd-zL z)638y(m0V^s2otvOG_81JSO8c?kheGk`E6h{~M^G;Fm-%!-p-|SV`n>tp3ExMjaeV eB&Q`XkK7kn textures) { + super(origin, position, scale, textures); + } + + public SuperJumpPaddle(Point4f origin, Point4f position, Vector4f scale, Vector4f rotation, HashMap textures) { + super(origin, position, scale, rotation, textures); + } + + @Override + public void draw(Integer delta) { + glDisable(GL_CULL_FACE); + GL11.glTexParameteri( + GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, + GL11.GL_REPEAT); + GL11.glTexParameteri( + GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, + GL11.GL_REPEAT); + Color.white.bind(); +// Color.black.bind(); + //bind texture + getTextures().get("piston_top").bind(); + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL_NEAREST); + GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); +// oval.DrawOval(); + + glScalef(1, height/2, 1); + getShadowOffset().x = height; + getShadowOffset().z = height; + cube.DrawTexCube(); + glEnable(GL_CULL_FACE); + Color.white.bind(); + } + + @Override + public Boolean isHit(SceneObject other) { + Point4f o1 = getWorldPosition(); + Point4f o2 = other.getWorldPosition(); + Point4f o3 = new Point4f(o1.x, 0, o1.z, 0); + Point4f o4 = new Point4f(o2.x, 0, o2.z, 0); + if (o3.MinusPoint(o4).length() - this.getScale().x - other.getScale().x < 0) { +// float speed = Player.frame_delta / 1.6f; +// height += 0.01; +// Scene.player.move(new Vector4f(0,height,0,0)); +// Camera.position.y += height * 90; + Scene.player.jump(4000); + } + + return false; + } +} diff --git a/src/Scene/Scene.java b/src/Scene/Scene.java index ae5446b..c80b41e 100644 --- a/src/Scene/Scene.java +++ b/src/Scene/Scene.java @@ -649,6 +649,36 @@ public class Scene { } }).start(); + + sceneManager.addSceneObject(new SuperJumpPaddle( + new Point4f(0f, 0f, -3700, 0), + new Point4f(0, 0, 0, 0), + new Vector4f(190, 10f + SuperJumpPaddle.height, 190, 0), + new Vector4f(0, 1, 0, 90), + textures + )); + sceneManager.addSceneObject(new SuperJumpPaddle( + new Point4f(-3700, 0f, 0, 0), + new Point4f(0, 0, 0, 0), + new Vector4f(190, 10f + SuperJumpPaddle.height, 190, 0), + new Vector4f(0, 1, 0, 90), + textures + )); + sceneManager.addSceneObject(new SuperJumpPaddle( + new Point4f(3700, 0f, 0, 0), + new Point4f(0, 0, 0, 0), + new Vector4f(190, 10f + SuperJumpPaddle.height, 190, 0), + new Vector4f(0, 1, 0, 90), + textures + )); + sceneManager.addSceneObject(new SuperJumpPaddle( + new Point4f(0, 0f, 3700, 0), + new Point4f(0, 0, 0, 0), + new Vector4f(190, 10f + SuperJumpPaddle.height, 190, 0), + new Vector4f(0, 1, 0, 90), + textures + )); + } public static void initBackground(SceneManager backgroundManager, HashMap textures) { @@ -691,6 +721,12 @@ public class Scene { bookParticleEmitter.update(); bookParticleEmitter.colorVec = new Vector3f(random.nextFloat() + 0.5f, random.nextFloat() + 0.5f, random.nextFloat() + 0.5f); + if (SuperJumpPaddle.height <= 10 ) { + SuperJumpPaddle.height += +1f; + } + else{ + SuperJumpPaddle.height = -10; + } // rightParticleEmitter.update(); // leftParticleEmitter.update(); // backParticleEmitter.update(); diff --git a/src/main/Main.java b/src/main/Main.java index ad6821f..080af05 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -246,7 +246,7 @@ public class Main { } }; - new Thread(cameraRunnable).start(); +// new Thread(cameraRunnable).start(); // new Thread(light_anmi).start(); while (!Display.isCloseRequested()) { diff --git a/src/main/TextureLoader.java b/src/main/TextureLoader.java index 501f1d1..50065a0 100644 --- a/src/main/TextureLoader.java +++ b/src/main/TextureLoader.java @@ -45,6 +45,8 @@ public class TextureLoader { loadTexture("new_face1.png"); loadTexture("new_face2.png"); loadTexture("new_face3.png"); + loadTexture("iron_trapdoor.png"); + loadTexture("piston_top.png"); //sky box loadTexture("skybox/back.png");