From 4f08f51ae3762025101d684cd13824cd0866ec78 Mon Sep 17 00:00:00 2001
From: Ritchie Cunningham <ritchie@ritchiecunningham.co.uk>
Date: Tue, 8 Mar 2022 22:34:49 +0000
Subject: [PATCH] [Fix] Render issue and update camera.

---
 bin/tfg/AnimatedSprite.class | Bin 3574 -> 3651 bytes
 bin/tfg/Camera.class         | Bin 1608 -> 1935 bytes
 bin/tfg/Game.class           | Bin 6008 -> 5852 bytes
 bin/tfg/Player.class         | Bin 3451 -> 3493 bytes
 src/tfg/AnimatedSprite.java  |   8 ++++++++
 src/tfg/Camera.java          |  35 ++++++++++++-----------------------
 src/tfg/Game.java            |   4 +---
 src/tfg/Player.java          |   4 ++--
 8 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/bin/tfg/AnimatedSprite.class b/bin/tfg/AnimatedSprite.class
index c2cc4859d88cc2a190f8a71310a5e7894d755a31..16c2a1222b0557134a388c53f50d511fa800a700 100644
GIT binary patch
delta 373
zcmY+9%Su8~7=^!6=aO~=At)*x6cOblsOTOD5kx{p#}FSt!dZl)CefrGK(f1bGgC86
zBO=0y(4bf75t=uwevdV1vey3A|8Mr%pWQW&^X==o3e0kM@670Z3a+(i+*;p=#iLei
zGwMKL-=v)mC%YV)9C4he>Am`?Ns4shL-&rJn_Q4q(3XNLp#_KRU72L;#0su9lB~&1
zJyFB+R>&Zqm@!gHYvtWo*0$t{J%XZLQe;S65!ZYV44354#Du7Bhj}LDY&I5{VjA2n
zQf^z4`sE7E_H40CGV+RA3O{jBeQ^eSWlkR1(SuoOAaEw2{(_%NA?<H;EnqYtQXyGF
s#Z4z3a(L-yP~67|W8&lZnIo4dx_Sl*-?X6^6zY;A@L#0Wt^Jqc4>&+mJ^%m!

delta 296
zcmY+8O-lk{6osG3nfJ}%4TPkqbWw{aw?(ajAcDwfA`S7^M4S2ngMB+?WlmOL4n#z_
z30k!6XS8ooP+b!jZO*yR;d1YJPJN8HuiuX?V2;~6x2lqHEOre847%*FZ#dx4e^X=X
z*ia_$zf^kq)KDR?a8|wb{8C)@&J7oTNzU8oB$tL-JFyFkxxD7eU(tc(M(=vf*-Z4x
z{VjPkERQ2%GQo0_Qt<`5QFvgl_2gzVO^)u_R$fhx2%HGmT{shPx=<C+9VkYW8rUQl
rB1K4=aVEtxOfe%q%RI3KLjSXGbfW%4KbEH6mXPd!kyh8ztB0Fk7UD@)

diff --git a/bin/tfg/Camera.class b/bin/tfg/Camera.class
index aefc46acdef12f2ab1e458dc1c24df5b62f2bf4f..087525a0598a2d2a42b3af1a8c8284e4bff2c936 100644
GIT binary patch
delta 882
zcmZuv&rcIk5dL2Gmt7uUKp|^O5B^Ha4_mN;w1QT#f&xXWC@Shom$C?3(k`GLL@!)D
zJnzPfXGsV)ns_!I{Esls>k<>A*}QqP-^_gTW!`+}Z(GeDzrK6}FoLxm^CRo%j8FQD
z<z&utS8d-Z71ye+?_|YK_HLjLNdspX+Wt-8NTHu0Tz34Rf}ty(m=rnI-gZD?;w;V?
zNHbUx9tvQNL7ZY}qQaR<&Gp@iXQB`1Ifjv8X#PW3bYD7>RJ>M>X>QiQ1@T^q>7%%0
z;3Bz^oXe5JWd`<~&O{ia7~{CwKwg;0;u=R7;|y9npHIw6<T}R<Ofo1XcY|SA?68=4
zqeR+eY?`Bh8H(AZ5<`(<QBhJN)IM4WQ~Z|fR-{gO6L)aez$`<{vb|v^S8T7GoU;8T
zj(eD+e$~plM;vNApCDOTJdm=ACOR?C@d%H_a;RUoIi6xcd<dlmSdHPx|6YN?@SM$A
z*V&{|*BUQFLt}_Y)rT3(01HMXK`Z5EX^2!5Ogo5#7wlE1YBx$-7aY%bss(S%S+v(z
ze6g<#GDW1-k>&_gL}_GQBs3;osfqADAqMSAO?*<1ZcX*<p?41h({vAI)UU|SS?VrE
zwxzwY{Tca;W@*iJOk}h^ORHllqc@WDUEHkW_O?aNed)+lz1PzB@UVLqtwj1{huVY?
zA=?d;>~VD91Y$Tz-)Y*7IJR;~V1mLW^k5misM6j<DRn&1NV;S6M`|g<0V9HWEaDK+
z#^}Y$Sb{=i1-MkL%5}pt!n6kG3VAx!tfGZ%6R~8dj?vAfLONFZFO?>RK^xwLbVCFW
Nk`F{McoYqx@*9{#wC4Z-

delta 665
zcmZ8eO-~a+7=C8EyIq!%CLY?9QVrV{+Crg4C<s!4;);lXgpl+I&5}r@l2Y1w>eU;E
z(ZAr)NJ5sxCVDf(_?wLH>^7v~u(R{LdA?@mGIYz$KmUIG1h9;~EAuN;9;d~q7Gt*f
z%|06u<T$1<Ek3CQy}&VpC*qfyR|02ZM6>qQ^M-TAz-)$K&1oIHb6O0cs#9w?^_|+f
zb9{L5zQLewId!7xY1_6l#8ujPxfDow%3wB~YU4xQ=j?mwVo8Y!HxSo@SYwEaQ6;)I
zfK{w>yuduk+9nuYax7v=&R=nCdh?Gap)HO9ykXENFLOXiO&QlLh%Z`^Y2vT8{9qU=
zV#FFj1aT48Go3a~RJw*_7m-T#8c`RP{~NnOW;-|GVv=wu=OTYaJcabYLr;@J7-NLT
zkwBU}fvoR^I35uqSIlCLD$89F^P~=A2n#R}py^W#iE?nb(`RfF1$6U+nDz|0C+0mv
zCJ#=NLE`N8iW`YkGI4xz^o?eIIo;DN_7yVj3K@7tHDn=!US1XgItEI#m5rWbrDuPF
zpm!Fli`7bY;u_^i`cf`z2{s69NN|JK-|q#N`hu;yU<=#5o3OA$I~i>Gx$;eSJ(IWp
E0XJw|9{>OV

diff --git a/bin/tfg/Game.class b/bin/tfg/Game.class
index b650aa9f793bd5f4706abb23d5cd24a11200a236..d4c6755b539e3ade6501a2b8f0ccd62603a5234b 100644
GIT binary patch
delta 1571
zcmaizYiv_x7{~w5DDBq0>$;X*%C3OGF0gTDFp+ib>AJP+neEx7Lnz(a&BB-!It?bW
z58{<ejK|CTV(<oupP0kO5HpP?#&}6Ez$XpFPsRkl8uSDDylYR<#OR0f{?G6EKkxIr
z=Y8LExBbV>*01kfT>`L=jxAW7rHP8EWX3&{Iu_3)6Or`sR3=HNYHkT;CZ{_78Sk<p
zO*MjCw3<*nk(|jSkE=6;>gIn-ZW*?sjp_u|Q-glHwAS1tXbr7>MYMN6AZR^YgmR;X
zH#r%foz7TMPa6d_OV5%>ok&l|PnLkFRiFyhR@|gbf;LmTJ}-7{*&=8wt`p3jpc+xU
zCG2h&v_pnOue&d#cw;`*GZc}=E<wBXd!ngtkD$FWqo!YtMzlUpAl5UaX=*4IR)UH<
zU*<tU`(%={kmONAA;qI;xi<R+b?Z}Q4O2aWJTlQ%NE}dyb2*A2pR`H?N;EbYRwDV@
zenEXQE@b@gO#_00(y;Q^X!lnh5~S*P%IZxI3kvIHwg!_XXh`p{Rn?9N8eN_-pbkZp
zSWxk4@>|CQ9ncTkR`nkgbV&LYIe)~jD8X1^frkafrEB4}^^N5gJs~I|V?t9#wU`pp
zl(6Ep(B$Hh%|&Y*F!3>zV>K$#fDKrStvqhSMkv^XemL~I<=&D#D8^n0bm@xybfp_E
z^q>}Qp5eiEc$pOami<~Zz}12<V*n)xp#mz`9YiC-XvPrQFpLh2q7zYcVGR3m0KNPk
z#zA%t@mm}d7{?JL@EnqO0h2h-^X8FSv^X*}kmhoabGs7=Aj1uwKm<?n)RSB&&6A$N
zQJiMyS)AemFX4H-%0({VMSQ@N#Tk5tv-lS0a2+q}UpddMd>t0Np^vR<oI8&q5dT5`
z)+=brlAUFipY|*{vs5jEIjYT4<9(8^vsqe~kGS(@mNqPKts>q;@Rk<y_!f7%z?=Lw
z*5Mtr<6Z2;d+5gdyagBGvvZ2bEr0`lK(DK;nQMuD3Df0~kEw0x6KkOLL+Z%lhDp5y
z(+I;h28#hZ8SFNLIwh4G)Fr9Hpob(m4021d8|0N_HfXL_VxdJpQ^6aMR*8{0D9LJ2
zM3OLQSW=lmQAwo+JtC>tpcvCi1IDwMyOFn|i_~%%4%qqT)lm}ld`DYYTd@PXSv%zo
zWcBfFi?C{Zo8qkFn8stQX*`9eSx@nGIKz4tuVJ3`O+JQ;te3EWE36;kQ+&?)1-`>I
zO3vYX{D4~=xQ$<MhxJ$dhTmELpcQ0hT>*K*=H-KPaC>>?z*T-ySns#c)SqyISmlsJ
rKn}tGAM$zr|H@v@SsqYCkIK%Jq9d#hUc*oLnT~e5a1-Cqbhqm-zprW*

delta 1709
zcmaizT}+!*7{~t)R7%^!3Y3rW4bE+R3>a)OT$$seZ-G%-MoU@QTrJQd3}|VKb0)4{
zZ1}OwWO+4CZ~Pv{3o~RkX3@=$#0x)?nQd1Z7q5(oCVFGk3-vi|-)-K^5YGSn&hwoA
zdERrLe%Jg*i}8!UFI@((hnClj7L(a96O6kf(b;&AP*vZcu4NS!rrBzwja06uGD4a9
zTb3n}UKUhAl>`&-8wtl|<Fnz#)J{h@I@3BA3oXpI#*W3}!G%_Da4H^-wuh`nM5tO&
z4b>8Ir-F;|VARE%YU=N@$KK#IqKWPmw2AH`<je%s6;nyU7C~F7o}inK296SH>t(@q
z8$)1nK4_JjBGf3T30$^WJIfXf1(xUIMpRL=pcWa^PtV38^MPXogOp%&Bz*SWs*;e^
z0HSt*5|kQogLVqKpE}fh(XqW#&;z)}rSv&mZpCKcs8vvxToU~~gHFZfx4Zhr+%oW>
zpuOs&qE^=<s8@Yi)ah)36!nUz)b$G*P;ZKA-9AA>D&>_Xh6OpLi)l#l`A0?-cgB50
z(EgOWTpv{&N>3)>7UYouBNyVieW+K^xLht8c8$3efA5&b<8t0<=o2&{6N>+n(0Hfy
zAwdtxl)Q9`;`At^>2LK5dRYA=&r&%lXiBD-(ka6(Z#p3;D5U<HSHA5LL9;SJ&z~|l
zkq#aaG%weLM>*i}XKeMfxZbg$jOr}Vp%i9RpcpmSf=y_{R<xrY3YxJG7BynF8FnKV
zRtR*dADK@S_o57ayrUP@uwe&h_QI}u^RN0G>^6)XIAMSb1sFj&_Oq{>{k&+xI9lOD
zCnnhKAok)A`guNz!yNT<WD-;SH-{ir5W>@#!E+orhq?7cL7aw{*e=RP#xaCtKIAAH
zKgJ1<v)K}+aRNthlA|j)j;HV}8$6F^@G8&V!6_th8Xw~fzGBmBIIDJB&Lm!hp6%`Y
zs}vv}bGe`aR>BMXk;LZ#uOk~-tj@-Zs7+EnOG}b0Nh)>lbh*itq$(Louh%7M^KFvT
z<s>y^R(dkQByC$`$E*RqJMgU=czlIRc@2epTm{}h1Kz|=yv6r)p37V1TYWoKW=Xn~
zOqqq~qE^}tQlBi^m}v8T4&8<E4`|2b4~;{O@6oO#uIpT@(2X<fX3%S}harE1M%|Lk
z8udvk(8w;SP@_Rf`5HMS<!F>}NxXH$DATRjm<$=T%mb2)8Xc4*G&(FPPosb&lSb2$
zay6P^x<`Y#Bofy%A>TT+UErI{=O?VB1yu13H?TJHjqYOY<bG9H?cASkRuA`IfOQh{
z2(w1Gp`Ktp&JA>m^)xrbIo6l>UCy(vVhtBr-^Uev%K90;##LHK;2V64?|I=Se!|bJ
zzu<TL$@&*%Qx0o(>bY}Lon}crr|hds{6CA$19}So0}F^%4htBPgX8~)Oy0oVvQs&!
e0a+B`6SHWEqO677P(R>DiglOa2EL?tciF$KNQk5W

diff --git a/bin/tfg/Player.class b/bin/tfg/Player.class
index 39ac2b596598f37d78fefaa3168e2fa58af7f2ef..bc06e2259714d0660483b55a8e317d66ebe7c33b 100644
GIT binary patch
delta 206
zcmew@wN#qx)W2Q(7#J9A8TM}E+QhCcn4VhVn3tKGSdy9&Tu_u*lFG;+rlILml9sNI
zDsDab1A8DxD8o7)hV={^Chua`<M3nH#KW+fVa;SujyA^Kn=f!MvheCNFajY11FO~+
zhN#I8d1N$M8Il;1fg+3`r9e^~$o6Mo20{h~UXZG73~RM@wlQp+tj4ROxtU=LSU)er
fR)%d1OhC9DsE&zY2g6Pv%>|U}W7x&8$3YSR3(qxI

delta 165
zcmZ1~{acFb)W2Q(7#J9A8Fp{v+QdHDi9?4Ylwl1I!%Bu#lb^E(a`-W9;9*$Hux@f0
zM;qhL&3`!<Sp<w27=e(1fkSHxL)12g)swk-Wi&Y$k{FVKf{Y;5KvEpY_Ge%QLIwt2
zs6uU>Z4B!t2k`1>Ze-X5HiDO7Gs6}JCLr7jRL8`yjbS^G<^sy~G3;R2<sb<FU4kaS

diff --git a/src/tfg/AnimatedSprite.java b/src/tfg/AnimatedSprite.java
index 8fba2f4..d0fe7d2 100644
--- a/src/tfg/AnimatedSprite.java
+++ b/src/tfg/AnimatedSprite.java
@@ -161,4 +161,12 @@ public class AnimatedSprite {
         IntRect textureCoordsRect = new IntRect(topX, topY, spriteSize.x, spriteSize.y);
         return textureCoordsRect;
     }
+
+    /**
+    * Get the size of the sprite as a vector.
+    * @return Integer vector containing the sprite size.
+    */
+    public Vector2i getSpriteSize() {
+        return spriteSize;
+    }
 }
diff --git a/src/tfg/Camera.java b/src/tfg/Camera.java
index aa7bb87..5b6c5fc 100644
--- a/src/tfg/Camera.java
+++ b/src/tfg/Camera.java
@@ -3,6 +3,7 @@ package tfg;
 import org.jsfml.graphics.RenderWindow;
 import org.jsfml.graphics.View;
 import org.jsfml.system.Vector2f;
+import org.jsfml.system.Vector2i;
 
 /**
  * Camera that can center on various objects.
@@ -28,14 +29,18 @@ public class Camera {
         defaultView = (View) window.getDefaultView();
     }
 
-    /**
-     * Center the camera on the following position.
-     * @param pos Position to center the camera on.
-     * @param step
-     */
-    public void centerOn(Vector2f pos, float step) {
+    public void centerOn(AnimatedSprite s) {
+        /* Copy the default view. */
         View newView = new View(defaultView.getCenter(), defaultView.getSize());
-        newView.setCenter(pos);
+        Vector2f spritePos = s.getSprite().getPosition();
+        Vector2i spriteSize = s.getSpriteSize();
+        /* Convert the size to a float. */
+        Vector2f newSpriteSize = new Vector2f(spriteSize.x, spriteSize.y);
+        /* Divide the size in half (for centering). */
+        newSpriteSize = Vector2f.div(newSpriteSize, 2);
+        Vector2f cameraPos = Vector2f.add(spritePos, newSpriteSize);
+        cameraPos = new Vector2f(Math.round(cameraPos.x), Math.round(cameraPos.y));
+        newView.setCenter(cameraPos);
         window.setView(newView);
     }
 
@@ -45,20 +50,4 @@ public class Camera {
     public void centerOnDefault() {
         window.setView(defaultView);
     }
-
-
-    /**
-     * 
-     * @param x0
-     * @param x1
-     * @param m
-     * @return
-     */
-    public float Lerp(float x0, float x1, float m) {
-        return x0 + m * (x1-x0);
-    }
-
-    public Vector2f vectorLerp(Vector2f v0, Vector2f v1, float m) {
-        return new Vector2f(Lerp(v0.x, v1.x, m), Lerp(v0.y, v1.y, m));
-    }
 }
diff --git a/src/tfg/Game.java b/src/tfg/Game.java
index 26ae0ed..07c66f3 100644
--- a/src/tfg/Game.java
+++ b/src/tfg/Game.java
@@ -4,7 +4,6 @@ import org.jsfml.graphics.Color;
 import org.jsfml.graphics.RenderWindow;
 import org.jsfml.graphics.TextStyle;
 import org.jsfml.system.Clock;
-import org.jsfml.system.Vector2f;
 import org.jsfml.system.Vector2i;
 import org.jsfml.window.Keyboard;
 import org.jsfml.window.Keyboard.Key;
@@ -158,8 +157,7 @@ public class Game {
 		/* The window has automatic double-buffering. */
 		window.clear();
 		/* Draw each object like layers, background to foreground. */
-		Vector2f playerPos = player.getSprite().getPosition();
-		camera.centerOn(playerPos, 0);
+		camera.centerOn(player.getAnimatedSprite());
 		window.draw(player.getMap());
 		window.draw(player);
 		camera.centerOnDefault();
diff --git a/src/tfg/Player.java b/src/tfg/Player.java
index 47c49ab..95856bd 100644
--- a/src/tfg/Player.java
+++ b/src/tfg/Player.java
@@ -134,8 +134,8 @@ public class Player extends Entity implements Drawable {
      * Get animated sprite.
      * @return Animated sprite.
      */
-    public Sprite getSprite() {
-        return playerSprite.getSprite();
+    public AnimatedSprite getAnimatedSprite() {
+        return playerSprite;
     }
 
     /**