From ece217c7f640b0418ea3ef62a30b929a35955588 Mon Sep 17 00:00:00 2001 From: Sebastian Cabrera Date: Wed, 28 Aug 2019 23:07:02 -0400 Subject: [PATCH] Change project structure & added GameManager --- .vscode/launch.json | 4 +-- .../bin/bz/bronze/pixels/AbstractGame.class | Bin 369 -> 0 bytes pixels/bin/bz/bronze/pixels/Gameloop.class | Bin 2788 -> 0 bytes pixels/bin/bz/bronze/pixels/Init.class | Bin 793 -> 0 bytes pixels/bin/bz/bronze/pixels/Input.class | Bin 3536 -> 0 bytes pixels/bin/bz/bronze/pixels/Renderer.class | Bin 1043 -> 0 bytes pixels/bin/bz/bronze/pixels/Window.class | Bin 2167 -> 0 bytes .../bz/bronze/pixels/game/GameManager.class | Bin 0 -> 1815 bytes .../pixels/{ => engine}/AbstractGame.java | 2 +- .../GameContainer.java} | 16 ++++----- .../bz/bronze/pixels/{ => engine}/Init.java | 13 ++++--- .../bz/bronze/pixels/{ => engine}/Input.java | 2 +- .../bronze/pixels/{ => engine}/Renderer.java | 2 +- .../bz/bronze/pixels/{ => engine}/Window.java | 2 +- .../bz/bronze/pixels/game/GameManager.java | 32 ++++++++++++++++++ 15 files changed, 52 insertions(+), 21 deletions(-) delete mode 100644 pixels/bin/bz/bronze/pixels/AbstractGame.class delete mode 100644 pixels/bin/bz/bronze/pixels/Gameloop.class delete mode 100644 pixels/bin/bz/bronze/pixels/Init.class delete mode 100644 pixels/bin/bz/bronze/pixels/Input.class delete mode 100644 pixels/bin/bz/bronze/pixels/Renderer.class delete mode 100644 pixels/bin/bz/bronze/pixels/Window.class create mode 100644 pixels/bin/bz/bronze/pixels/game/GameManager.class rename pixels/src/bz/bronze/pixels/{ => engine}/AbstractGame.java (78%) rename pixels/src/bz/bronze/pixels/{Gameloop.java => engine/GameContainer.java} (89%) rename pixels/src/bz/bronze/pixels/{ => engine}/Init.java (60%) rename pixels/src/bz/bronze/pixels/{ => engine}/Input.java (98%) rename pixels/src/bz/bronze/pixels/{ => engine}/Renderer.java (93%) rename pixels/src/bz/bronze/pixels/{ => engine}/Window.java (97%) create mode 100644 pixels/src/bz/bronze/pixels/game/GameManager.java diff --git a/.vscode/launch.json b/.vscode/launch.json index 1148705..331e0b4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,9 +12,9 @@ }, { "type": "java", - "name": "Debug (Launch)-Init", + "name": "Debug (Launch)-GameManager", "request": "launch", - "mainClass": "bz.bronze.pixels.Init", + "mainClass": "bz.bronze.pixels.game.GameManager", "projectName": "pixels" } ] diff --git a/pixels/bin/bz/bronze/pixels/AbstractGame.class b/pixels/bin/bz/bronze/pixels/AbstractGame.class deleted file mode 100644 index 9c81b9af9a2c4ea3025ef296ae27404fd86b26d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmaJ-u};G<6g;PC0-?|rSOKvG20StpAyr6ai9iC>-AQUb68RbqOx-gY-mja#iWGWC|)deN!V6%rVB7uHpD!OUsn(TwpB?;_ib*{>(vc}gx zm!W$yjlfa%uZa=QYZrxb{7sln{J_XkRge`pO#i;UTWe%TzB9S6Tbt9wcoW0l+0J~d z@E9C|_W?%X%`?VaNoK*^J$=Q-3m*a`j9&JwTa3N$2Ig(}J?)^s<^hJRa%9E;dtXru BQj-7x diff --git a/pixels/bin/bz/bronze/pixels/Gameloop.class b/pixels/bin/bz/bronze/pixels/Gameloop.class deleted file mode 100644 index d6558f5f8bc063cc97841318cefea9f701377ee1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2788 zcmah~S#uOs6#i~zGCgT~k`R+Hkq|=IW(LfNOJtG=vIP?ZXfj5ExO8Tk&@ky9x_j8f zeFI!^0ohdCqAylyk%7`Ge}Gk1`R1EdK3L_e4?by$-|d-fChDZp_w+gEp7lGYzx(U! zZvoti&lOY%G>sffjySe;%t+?VBSy|mZqvt%oNeb71O;mM>xcAYPPayrJ4f~#8Bak- zpl+HwP_Qh0BxeYOynT+LXDRKU7N>n)mq6GttgPV}j=-Y+IX(xD-jJRv7@-ZP z7x+J37&AP_%(%0Y7$nacrM*zMX_?-7fwtKH_>K=T%*}SzP!T}0hA0*@fLMH}3JhFB z4QeH|RKo()Notvf2&x5Y`c2E&Q5YLBoOG$Kb^Ufm&kgC0Dc{S?ptsLtl=GBwvVF3Y z%+X=T67#irvg9h_XqFM&tf303f}}v>oCf)&SJ7Tly;Z{v&=lN03m~OltGEpvGT}P~ z7RF{kVG=1_r6Qy>ClZrN#5 z;(%rC3vK-VdxNk>u=~V`lPc~(pMqY2#d9*52@wtVqMvOoa*OTk!Ad`Q6#Mm`PU zQuj9%%pCC>#(k_Sfz;WmVmk(8q6AgL%tXs@i4RGQ2Q&=fLHf}1d4gP^Io2DWQI%QN zyTTY|KCQ=n;}6NJd)S!yjQ@v;M+B<2+XdHX-PPGz#hyK;LB|MV7?a#xoPpjj7)n`d zxTLjL!|1fua2O`5JeYCpT&|>WKts+~aDArC&eC8bPd(2rB_dECo10#j#FwL?5euu} z;gEs?OFXAF51LliKCIy|jxgB6{u>SYsUAtXWQ->JdK@|1(#$apk7FU*;hA2JgZ2cT zQt;$#$oP}1;b}a>;XWj%edk_*l`|_^+G}0&M6KdEyrAIu^1_=Pf`%7m=fkeyrAz+X zaY6!Wv7D$=8eW!|4tj>`NjSc$;WfO@v`TwWpk5TGilYo#7<-ma4iMA zJfDJQT4&&NzWBJMB7Rug^?Z4?se^XG$rwGR{HR1G*IB#F6H6I)fd7@;9TjqaaN;ZE z+VW5CB>&_h^-nHYo^^7?^3IJuub%pZA?Zr;qG;mtCcf>a-3p$KiK|$Y2uz?QQIGlw zv?f+hpzTZl?s6&TJ%48NwYCSeLkhbwzak({}?sH}WrvHbx(3^wPIhvRd{naMzT_ z)s#w)V%kv1XSB??$eHki7IGC+%92zZVyHE|mq-LzjzD*H?=`GHRgW!pDp;KgRj0z$ zDK*fc1v(<*_%qNwDea9#gQKZXEESA~qoGVH9989^j^lDP%%YB_!ohAP*H+h4#5QKU zeYkGtRoveYDI#6BtBBoo5A#8dwO8=y6fZNyGp2a^rg;0wD`IQ{2fu zeTy`9kh;_;;#q0Ah?k;j&DjfxFo_1OBf>=d=+0iezGu-nw*Ly&6mgPATZw$-8s2zb z6XRH*Uc>2esGZeK)kVBRY0LTRfkYAKzl0FAqFyZIcm^Qh@*!If!nP922-g*a%t``r z726kM^Ac#rYAnGTwz8elBqeKc3vNXRCqIQda5t%KScg8o4WJWgHuhnD9KWFC2Yv~E z#1{O7t@s%|_=TFkQujA5q2JMuKlve3_`OnbzldN!)FLhF@qlQ;kZ3`>Sb>K`9D95e z?3E)V5@i%9Vi~tpEpbpKmf{lOU4a{!)qA9ZXrz_*NrliP7T^O?VKj?sTqdPriMWAT zj}VY;B8-nnMd+~-ALA1a!>6o93qsdrDHK*KAb*1JT>b|xt?E&5Mq-nDsf0mR=U>44 Rm>+ft_0!-Tr+NiG`y1{$X=eZc diff --git a/pixels/bin/bz/bronze/pixels/Init.class b/pixels/bin/bz/bronze/pixels/Init.class deleted file mode 100644 index f45f13b9a2c212e6f8a42afcc462c918bb029189..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 793 zcmah{O>fjN5Pc5Yd=c2P{i2kQET?S`%>}6vMO;uppcNciiV!C!FL05_ zrE=#-A;xLh1?@_;6x-u@Z{C|xe*OM&1z-oyJva<2>3NbGtv*hk@m(sBhan<7h!CJh%@2lCwf)9OHQKdqx9 cKfDb*CRa}gZ~Z@Qz2C09JgLAC6W2li56>s6^8f$< diff --git a/pixels/bin/bz/bronze/pixels/Input.class b/pixels/bin/bz/bronze/pixels/Input.class deleted file mode 100644 index 98a8b7259b02a5b3cefd27f34f37585b875d7761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3536 zcmbVMT~`xV6y28uLy`d%6-5*=MTOWBKdM%+SV8=#0WAa+KRZdLFcOk9nSf}&Yun$T zZ>~P{#h1E@U8}3hAJG5O)j!ZxyYIb|NeD@C^~c0=asu!RY`JePnX!zSor_&f-nUZR-6XJE?V8I@%v!Rt zPV9=c61R(vm9+{1vFujza_eq07LyV67j5o4{(kR#GlucpJJ^0eT{<)FlyjD#@L-@fVJHraHu}aS~nN$ zqJc|bZ|o?8)wIyT`dDkc2t|qFcGj9GEheo(!c1l?f%bSVWoBl~f-S$@O}{g5vx9cU z*VRRh))0H9luw%u{}(n}cFHkR3*%PQgC)s-{pQbY=8|bdy1Ain9d6Xm32P1 zoMn0K;)rTm!s?zC2$lDwvr+!g{+m@RtK`OWOIDg)`5*a@$q`pN-od>9?h15!eWI(c z%BSFzuYr$Yvhs75qc$gVjwuIQ%?FDhm`G1;2i0IuAw#h|Uohw9B*pIf6f5lJUb2OYFWR<|nZma&|HX7SSfqTx10~v2(~7$d_F>;azoE>X4LJ5p)&QY)3P8YC*Eq zpVtajv1p|w@{)mNi5z6`aYVo=S56bp z<;puyt-JxbZsQJbS-$u3>lObKTyIBzMR#&YuH%Wv zLUb{+XRrS(A4TO+pL^8u?Db!gsZTMDpoMmX_2@+i2dHf?deBF!A4j>K#$m;#hyIM{ zvI&s)RaKP;Gtt&Ho(JLo8zIpamIeC=lYC3@he%fv4rqqYX=DXgbwZEMxZmM zR0Kg)%0N>tP=^M3iZ&X(UB{oG+5g-padlQ2_gEEfhlktY;!3_gi0z~>-6+75a)76G z1Dt%*05e{IYAINeS}6vr5Cb0N0Is`I-0*;^r67=&BHBob;VRr}DKu`C6tj&2Xek(= zz7!*G8sH`yTzADex0u1`;g`70*{aM>NcF-+_U5H3+@L2&5J{v6BanvW!cDW9vdKCn z+$S%vkdcE+JFD%13VfSt<~T=eoI^NK6{6D%(a8{>st|?$A7YXrrWhizL5QLk;)I$F z&U=NeZsyr42;s359!tlA7} z`K%F4d>}siUrhV~M!mBwAJW8^y>s{6Ip^G&JKukQ-34$54;)y8Ol8Zf1TB9{dTsSq zHap(D^lLJZfrAKPXidBkUQ_sWZ?3W?tD0c7mk3lci)XxO^J1B^*sSuEen_x$`9(tH zajPa1uyNc)0t0ajA?0A0Fw!Tur2JZI)5QtI2+>Vd(~UR?r(8r4GaE--oHkgjAyvJh z4S2?d(*;LejNvSUUHgQy<g@An0pdA2bT$BN4Wnjbdg7akYw^FLW{0J-qbH}02dux z>GynqmwcVT6sBExxJGb#+xAk5GM?ll`mgxtXE|4(wHZt%B`wsE{Z^z zy!SJr8>&OdmisPjZ$gSpu4RX3f)sbNphfldbJ6bYk5-#f@UbNpS{p%CK2=63xwm)P z91zCYmd(>>!!no6E6dz#7};xxFarj-&gE={apE{x_=05N69%_&l0$kM84lSUoZG>~ zH%#r|>NaLRhCDa;n`U+}UnJxjK#JKWki<>?>vkD&3%5BVei?geit8=@H)_v*z);~c zX0orQvnzA&h_WWzegEf&(Xe4OQd|w5)+mNC$T7grkRK$Td*+u7ug2UZU6uP diff --git a/pixels/bin/bz/bronze/pixels/Window.class b/pixels/bin/bz/bronze/pixels/Window.class deleted file mode 100644 index 6de8b339bb1f36327e7c41cf0e6183eff06cd5a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2167 zcmZ`)X;)KM6y28u65luNXSIRw zrEJkI+umh?Ks1&X2qvAJ3gHMN|8LR}9L9viQ5<9rmwenHn1w_?2J~x6B80Gh9hVq1 zuM-jxgu^%`Fl6$cdOTI1o1L52dQpizkRhBAIO@0HIkku&h8MN#b95a|rBbo9hQ}rL zVkm@{1om~{raTeMVM6P?EU^#6R9Ldh>PD@UQSPdhG0kz;1z6^ z_Q=w6W`?C3s8w<-u=a3CVm}TVvJ zcXCPMI&KJrs>)ljH}uf5u(7n3-IRDAw*(GTwy4&uTG2}uovK={C{C5_lxZ+Z-4Ip< z#yb8N95<)jCF`M6^CDQmgtm2C;tuXIdD=1}fr*~v4ez>D=EyU}bQm8p&ZH`P%GLOf zB|gD@4ycvO3B-DkNvBkC%2Z64vh}Pl?P#nekwI2K()TS@wKq)TgVB3Nt|ZpL?HJRs zaTs)Jw^Wg|u2vo1jQ{m!u(rele8wFjcGYbA*tWVK$o9G$<&s2M2NI!j+OFE1w-74Z zTNc+tzi5|Kxk~>LIB@l--_RrMNz_p1fggX^IE#OJUs@leBt2)k~r z+of7bgS5p*5|29~E^&|OONl4C?FY=1>>ebI{aWH1e9H;XD{r?{U^*K6_w?>oN$8RN zPU3s~z-^?3MQ+2+hOh^{_#HMEO>hy-3Eo{NiXtmc&CRMSw%+DF=A6&!X~Z=5B*5d( zBczWLUtxWke5!f+n`gCGjb*g-^L;KILwc2B|%UgS2~yUkzH-e~B#|zPpL> z7LJVsrdpUB>ATaybg+e)(UUEl-a_nd6O&D{HgUFv*)7ab|9lJce-Pe>3;aFq2eOv| zY1hMaGJuG#cNa?q^TY7 z0_&mw#+yhqF&hY&Fhv`0+-@S-#yee$Lw+sCdF3W>gaLGexz@4wj1}plz2BQSW=ys5 z9^V6PER$?ug?WF_M%tIpkKSwJBR&Idd`d#MIbU$PjRGIRHi}ztOzmdKnQmgHu!+x? znwUS^M%9ppAsZz9ZG1t}##b#Q{RE!2km%;H;CFSBy`Ewo)BHV-vzWnooM3HEVgaXk vDWka0|1@hjgA%14&fyVe@f30V##ZRO51K5uD|(-jAMumlh@UC#!!Q2;yGr)5 diff --git a/pixels/bin/bz/bronze/pixels/game/GameManager.class b/pixels/bin/bz/bronze/pixels/game/GameManager.class new file mode 100644 index 0000000000000000000000000000000000000000..f9123e8951bd01fc6b8c05f0ea64d4c097c8a021 GIT binary patch literal 1815 zcmd5+TWb?R6#gbnyUCi`i(2cYI<;Ol6_OW0up&sYR!9|WEQn9Dn`ts-cP7kEitP{b z!9O4<=(|5kJevzmVd+IE_^`8cX3u`}opZi(e*gLY6TnkE_E2D04iD?0HTqE2yXv!y z(|TJZvi_QuEulqQS`S5r**&o@>ao!6`nzyXMvkG-ju>VdndiFEPADzy8pG6crImZZ zFcDOD7>etrB|Tgs*CU8m)*4&FG%NHzXe(0_@5>gCOwv`caLQ=jwI+;Zl0M^px!I9i zC0%134-abtvb6!(n$&H&xArnjofVPG$nZ#LZOB*h5%ifbjs^0sAn&DaNh@vc|EI9z z&TzrqL09_a)5whbX8B2^>zEerbz8#8U^h0xRk_*iqwx%ESWKSuQpe4{v{tnwH#W;G zC0c4ncc;Csv>AaR-uZZ(5c@dY^MrOmzCL`+RN!Hj;abo*66UtEO1IZC;m$NjSZ{kt zC~Z@a78&LnCKBDZ@(R)IQ33V^AOJieRIDfqbs7yh#W1U#bR7diAqa&kJl{#v{O(m_cQRl$J1BS}@yzuad(ta!?4^@WJD5>PX zrP7q-+oT3gu?!l)H0a3%lbE7ik@g;03}v#O&{sxp{|Ee!^ObM7{EMst=4hSjf0@KQ z?JEN>T)|bch%gpt9U&CxY=Ce*2VpK3;RbHzBHYSBSj<5vV+nVL2&>1UxSNBp)JMp8 XPEby=2=8Hq-oPq7B|5#2hY0=x+@}rx literal 0 HcmV?d00001 diff --git a/pixels/src/bz/bronze/pixels/AbstractGame.java b/pixels/src/bz/bronze/pixels/engine/AbstractGame.java similarity index 78% rename from pixels/src/bz/bronze/pixels/AbstractGame.java rename to pixels/src/bz/bronze/pixels/engine/AbstractGame.java index 9bcdcf9..da770a2 100644 --- a/pixels/src/bz/bronze/pixels/AbstractGame.java +++ b/pixels/src/bz/bronze/pixels/engine/AbstractGame.java @@ -1,4 +1,4 @@ -package bz.bronze.pixels; +package bz.bronze.pixels.engine; public abstract class AbstractGame { public abstract void update(float dt); diff --git a/pixels/src/bz/bronze/pixels/Gameloop.java b/pixels/src/bz/bronze/pixels/engine/GameContainer.java similarity index 89% rename from pixels/src/bz/bronze/pixels/Gameloop.java rename to pixels/src/bz/bronze/pixels/engine/GameContainer.java index 34a91a7..94e0176 100644 --- a/pixels/src/bz/bronze/pixels/Gameloop.java +++ b/pixels/src/bz/bronze/pixels/engine/GameContainer.java @@ -1,23 +1,23 @@ -package bz.bronze.pixels; +package bz.bronze.pixels.engine; -import java.awt.event.KeyEvent; - -public class Gameloop implements Runnable { +public class GameContainer implements Runnable { private Thread thread; + private Window window; private Renderer renderer; - private Input input; + public Input input; private AbstractGame game; private boolean running = false; - private final double TPS = 1.0/60.0; + private final double TPS = 1.0 / 60.0; private String metrics; - - public Gameloop(AbstractGame game) { + + public GameContainer(AbstractGame game) { this.game = game; } public void start() { + window = new Window(); renderer = new Renderer(); input = new Input(); diff --git a/pixels/src/bz/bronze/pixels/Init.java b/pixels/src/bz/bronze/pixels/engine/Init.java similarity index 60% rename from pixels/src/bz/bronze/pixels/Init.java rename to pixels/src/bz/bronze/pixels/engine/Init.java index 7bc7f20..48873b5 100644 --- a/pixels/src/bz/bronze/pixels/Init.java +++ b/pixels/src/bz/bronze/pixels/engine/Init.java @@ -1,9 +1,8 @@ -package bz.bronze.pixels; +package bz.bronze.pixels.engine; public class Init { - static Window window = new Window(); - static Gameloop game = new Gameloop(); + //static Gameloop game = new Gameloop(); public static void print(String out) { System.out.println(out); @@ -11,13 +10,13 @@ public class Init { public static void init() { window.create(); - game.start(); + //game.start(); print("Window Initialized!"); print("Gameloop Started!"); } - public static void main(String[] args) throws Exception { - init(); - } + //public static void main(String[] args) throws Exception { + //init(); + //} } \ No newline at end of file diff --git a/pixels/src/bz/bronze/pixels/Input.java b/pixels/src/bz/bronze/pixels/engine/Input.java similarity index 98% rename from pixels/src/bz/bronze/pixels/Input.java rename to pixels/src/bz/bronze/pixels/engine/Input.java index 438bbc2..5bf6235 100644 --- a/pixels/src/bz/bronze/pixels/Input.java +++ b/pixels/src/bz/bronze/pixels/engine/Input.java @@ -1,4 +1,4 @@ -package bz.bronze.pixels; +package bz.bronze.pixels.engine; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; diff --git a/pixels/src/bz/bronze/pixels/Renderer.java b/pixels/src/bz/bronze/pixels/engine/Renderer.java similarity index 93% rename from pixels/src/bz/bronze/pixels/Renderer.java rename to pixels/src/bz/bronze/pixels/engine/Renderer.java index 84757de..0526a5e 100644 --- a/pixels/src/bz/bronze/pixels/Renderer.java +++ b/pixels/src/bz/bronze/pixels/engine/Renderer.java @@ -1,4 +1,4 @@ -package bz.bronze.pixels; +package bz.bronze.pixels.engine; import java.awt.image.DataBufferInt; diff --git a/pixels/src/bz/bronze/pixels/Window.java b/pixels/src/bz/bronze/pixels/engine/Window.java similarity index 97% rename from pixels/src/bz/bronze/pixels/Window.java rename to pixels/src/bz/bronze/pixels/engine/Window.java index 9e653c0..d60086d 100644 --- a/pixels/src/bz/bronze/pixels/Window.java +++ b/pixels/src/bz/bronze/pixels/engine/Window.java @@ -1,4 +1,4 @@ -package bz.bronze.pixels; +package bz.bronze.pixels.engine; import java.awt.BorderLayout; import java.awt.Canvas; diff --git a/pixels/src/bz/bronze/pixels/game/GameManager.java b/pixels/src/bz/bronze/pixels/game/GameManager.java new file mode 100644 index 0000000..d69aec3 --- /dev/null +++ b/pixels/src/bz/bronze/pixels/game/GameManager.java @@ -0,0 +1,32 @@ +package bz.bronze.pixels.game; + +import java.awt.event.KeyEvent; + +import bz.bronze.pixels.engine.AbstractGame; +import bz.bronze.pixels.engine.GameContainer; +import bz.bronze.pixels.engine.Renderer; + +public class GameManager extends AbstractGame { + static GameContainer gc; + + public GameManager() { + + } + + @Override + public void update(float dt) { + if (gc.input.isKey(KeyEvent.VK_SPACE)) { + System.out.println("pop goes the weasel"); + } + } + + @Override + public void render(Renderer r) { + + } + + public static void main(String[] args) { + gc = new GameContainer(new GameManager()); + gc.start(); + } +} \ No newline at end of file