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

Correction du style de code

This commit is contained in:
Mattéo Delabre 2016-03-12 14:15:27 +01:00
parent c2a5edf257
commit 2e3d5d7aac
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ball.cpp
View File

@ -1,13 +1,12 @@
#include "ball.hpp" #include "ball.hpp"
void Ball::draw(sf::RenderWindow& window) { void Ball::draw(sf::RenderWindow& window) {
// chargement de la texture de test
//chargement de la texture de test if (!texture.loadFromFile("./Images/texture_test.jpeg")) {
if (!texture.loadFromFile("./Images/texture_test.jpeg")) // erreur
{
//erreur
} }
shape.setTexture(&texture);
shape.setTexture(&texture);
shape.setPosition(position); shape.setPosition(position);
window.draw(shape); window.draw(shape);

2
ball.hpp
View File

@ -8,7 +8,7 @@
class Ball : public PhysicsObject { class Ball : public PhysicsObject {
protected: protected:
sf::Texture texture; sf::Texture texture;
sf::CircleShape shape; sf::CircleShape shape;
/** /**

13
block.cpp
View File

@ -1,13 +1,12 @@
#include "block.hpp" #include "block.hpp"
void Block::draw(sf::RenderWindow& window) { void Block::draw(sf::RenderWindow& window) {
// chargement de la texture de test
//chargement de la texture de test if (!texture.loadFromFile("./Images/texture_test.jpeg")) {
if (!texture.loadFromFile("./Images/texture_test.jpeg")) // erreur
{
//erreur
} }
shape.setTexture(&texture);
shape.setTexture(&texture);
if (charge > 0) { if (charge > 0) {
shape.setFillColor(sf::Color(0, 0, 255)); shape.setFillColor(sf::Color(0, 0, 255));
@ -19,8 +18,6 @@ void Block::draw(sf::RenderWindow& window) {
shape.setPosition(position); shape.setPosition(position);
window.draw(shape); window.draw(shape);
} }
void Block::update(State state) { void Block::update(State state) {

2
block.hpp
View File

@ -8,7 +8,7 @@
class Block : public Object { class Block : public Object {
protected: protected:
sf::Texture texture; sf::Texture texture;
sf::RectangleShape shape; sf::RectangleShape shape;
public: public: