From 7e9ebdda9ffb3e68c198c8499c161f4023267bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= <contact@matteodelabre.me>
Date: Mon, 14 Mar 2016 21:41:20 +0100
Subject: [PATCH] =?UTF-8?q?Le=20layer=20est=20d=C3=A9sormais=20une=20varia?=
 =?UTF-8?q?ble=20de=20la=20classe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/ball.hpp   |  5 -----
 include/block.hpp  |  5 -----
 include/object.hpp | 16 +++++++++++-----
 src/ball.cpp       |  4 ----
 src/block.cpp      |  4 ----
 src/object.cpp     | 10 +++++++++-
 6 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/include/ball.hpp b/include/ball.hpp
index be52241..d793af4 100644
--- a/include/ball.hpp
+++ b/include/ball.hpp
@@ -28,11 +28,6 @@ public:
      * Récupère la boîte englobante de l'objet
      */
     std::unique_ptr<sf::FloatRect> getAABB();
-
-    /**
-     * Détermine la couche d'affichage de l'objet
-     */
-    unsigned int getLayer();
 };
 
 #endif
diff --git a/include/block.hpp b/include/block.hpp
index 11a433c..b474f73 100644
--- a/include/block.hpp
+++ b/include/block.hpp
@@ -29,11 +29,6 @@ public:
      * Récupère la boîte englobante de l'objet
      */
     std::unique_ptr<sf::FloatRect> getAABB();
-
-    /**
-     * Détermine la couche d'affichage de l'objet
-     */
-    unsigned int getLayer();
 };
 
 #endif
diff --git a/include/object.hpp b/include/object.hpp
index 30d0869..bbd3961 100644
--- a/include/object.hpp
+++ b/include/object.hpp
@@ -9,6 +9,7 @@ class Object {
 protected:
     sf::Vector2f position;
     int charge;
+    int layer;
 
 public:
     Object(float x, float y);
@@ -29,16 +30,21 @@ public:
      */
     virtual std::unique_ptr<sf::FloatRect> getAABB() = 0;
 
-    /**
-     * Détermine la couche d'affichage de l'objet
-     */
-    virtual unsigned int getLayer() = 0;
-
     /**
      * Récupère la position de l'objet
      */
     sf::Vector2f getPosition();
 
+    /**
+     * Récupère la couche d'affichage de l'objet
+     */
+    unsigned int getLayer();
+
+    /**
+     * Modifie la couche d'affichage de l'objet
+     */
+    void setLayer(unsigned int set_layer);
+
     /**
      * Récupère la charge de l'objet
      */
diff --git a/src/ball.cpp b/src/ball.cpp
index 3fa8137..1682497 100644
--- a/src/ball.cpp
+++ b/src/ball.cpp
@@ -27,10 +27,6 @@ std::unique_ptr<sf::FloatRect> Ball::getAABB() {
     ));
 }
 
-unsigned int Ball::getLayer() {
-    return 10;
-}
-
 sf::Vector2f Ball::getForces(EngineState& state) {
     sf::Vector2f forces = PhysicsObject::getForces(state);
 
diff --git a/src/block.cpp b/src/block.cpp
index 0ff8238..6486270 100644
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -36,7 +36,3 @@ std::unique_ptr<sf::FloatRect> Block::getAABB() {
         Constants::GRID, Constants::GRID
     ));
 }
-
-unsigned int Block::getLayer() {
-    return 10;
-}
diff --git a/src/object.cpp b/src/object.cpp
index aa01179..0b54b50 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1,11 +1,19 @@
 #include "object.hpp"
 
-Object::Object(float x, float y) : position(x, y), charge(0) {}
+Object::Object(float x, float y) : position(x, y), charge(0), layer(10) {}
 
 sf::Vector2f Object::getPosition() {
     return position;
 }
 
+unsigned int Object::getLayer() {
+    return layer;
+}
+
+void Object::setLayer(unsigned int set_layer) {
+    layer = set_layer;
+}
+
 int Object::getCharge() {
     return charge;
 }