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

Utilisation de pointeurs intelligents pour la liste d'objets

This commit is contained in:
Mattéo Delabre 2016-03-30 14:02:31 +02:00
parent 6dbf641651
commit d09465cf4e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/object.hpp
View File

@ -7,6 +7,8 @@
#include "manager.hpp"
#include "resource_manager.hpp"
typedef std::shared_ptr<Object> ObjectPtr;
class Object {
private:
sf::Vector2f acceleration;
@ -28,7 +30,7 @@ protected:
/**
* 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:
Object(float x, float y);
@ -43,7 +45,7 @@ public:
* Met à jour la vitesse de l'objet selon les
* forces qui lui sont appliquées
*/
void updateVelocity(const Manager& manager, const std::vector<Object*>& objects, float delta);
void updateVelocity(const Manager& manager, const std::vector<ObjectPtr>& objects, float delta);
/**
* Met à jour la position de l'objet selon sa
@ -183,7 +185,7 @@ public:
* qui doit être dessinée avant celle du second
*/
struct ObjectCompare {
bool operator()(Object* const &t1, Object* const &t2) const;
bool operator()(ObjectPtr const &t1, ObjectPtr const &t2) const;
};
#endif

10
src/object.cpp
View File

@ -18,7 +18,7 @@ Object::Object(float x, float y) :
Object::~Object() {}
sf::Vector2f Object::getForces(
const Manager& manager, const std::vector<Object*>& objects
const Manager& manager, const std::vector<ObjectPtr>& objects
) const {
sf::Vector2f forces(0, 0);
@ -28,9 +28,9 @@ sf::Vector2f Object::getForces(
// force d'attraction entre objets chargés
if (getCharge() != 0) {
for (unsigned int j = 0; j < objects.size(); j++) {
Object *attractive = objects[j];
ObjectPtr attractive = objects[j];
if (attractive == this || attractive->getCharge() == 0) {
if (attractive.get() == this || attractive->getCharge() == 0) {
continue;
}
@ -79,7 +79,7 @@ void Object::draw(Manager& manager) {
}
void Object::updateVelocity(
const Manager& manager, const std::vector<Object*>& objects, float delta
const Manager& manager, const std::vector<ObjectPtr>& objects, float delta
) {
acceleration = getForces(manager, objects) * getMassInvert();
velocity += acceleration * delta;
@ -267,6 +267,6 @@ void Object::setLayer(int set_layer) {
layer = set_layer;
}
bool ObjectCompare::operator()(Object* const &t1, Object* const &t2) const {
bool ObjectCompare::operator()(ObjectPtr const &t1, ObjectPtr const &t2) const {
return t1->getLayer() > t2->getLayer();
}