From 7acfc27bb5df325d0532961bdbbaa1627a6e359c Mon Sep 17 00:00:00 2001
From: Thomas <thomas.rubini@pm.me>
Date: Tue, 11 Jan 2022 14:42:41 +0100
Subject: [PATCH] method ovveride

---
 assets/heart.si2                        | Bin 0 -> 16404 bytes
 config.yml                              |   2 +-
 headers/pixelManager/goodPixelManager.h |  13 +++++++++++
 headers/pixelManager/pixelManager.h     |  14 ++++++------
 src/pixelManager/goodPixelManager.cpp   |  29 ++++++++++++++++++++++++
 5 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 assets/heart.si2

diff --git a/assets/heart.si2 b/assets/heart.si2
new file mode 100644
index 0000000000000000000000000000000000000000..b95a0957c49475e008580234d0ae582e1ccefc79
GIT binary patch
literal 16404
zcmeHNziSjh6rM{0X-qgRR0Ihqf)FevV55f#Y9*d&Y~@-zL2M+QA{+{eh@cP~Ez{+X
z(1>ECf(TY3Dh4b(aL4b#Z8G!bEg6Qr%iir9c<jD+Gw;o}@5jvC?&S;Tms*PrW17aC
zF~%&mmRq>Qv{iJniIl|{DCk3DQ|;26%W8^0-4E*j^eEK$PmjCQ{9l5*yqa^|nCuf|
zF1=$s{q|Pq_Z%{=5ByIdBuM7jrLnF}y8jN@A6#9!2mUUji{QCF@Puurb`>4Gu_wSo
zkVJ2ouD<Sn!X!xM*`={DcJH9yZAQyXS6??_+o>sj_UzREad9Zc>IlUDHzdRsVQcu~
z8vO6lE%3I{@M&_=+KCBH8Gi;JQLkKGbbrYh%JnUqbWbwg?*qniec%Jx6X?9p=mvPI
zfiCSe<`=gM9xAtKKkfyaHfX(G7RVMBg1Je$)*XAfZIVfSQ)N<3JRsQ3?dMm;U*HGs
zZ1um!KaYuV&Hw3Xj?~(2x72!-TIY(!by4g1o^VfU{To62bROXN_tgl$wEofBmalU~
zS8@FtLH{fMF#cowe-JSe)Rd_yYiDMBnw<^%342rMlJ<mU%YwN`{y&l$|I#z5xJ;^l
zhiimiTK{6=U#x!>_jQo3nD0XnU;l8nO{@PSi2td8Kj!>*NW$7|THERP)NThgXGpb9
zs-3}HUI_T-AS+t;bGaD*^Yh{UcVi>43FVcMDgH43)&Cm*d7c+tYncCd6kaR!{l_qB
z;!B~{(>@-kI1T;%kK!NvnyCH{*E)^=Aor;j#N<DY$^N^kIb$~YyQv5AUQgPamMUAr
z{|S#_+odbuPcgz-XOrUqPuNmg@cq*{8UMidzmH&-pX-i622h+*zyFY)kK$*~SN%Wu
zbqxU><kK$2|4p7>r%{Law@F`0{;%^h^u5M2a0&lwX4fHe2}Mo%#){@V$o2}#y_(Yz
z{3ZD?R`v|~c&$6hZ1(3sa~XD1{LB~X|FB-g#=6u`<G<4RFV&l`5W<z)w1Rudw_GNj
z;m$gG9GzsNs!j1TpRK6>HU1-FU`+C#_MF~#tu14E{J#Udn-0$K*w1GC41W}3xjyiN
z-q*rJsqHtkd22!&Jm1%njQ0aiV@JIye&$>Cf34#GJrdZ<ZPdiz3{NuN4?K+>$MzSX
Wyk`QQWOZqZU;VG~@5jKd<o|y^<Ja5(

literal 0
HcmV?d00001

diff --git a/config.yml b/config.yml
index 90d2329..45b9b24 100644
--- a/config.yml
+++ b/config.yml
@@ -14,7 +14,7 @@
 #
 general:
  maxFPS: 30
- theme: bad
+ theme: good
 
 
 #############################
diff --git a/headers/pixelManager/goodPixelManager.h b/headers/pixelManager/goodPixelManager.h
index 34b66b3..b5cd1da 100644
--- a/headers/pixelManager/goodPixelManager.h
+++ b/headers/pixelManager/goodPixelManager.h
@@ -47,6 +47,19 @@ class GoodPixelManager : public PixelManager{
 	* @brief sprite of the torpedo
 	*/
 	MySprite torpedo;
+
+	/*!
+	* @brief sprite of the heart
+	*/
+	MySprite heart;
+
+	void drawInvaderA(const Position& baseVector, unsigned size, const RGBAcolor& color) const override;
+	void drawInvaderB(const Position& baseVector, unsigned size, const RGBAcolor& color) const override;
+	void drawInvaderC(const Position& baseVector, unsigned size, const RGBAcolor& color) const override;
+	void drawPlayer(unsigned x, unsigned width, const RGBAcolor& color) const override;
+	void drawMissile(const Position& baseVector, unsigned width, const RGBAcolor& color) const override;
+	void drawTorpedo(const Position& baseVector, unsigned width, const RGBAcolor& color) const override;
+	void drawHeart(const Position& baseVector) const override;
 public:
 
 	/*!
diff --git a/headers/pixelManager/pixelManager.h b/headers/pixelManager/pixelManager.h
index 06894b7..94a4dfb 100644
--- a/headers/pixelManager/pixelManager.h
+++ b/headers/pixelManager/pixelManager.h
@@ -96,7 +96,7 @@ public:
 	* @param[in] color : color multiplicaror of the invader
 	* @fn void drawInvaderA(const Position& baseVector, unsigned size, const RGBAcolor& color) const; 
 	*/
-	void drawInvaderA(const Position& baseVector, unsigned size, const RGBAcolor& color) const;
+	virtual void drawInvaderA(const Position& baseVector, unsigned size, const RGBAcolor& color) const;
 	
 	/*!
  	* @brief display a type B invader on screen
@@ -105,7 +105,7 @@ public:
 	* @param[in] color : color multiplicaror of the invader
 	* @fn void drawInvaderB(const Position& baseVector, unsigned size, const RGBAcolor& color) const;
 	*/
-	void drawInvaderB(const Position& baseVector, unsigned size, const RGBAcolor& color) const;
+	virtual void drawInvaderB(const Position& baseVector, unsigned size, const RGBAcolor& color) const;
 	
 	/*!
  	* @brief display a type C invader on screen
@@ -114,7 +114,7 @@ public:
 	* @param[in] color : color multiplicaror of the invader
 	* @fn void drawInvaderC(const Position& baseVector, unsigned size, const RGBAcolor& color) const; 
 	*/
-	void drawInvaderC(const Position& baseVector, unsigned size, const RGBAcolor& color) const;
+	virtual void drawInvaderC(const Position& baseVector, unsigned size, const RGBAcolor& color) const;
 	
 	/*!
 	* @brief display a player on screen
@@ -123,7 +123,7 @@ public:
 	* @param[in] color : color of the plater
 	* @fn void drawPlayer(unsigned x, unsigned width, const nsGraphics::RGBAcolor& color) const;
 	*/
-	void drawPlayer(unsigned x, unsigned width, const nsGraphics::RGBAcolor& color) const;
+	virtual void drawPlayer(unsigned x, unsigned width, const nsGraphics::RGBAcolor& color) const;
 	
 	/*!
 	* @brief display a missile on screen
@@ -132,7 +132,7 @@ public:
 	* @param[in] color : color of the missile
 	* @fn void drawMissile(const Position& baseVector, unsigned width, const nsGraphics::RGBAcolor& color) const;
 	*/
-	void drawMissile(const Position& baseVector, unsigned width, const nsGraphics::RGBAcolor& color) const;
+	virtual void drawMissile(const Position& baseVector, unsigned width, const nsGraphics::RGBAcolor& color) const;
 	
 	/*!
 	* @brief display a torpedo on screen
@@ -141,7 +141,7 @@ public:
 	* @param[in] color : color of the torpedo
 	* @fn void drawTorpedo(const Position& baseVector, unsigned width, const nsGraphics::RGBAcolor& color) const;
 	*/
-	void drawTorpedo(const Position& baseVector, unsigned width, const nsGraphics::RGBAcolor& color) const;
+	virtual void drawTorpedo(const Position& baseVector, unsigned width, const nsGraphics::RGBAcolor& color) const;
 
 #define HEART_LENGTH 40
 
@@ -150,7 +150,7 @@ public:
 	* @param[in] baseVector : pixel coordinates of the heart
 	* @fn void drawHeart(const Position& baseVector) const;
 	*/
-	void drawHeart(const Position& baseVector) const;
+	virtual void drawHeart(const Position& baseVector) const;
 	
 	/*!
 	* @brief display a sprite on screen
diff --git a/src/pixelManager/goodPixelManager.cpp b/src/pixelManager/goodPixelManager.cpp
index a891308..01e301f 100644
--- a/src/pixelManager/goodPixelManager.cpp
+++ b/src/pixelManager/goodPixelManager.cpp
@@ -8,8 +8,37 @@ void GoodPixelManager::loadSprites(vector<Task>& tasks) {
 	ADD_SPRITE_TASK(invaderC)
 	ADD_SPRITE_TASK(missile)
 	ADD_SPRITE_TASK(torpedo)
+	ADD_SPRITE_TASK(heart)
 }
 
 GoodPixelManager::GoodPixelManager(MinGL& win) : PixelManager(win) {
 
 }
+
+void GoodPixelManager::drawInvaderA(const Position& baseVector, unsigned size, const RGBAcolor &color) const {
+	drawSprite(invaderA, baseVector);
+}
+
+void GoodPixelManager::drawInvaderB(const Position& baseVector, unsigned size, const RGBAcolor &color) const {
+	drawSprite(invaderB, baseVector);
+}
+
+void GoodPixelManager::drawInvaderC(const Position& baseVector, unsigned size, const RGBAcolor &color) const {
+	drawSprite(invaderC, baseVector);
+}
+
+void GoodPixelManager::drawPlayer(unsigned x, unsigned width, const RGBAcolor& color) const {
+	drawSprite(player, Position(x, PLAYER_HEIGHT));
+}
+
+void GoodPixelManager::drawMissile(const Position& baseVector, unsigned width, const RGBAcolor& color) const {
+	drawSprite(missile, baseVector);
+}
+
+void GoodPixelManager::drawTorpedo(const Position& baseVector, unsigned width, const RGBAcolor& color) const {
+	drawSprite(torpedo, baseVector);
+}
+
+void GoodPixelManager::drawHeart(const Position& baseVector) const {
+	drawSprite(heart, baseVector);
+}