From fd220919200e43adaf26949bd1cce51bc0a80872 Mon Sep 17 00:00:00 2001
From: Sebastian Cabrera <scabrera@inbox.com>
Date: Wed, 28 Aug 2019 19:23:27 -0400
Subject: [PATCH] misc changes (abstract game)

---
 README.md                                     |   4 +++-
 .../bin/bz/bronze/pixels/AbstractGame.class   | Bin 0 -> 369 bytes
 pixels/bin/bz/bronze/pixels/Gameloop.class    | Bin 2545 -> 2788 bytes
 pixels/bin/bz/bronze/pixels/Init.class        | Bin 1131 -> 793 bytes
 pixels/bin/bz/bronze/pixels/Window.class      | Bin 2167 -> 2167 bytes
 pixels/src/bz/bronze/pixels/AbstractGame.java |   6 ++++++
 pixels/src/bz/bronze/pixels/Gameloop.java     |   8 ++++++++
 pixels/src/bz/bronze/pixels/Window.java       |   2 +-
 8 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pixels/bin/bz/bronze/pixels/AbstractGame.class
 create mode 100644 pixels/src/bz/bronze/pixels/AbstractGame.java

diff --git a/README.md b/README.md
index a52213c..486143b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 # pixels
 
-x, y - 2D Game engine in the works...
\ No newline at end of file
+x, y - 2D Game engine in the works...
+
+idk why i use java for everything...
\ No newline at end of file
diff --git a/pixels/bin/bz/bronze/pixels/AbstractGame.class b/pixels/bin/bz/bronze/pixels/AbstractGame.class
new file mode 100644
index 0000000000000000000000000000000000000000..9c81b9af9a2c4ea3025ef296ae27404fd86b26d4
GIT binary patch
literal 369
zcmaJ-u};G<6g;PC0-?|rSOKvG20StpAyr6ai9iC>-A<msRhm?eQ=$G96A}X-z(*mT
z3j-1o%blO^+3)Use7?N{ILCgBK;S^Hq_%anBDpZnR5o&~8)sGSuGO4kgaU(^S}Iwp
z>QUb68RbqOx-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

literal 0
HcmV?d00001

