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

Utilisation de la construction make_shared/make_unique

This commit is contained in:
Mattéo Delabre 2016-03-30 14:03:36 +02:00
parent 6808bfe5b7
commit de3d4f6311
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/player.hpp
View File

@ -13,7 +13,7 @@ protected:
/** /**
* Calcule les forces appliquées à l'objet * Calcule les forces appliquées à l'objet
*/ */
virtual sf::Vector2f getForces(const Manager& manager, const std::vector<Object*>& objects) const; virtual sf::Vector2f getForces(const Manager& manager, const std::vector<ObjectPtr>& objects) const;
public: public:
Player(float x, float y); Player(float x, float y);

4
src/block.cpp
View File

@ -36,11 +36,11 @@ void Block::draw(Manager& manager) {
} }
std::unique_ptr<sf::FloatRect> Block::getAABB() const { std::unique_ptr<sf::FloatRect> Block::getAABB() const {
return std::unique_ptr<sf::FloatRect>(new sf::FloatRect( return std::make_unique<sf::FloatRect>(
getPosition().x - Constants::GRID / 2, getPosition().x - Constants::GRID / 2,
getPosition().y - Constants::GRID / 2, getPosition().y - Constants::GRID / 2,
Constants::GRID, Constants::GRID Constants::GRID, Constants::GRID
)); );
} }
unsigned int Block::getTypeId() const { unsigned int Block::getTypeId() const {

6
src/player.cpp
View File

@ -11,7 +11,7 @@ Player::Player(float x, float y) : Object(x, y) {
Player::~Player() {} Player::~Player() {}
sf::Vector2f Player::getForces(const Manager& manager, const std::vector<Object*>& objects) const { sf::Vector2f Player::getForces(const Manager& manager, const std::vector<ObjectPtr>& objects) const {
sf::Vector2f forces = Object::getForces(manager, objects); sf::Vector2f forces = Object::getForces(manager, objects);
// déplacement de la balle après appui sur les touches de direction // déplacement de la balle après appui sur les touches de direction
@ -53,11 +53,11 @@ void Player::draw(Manager& manager) {
} }
std::unique_ptr<sf::FloatRect> Player::getAABB() const { std::unique_ptr<sf::FloatRect> Player::getAABB() const {
return std::unique_ptr<sf::FloatRect>(new sf::FloatRect( return std::make_unique<sf::FloatRect>(
getPosition().x - getRadius(), getPosition().x - getRadius(),
getPosition().y - getRadius(), getPosition().y - getRadius(),
2 * getRadius(), 2 * getRadius() 2 * getRadius(), 2 * getRadius()
)); );
} }
unsigned int Player::getTypeId() const { unsigned int Player::getTypeId() const {