matteo/skizzle
matteo
/
skizzle
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Transformation de la charge en float

This commit is contained in:
Mattéo Delabre 2016-03-14 21:43:27 +01:00
parent 7e9ebdda9f
commit 4a8b31816b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/object.hpp
View File

@ -8,7 +8,7 @@
class Object { class Object {
protected: protected:
sf::Vector2f position; sf::Vector2f position;
int charge; float charge;
int layer; int layer;
public: public:
@ -48,12 +48,12 @@ public:
/** /**
* Récupère la charge de l'objet * Récupère la charge de l'objet
*/ */
int getCharge(); float getCharge();
/** /**
* Modifie la charge de l'objet * Modifie la charge de l'objet
*/ */
void setCharge(int set_charge); void setCharge(float set_charge);
}; };
/** /**

6
src/main.cpp
View File

@ -20,9 +20,9 @@ int main() {
Block block8(9 * Constants::GRID, 7 * Constants::GRID); Block block8(9 * Constants::GRID, 7 * Constants::GRID);
Block block9(10 * Constants::GRID, 7 * Constants::GRID); Block block9(10 * Constants::GRID, 7 * Constants::GRID);
ball1.setCharge(-2); ball1.setCharge(-2.f);
ball2.setCharge(-2); ball2.setCharge(-2.f);
block5.setCharge(16); block5.setCharge(16.f);
engine.addObject(ball1); engine.addObject(ball1);
engine.addObject(ball2); engine.addObject(ball2);

6
src/object.cpp
View File

@ -1,6 +1,6 @@
#include "object.hpp" #include "object.hpp"
Object::Object(float x, float y) : position(x, y), charge(0), layer(10) {} Object::Object(float x, float y) : position(x, y), charge(0.f), layer(10) {}
sf::Vector2f Object::getPosition() { sf::Vector2f Object::getPosition() {
return position; return position;
@ -14,11 +14,11 @@ void Object::setLayer(unsigned int set_layer) {
layer = set_layer; layer = set_layer;
} }
int Object::getCharge() { float Object::getCharge() {
return charge; return charge;
} }
void Object::setCharge(int set_charge) { void Object::setCharge(float set_charge) {
charge = set_charge; charge = set_charge;
} }