From 3c6eff56897d44afd8424900a005112cc32b8a86 Mon Sep 17 00:00:00 2001 From: Alec Thomas Date: Fri, 6 Jan 2017 10:36:28 +1100 Subject: Use std::shared_ptr directly as component in example. --- examples/example.cc | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'examples/example.cc') diff --git a/examples/example.cc b/examples/example.cc index 6331325..5e2bc88 100644 --- a/examples/example.cc +++ b/examples/example.cc @@ -48,13 +48,7 @@ struct Body { float rotation = 0.0, rotationd; }; - -struct Renderable { - explicit Renderable(std::unique_ptr shape) : shape(std::move(shape)) {} - - std::unique_ptr shape; -}; - +using Renderable = std::shared_ptr; struct Particle { explicit Particle(sf::Color colour, float radius, float duration) @@ -101,10 +95,10 @@ public: sf::Vector2f(r(100, -50), r(100, -50))); // Shape to apply to entity. - std::unique_ptr shape(new sf::CircleShape(collideable->radius)); + Renderable shape(new sf::CircleShape(collideable->radius)); shape->setFillColor(sf::Color(r(128, 127), r(128, 127), r(128, 127))); shape->setOrigin(collideable->radius, collideable->radius); - entity.assign(std::move(shape)); + entity.assign(shape); } } @@ -279,7 +273,7 @@ public: ex::ComponentHandle body = entity.component(); ex::ComponentHandle renderable = entity.component(); ex::ComponentHandle collideable = entity.component(); - sf::Color colour = renderable->shape->getFillColor(); + sf::Color colour = (*renderable)->getFillColor(); colour.a = 200; float area = (M_PI * collideable->radius * collideable->radius) / 3.0; @@ -325,9 +319,9 @@ public: void update(ex::EntityManager &es, ex::EventManager &events, ex::TimeDelta dt) override { es.each([this](ex::Entity entity, Body &body, Renderable &renderable) { - renderable.shape->setPosition(body.position); - renderable.shape->setRotation(body.rotation); - target.draw(*renderable.shape.get()); + renderable->setPosition(body.position); + renderable->setRotation(body.rotation); + target.draw(*renderable.get()); }); last_update += dt; frame_count++; -- cgit v1.2.3