diff --git a/pixels/bin/bz/bronze/pixels/Gameloop.class b/pixels/bin/bz/bronze/pixels/Gameloop.class
index 1d2cb5bc2e343d69bb3eb22a80fd9a5239ee46fb..d6558f5f8bc063cc97841318cefea9f701377ee1 100644
GIT binary patch
literal 2788
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
Rm>+ft_0!-Tr+NiG`y1{$X=eZc

literal 2545
zcmaJ?TWl0%6#oA1c6U0=wsh&0A{H#AT`mQI%C;5cR%mSj+gd1Ir@Pa3U^_F;&O$-F
zqbOccl$)=n&k(van)qsBf^Q~1nE1+rZyJq?;`h(C-ECTJ(wQ^oKmT`b-#Pp3KVN<g
z;1OI8qe!53_)N>NYg=cG7RQ`0Qt6ic`nZv@Z6}PNz|!OTNxdbdTca(9hL0NwFN}~t
zG_UQ;Se8DVG6X{2m}}@sp7!LA2Yg+-fZ`ff(r^t|psr_u&%T*M8Wx+Dlko&<7Fu=5
z6PkowIyJ3P0dY(qFmSk^(q4hc9@|QLy5$Y(sf-cYd9mF8<Arg<bInA0er)~JS);@Y
zb(ogv?I2WB^PoU*kDWAB1h8B~6{<@hutGxwrBYg{p$tm}%6d%8IG7n9Hr#<+{?Q&g
zp{E9Q*OcEg%Ahx9((NKC&z4!H%%ELXcFkh#m@SQp1}v8mG-)V-8b(Z@YC$3W5~*m;
znQqXq1X>s^^BS4!iHeQbEE9ZKpt`A`WwRY^ZyuEHwrU7Nk=CsmSyRm_vHYx3+Or)M
zZRiMtITR43|8&|j#x*<&mQ=BH%N{VtNf1`IJGAT09fR~E=5G4U6D8M--5E1QmMCC1
zi`mz<dKJ6SDZ|_^P+1t}O!t}xrA3#9ZamIT>W)Jyv0+VJ%>_BlLvL5m%V_G)`rwD;
z)x!cC76bnuh(3XmUOSUE>W{Y7m$2dk8lD8{6B?J=qoib)0={OfhH_TNG(45J8dC5K
zYt)}`?Nlmf@SKL{eS@^Gl-UhyNPtNxo}EiXprUDEdhN1ZBN{4DS%NVf55r`M7f|Gg
zX(jDb8cra^U{Cp91oTs#Xh~Bs+S1+Watjb}43-8Pm28J+dMS>@3rL5-DK2cdKS&xp
zWH@Ul<?tOE5oj!|Xl{G7FA}wiQ#c*Q#LQZmAA*K6vhzyX@CI`Jn{igdOOl77jFZ$o
zhSY#pG`uQRLC;8gDx*Ft3HyeIb9htESIRIPo;Gz$x}3*5VZ6;z&a<z}@(kC_IG&N*
zH<2(L&$OBM1qoT^a7%doo}M@{;OYsw6L?R<`|>QDG}Dfqmdh`<-q`IC(@is0Nq8lt
z&x)#}r_)9<r!UJ`j%z23yhia%!uyw4=fnxFjDY9xDF{<vz{14><@81T_<D6`X6>l`
zcE(K@ou*vOk=a$VQ6`L4Od!DjVuVm6XPeVlBv*?6=DzUXTz7m&<+7t~xvz`Tj^v_T
zOdVGvpEdm2@8bdGvD>JP1*T9Jt3Y%L58UvtJ;-MiLH}BiZc4b6mJ*_#8jTRV$e>p9
zE%4ABXp%SNSuFMy8isD8aSCfGHd9<Th4mCS4$<GHDQt<|!j>$y<-JuA9rUq;$W>TI
z><SKOWr4@ooX72R9@qI1Fp4}-$Pb~m;G&qj$X&=&=3jJ-p_cJpRV>Kd10AJZ(}-WF
zz)m|JERBas<4S2<4YX>3*2pC820CU>yP9f(qw!EvJXoXDgc5P3MwKsh5?5*zR&X?~
z1Us1MuA%6j+t^nb$>Kn?CyRs8C-`92>u;fdPIqKZH#DbvdQSH&by?_BFm7U0Lf*vq
zG#tYEhy*ieON%T{O5`kFtWnD@Uq^(oS8A;h#_tDp`Sbfm-Bm23(b_Ctp2lnEG%<;C
zbsDcvLTxLpEzROBp4MHvUmeTh-5adZJu*4K!3#i=;TjtGT)`%-B>(D3h*f@*s@VQo
ztl>!`?bfnw&HRc{T8~ZGfL6|QoYG_1OwMiL-rkBnY{LMy;|rdAgLZt!pPlcq13zFV
zex&73w7ZMF_!;}~3l88nbm0%)yoVmLt5+1`py2PNC`Z4jBvL&i8<Ddhs%APJ7G?N=
z)4<sl5qwBm6=4~(`G`^wRYbW+Da6SC#>bQt#{VZip`<d4-*E|pr1@(6iccv;=&=}|
z;W81g(AP?Y?lZ}fFoX!mKS98Tzi??qXBg)t|F~&#Ji~ty^r#<pZkF-{y-N5ZT>BU7
CbtaPl

diff --git a/pixels/bin/bz/bronze/pixels/Init.class b/pixels/bin/bz/bronze/pixels/Init.class
index 07ee485540f4af055769d614fbaef9f0bb335de7..f45f13b9a2c212e6f8a42afcc462c918bb029189 100644
GIT binary patch
literal 793
zcmah{O>fjN5Pc5Yd=c2P{i2kQET?S`%>}6vMO;uppcNciiV!C!F<V!O9XZ*y>L05_
zrE=#-A;xLh1?@_;6x-u@Z{C|xe*OM&1z-oyJva<2>3NbGt<FVK$um*Z$$KRm4;_ZZ
zV}8Puf~!&TDLoch!{DAumFrW6_2CTfOPktd=!|$N7&c}h?<i4dT@lEAB}wNs!=1tA
zA#vX5TzI(0(4DI88KaGlF2je<%7|JQCnAqCT~@N-jnpcxj7|$tzKp}*;7CwP)r}cv
zjW+RLt-)q2>v*hk@m(sBhan<7h!CJh%@2lCwf)9OHQKdqx<i6~9G9su2b=^LdPAM@
z;*c9@<D17$b0lkqwb@4P45`V5ib^&<)*1S@c0fb0BcY?@QZcL!zRh<R?ww_#vi;W{
zo-r&<dzfSx!hJn9nRqL${lFU9wm9@bGp8TGfsX~abo1fS2XrVCAf){+MK1`&=nO9r
zeeK=9z~WDe94yi9wiy@8bdRo4Siveq0oKsFsj&55g@<!0_-zHJ<vp4xTb^Cl%JX>9
cKfDb*CRa}gZ~Z@Qz2C09JgLAC6W2li56>s6^8f$<

literal 1131
zcmZ`%YflqF6g|_|K3phmZ4prfp9PgwR8WifAWBRcHL1ZEKW)pV4%zND?IOs(5)vSi
z_yhb=#xql(kZPOE?A*EM+;h*|-+zAo0<eH(0||j*ecP>fqHx=H+j7efy6)Rh#s*RX
zBkSHb&kek=>AtV8`;Ay2vnj*1Xj5RUI)MA6uPOqmrq}WX#s^bYco9TVn@Q$kBap1L
zB#<mmuM)K!t@#Fq1V;ZuZNov<!3b;$S=3+)0(l2%WDK0AssZG2MH>ZVRraU@1ExT>
zDntL>Myu|3K6>?ldh^w&;RUN+N2;?9+DIZxY4KOtC3LVM<rSMrw>vVVJ;idh?^!Ko
zuvwX2wJ?dR2Byw9TKnFO{g#7kxK0P64TbK3W#oQPbj15!t779O$_8!;6g2nQYX{Sq
z5HPfWAXHrpC}0E1EM?za2eaC~2DxKjxpL3JeHBV~W3LmNc)&uvr<_#XNiUGw{@RpH
z?;bh0j0qD90=Z*jCu<7E1XgKzk_t-YFM}G?3)`=^8h$&LQP?%Gc-)Vkuag^9X34>A
zr6}cfnzX&}4?2?7qK!_&e<Rh?SxV`wY8+D}NOHatFx6P_%Ty1}J<ZjEDsYacC(Ka4
z;vt;R`xxFu?hplj6?akk!HWbgaJ6+>ntKLgItmhS1dnK3?t=03%swvmVHq7vYKYTI
zz&I{3(NY#NqBP8tT!GCUT$$O!jXu6t)}nIz6o<)anb92d=ZIrPGXSGI$nD|I4oZ7)
z^K%Dyn4jm;r!3I`V2FJTa}Y+5<G+ObNmmvgYg3*wD@D?ZmN>_gl9)Qcvp!c(UXezZ
RPRUE*IbP`ems}Hg^%q#N-z)$C

diff --git a/pixels/bin/bz/bronze/pixels/Window.class b/pixels/bin/bz/bronze/pixels/Window.class
index 4d5dee5ebdeb06ad8a90c261d889b09cf6291ea6..6de8b339bb1f36327e7c41cf0e6183eff06cd5a7 100644
GIT binary patch
delta 14
Wcmew^@LgcTd`3p&%?lW>vjG4w5(UHn

delta 14
Wcmew^@LgcTd`3p2%?lW>vjG4w3<bjg

diff --git a/pixels/src/bz/bronze/pixels/AbstractGame.java b/pixels/src/bz/bronze/pixels/AbstractGame.java
new file mode 100644
index 0000000..9bcdcf9
--- /dev/null
+++ b/pixels/src/bz/bronze/pixels/AbstractGame.java
@@ -0,0 +1,6 @@
+package bz.bronze.pixels;
+
+public abstract class AbstractGame {
+    public abstract void update(float dt);
+    public abstract void render(Renderer r);
+}
\ No newline at end of file
diff --git a/pixels/src/bz/bronze/pixels/Gameloop.java b/pixels/src/bz/bronze/pixels/Gameloop.java
index 732a242..34a91a7 100644
--- a/pixels/src/bz/bronze/pixels/Gameloop.java
+++ b/pixels/src/bz/bronze/pixels/Gameloop.java
@@ -6,12 +6,17 @@ public class Gameloop implements Runnable {
     private Thread thread;
     private Renderer renderer;
     private Input input;
+    private AbstractGame game;
 
     private boolean running = false;
     private final double TPS = 1.0/60.0;
 
     private String metrics;
     
+    public Gameloop(AbstractGame game) {
+        this.game = game;
+    }
+
     public void start() {
         renderer = new Renderer();
         input = new Input();
@@ -53,6 +58,8 @@ public class Gameloop implements Runnable {
                 render = true;
 
                 //TODO: Gameloop
+                game.update((float)TPS);
+
                 metrics = "TPS: " + tps + " | " + "Mouse X: " + input.mouseX + " | " + "Mouse Y: " + input.mouseY + " | " + "Scroll: " + input.scroll;
                 Window.window.setTitle(Window.title + " | " + metrics);
 
@@ -68,6 +75,7 @@ public class Gameloop implements Runnable {
             if (render) {
                 renderer.test();
                 //renderer.clear();
+                game.render(renderer);
                 
                 Window.update();
                 ticks++;
diff --git a/pixels/src/bz/bronze/pixels/Window.java b/pixels/src/bz/bronze/pixels/Window.java
index 95f4ef3..9e653c0 100644
--- a/pixels/src/bz/bronze/pixels/Window.java
+++ b/pixels/src/bz/bronze/pixels/Window.java
@@ -15,7 +15,7 @@ public class Window {
     static int width = 800;
     static int height = 600;
     static int scale = 1;
-    static String title = "pixels | v0.02";
+    static String title = "pixels | v0.03";
 
     static BufferedImage pixels = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
     static Canvas viewport = new Canvas();