aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--entityx/Benchmarks_test.cc3
-rw-r--r--entityx/Entity.h43
-rw-r--r--entityx/Entity_test.cc46
-rw-r--r--entityx/python/PythonSystem.h8
4 files changed, 47 insertions, 53 deletions
diff --git a/entityx/Benchmarks_test.cc b/entityx/Benchmarks_test.cc
index c70deb9..d02896a 100644
--- a/entityx/Benchmarks_test.cc
+++ b/entityx/Benchmarks_test.cc
@@ -76,7 +76,7 @@ TEST_F(BenchmarksTest, TestDestroyEntitiesWithListener) {
boost::timer::auto_cpu_timer t;
cout << "destroying " << count << " entities" << endl;
- for (auto e : entities) {
+ for (auto &e : entities) {
e.destroy();
}
}
@@ -99,6 +99,7 @@ TEST_F(BenchmarksTest, TestEntityIteration) {
for (int i = 0; i < 10; ++i) {
for (auto e : em->entities_with_components<Position>()) {
entityx::shared_ptr<Position> position = e.component<Position>();
+ position.get();
}
}
}
diff --git a/entityx/Entity.h b/entityx/Entity.h
index 535b395..8eee892 100644
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -69,6 +69,9 @@ public:
static const Id INVALID;
Entity() {}
+ Entity(const Entity &) = default;
+ Entity(Entity &&) = default;
+ Entity &operator = (const Entity &) = default;
/**
* Check if Entity handle is invalid.
@@ -258,45 +261,39 @@ class EntityManager : public entityx::enable_shared_from_this<EntityManager>, bo
}
bool operator == (const Iterator& rhs) const { return i_ == rhs.i_; }
bool operator != (const Iterator& rhs) const { return i_ != rhs.i_; }
- Entity operator * () { return Entity(manager_, manager_->create_id(i_)); }
- const Entity operator * () const { return Entity(manager_, manager_->create_id(i_)); }
+ Entity operator * () { return Entity(view_.manager_, view_.manager_->create_id(i_)); }
+ const Entity operator * () const { return Entity(view_.manager_, view_.manager_->create_id(i_)); }
private:
friend class View;
- Iterator() {}
-
- Iterator(entityx::shared_ptr<EntityManager> manager, const std::vector<Predicate> &predicates,
- const std::vector<boost::function<void(Entity::Id)>> &unpackers, uint32_t index)
- : manager_(manager), predicates_(predicates), unpackers_(unpackers), i_(index) {
+ Iterator(const View &view, uint32_t index) : view_(view), i_(index) {
next();
}
void next() {
- while (i_ < manager_->capacity() && !predicate()) {
+ while (i_ < view_.manager_->capacity() && !predicate()) {
++i_;
}
- if (i_ < manager_->capacity() && !unpackers_.empty()) {
- Entity::Id id = manager_->create_id(i_);
- for (auto unpacker : unpackers_) {
+ if (i_ < view_.manager_->capacity() && !view_.unpackers_.empty()) {
+ Entity::Id id = view_.manager_->create_id(i_);
+ for (auto &unpacker : view_.unpackers_) {
unpacker(id);
}
}
}
bool predicate() {
- Entity::Id id = manager_->create_id(i_);
- for (auto &p : predicates_) {
- if (!p(manager_, id)) {
+ Entity::Id id = view_.manager_->create_id(i_);
+ for (auto &p : view_.predicates_) {
+ if (!p(view_.manager_, id)) {
return false;
}
}
return true;
}
- entityx::shared_ptr<EntityManager> manager_;
- const std::vector<Predicate> predicates_;
- std::vector<boost::function<void(Entity::Id)>> unpackers_;
+ const View &view_;
uint32_t i_;
};
@@ -305,18 +302,14 @@ class EntityManager : public entityx::enable_shared_from_this<EntityManager>, bo
predicates_.push_back(predicate);
}
- Iterator begin() { return Iterator(manager_, predicates_, unpackers_, 0); }
- Iterator end() { return Iterator(manager_, predicates_, unpackers_, manager_->capacity()); }
- const Iterator begin() const { return Iterator(manager_, predicates_, unpackers_, 0); }
- const Iterator end() const { return Iterator(manager_, predicates_, unpackers_, manager_->size()); }
+ Iterator begin() { return Iterator(*this, 0); }
+ Iterator end() { return Iterator(*this, manager_->size()); }
+ const Iterator begin() const { return Iterator(*this, 0); }
+ const Iterator end() const { return Iterator(*this, manager_->size()); }
template <typename A>
View &unpack_to(entityx::shared_ptr<A> &a) {
unpackers_.push_back(Unpacker<A>(manager_, a));
- // This resulted in a segfault under clang 4.1 on OSX. No idea why.
- // unpackers_.push_back([&a, this](uint32_t index) {
- // a = manager_->component<A>(Entity::Id(index, 0));
- // });
return *this;
}
diff --git a/entityx/Entity_test.cc b/entityx/Entity_test.cc
index eaa2025..b779873 100644
--- a/entityx/Entity_test.cc
+++ b/entityx/Entity_test.cc
@@ -10,6 +10,7 @@
#include <iterator>
#include <string>
+#include <utility>
#include <vector>
#include <gtest/gtest.h>
#include "entityx/Entity.h"
@@ -26,7 +27,7 @@ int size(const T &t) {
int n = 0;
for (auto i : t) {
++n;
- (void)i; // Unused on purpose, suppress warning
+ (void)i; // Unused on purpose, suppress warning
}
return n;
}
@@ -74,33 +75,33 @@ class EntityManagerTest : public ::testing::Test {
TEST_F(EntityManagerTest, TestCreateEntity) {
- ASSERT_TRUE(em->size() == 0);
+ ASSERT_EQ(em->size(), 0UL);
Entity e2;
ASSERT_FALSE(e2.valid());
Entity e = em->create();
ASSERT_TRUE(e.valid());
- ASSERT_TRUE(em->size() == 1);
+ ASSERT_EQ(em->size(), 1UL);
e2 = e;
ASSERT_TRUE(e2.valid());
}
TEST_F(EntityManagerTest, TestEntityAsBoolean) {
- ASSERT_TRUE(em->size() == 0);
+ ASSERT_EQ(em->size(), 0UL);
Entity e = em->create();
ASSERT_TRUE(e.valid());
- ASSERT_TRUE(em->size() == 1);
+ ASSERT_EQ(em->size(), 1UL);
ASSERT_FALSE(!e);
e.destroy();
- ASSERT_TRUE(em->size() == 0);
+ ASSERT_EQ(em->size(), 0UL);
ASSERT_TRUE(!e);
- Entity e2; // Not initialized
+ Entity e2; // Not initialized
ASSERT_TRUE(!e2);
}
@@ -124,7 +125,7 @@ TEST_F(EntityManagerTest, TestEntityReuse) {
TEST_F(EntityManagerTest, TestComponentConstruction) {
auto e = em->create();
auto p = e.assign<Position>(1, 2);
- //auto p = em->assign<Position>(e, 1, 2);
+ // auto p = em->assign<Position>(e, 1, 2);
auto cp = e.component<Position>();
ASSERT_EQ(p, cp);
ASSERT_FLOAT_EQ(1.0, cp->x);
@@ -151,17 +152,17 @@ TEST_F(EntityManagerTest, TestDestroyEntity) {
ASSERT_EQ(2, ep.use_count());
ASSERT_TRUE(e.valid());
ASSERT_TRUE(f.valid());
- ASSERT_TRUE(bool(e.component<Position>()));
- ASSERT_TRUE(bool(e.component<Direction>()));
- ASSERT_TRUE(bool(f.component<Position>()));
- ASSERT_TRUE(bool(f.component<Direction>()));
+ ASSERT_TRUE(static_cast<bool>(e.component<Position>()));
+ ASSERT_TRUE(static_cast<bool>(e.component<Direction>()));
+ ASSERT_TRUE(static_cast<bool>(f.component<Position>()));
+ ASSERT_TRUE(static_cast<bool>(f.component<Direction>()));
e.destroy();
ASSERT_FALSE(e.valid());
ASSERT_TRUE(f.valid());
- ASSERT_TRUE(bool(f.component<Position>()));
- ASSERT_TRUE(bool(f.component<Direction>()));
+ ASSERT_TRUE(static_cast<bool>(f.component<Position>()));
+ ASSERT_TRUE(static_cast<bool>(f.component<Direction>()));
ASSERT_EQ(1, ep.use_count());
}
@@ -186,7 +187,6 @@ TEST_F(EntityManagerTest, TestGetEntitiesWithIntersectionOfComponents) {
e.assign<Position>();
if (i % 3 == 0)
e.assign<Direction>();
-
}
ASSERT_EQ(50, size(em->entities_with_components<Direction>()));
ASSERT_EQ(75, size(em->entities_with_components<Position>()));
@@ -212,8 +212,8 @@ TEST_F(EntityManagerTest, TestGetEntitiesWithComponentAndUnpacking) {
entityx::shared_ptr<Direction> direction;
for (auto unused_entity : em->entities_with_components(position, direction)) {
(void)unused_entity;
- ASSERT_TRUE(bool(position));
- ASSERT_TRUE(bool(direction));
+ ASSERT_TRUE(static_cast<bool>(position));
+ ASSERT_TRUE(static_cast<bool>(direction));
auto pd = position_directions.at(i);
ASSERT_EQ(position, pd.first);
ASSERT_EQ(direction, pd.second);
@@ -235,7 +235,7 @@ TEST_F(EntityManagerTest, TestUnpack) {
}
// gcc 4.7.2 does not allow this struct to be declared locally inside the TEST_F.
-struct NullDeleter {template<typename T> void operator()(T*) {} };
+struct NullDeleter {template<typename T> void operator()(T *unused) {} };
TEST_F(EntityManagerTest, TestUnpackNullMissing) {
Entity e = em->create();
@@ -292,14 +292,14 @@ TEST_F(EntityManagerTest, TestEntityDestroyedEvent) {
for (auto e : entities) {
e.destroy();
}
- ASSERT_TRUE(entities == receiver.destroyed);
+ ASSERT_EQ(entities, receiver.destroyed);
}
TEST_F(EntityManagerTest, TestComponentAddedEvent) {
struct ComponentAddedEventReceiver : public Receiver<ComponentAddedEventReceiver> {
void receive(const ComponentAddedEvent<Position> &event) {
auto p = event.component;
- float n = float(position_events);
+ float n = static_cast<float>(position_events);
ASSERT_EQ(p->x, n);
ASSERT_EQ(p->y, n);
position_events++;
@@ -307,7 +307,7 @@ TEST_F(EntityManagerTest, TestComponentAddedEvent) {
void receive(const ComponentAddedEvent<Direction> &event) {
auto p = event.component;
- float n = float(direction_events);
+ float n = static_cast<float>(direction_events);
ASSERT_EQ(p->x, -n);
ASSERT_EQ(p->y, -n);
direction_events++;
@@ -328,8 +328,8 @@ TEST_F(EntityManagerTest, TestComponentAddedEvent) {
ASSERT_EQ(0, receiver.direction_events);
for (int i = 0; i < 10; ++i) {
Entity e = em->create();
- e.assign<Position>(float(i), float(i));
- e.assign<Direction>(float(-i), float(-i));
+ e.assign<Position>(static_cast<float>(i), static_cast<float>(i));
+ e.assign<Direction>(static_cast<float>(-i), static_cast<float>(-i));
}
ASSERT_EQ(10, receiver.position_events);
ASSERT_EQ(10, receiver.direction_events);
diff --git a/entityx/python/PythonSystem.h b/entityx/python/PythonSystem.h
index 1d2926b..b64e46c 100644
--- a/entityx/python/PythonSystem.h
+++ b/entityx/python/PythonSystem.h
@@ -80,7 +80,7 @@ public:
/**
* Create a new PythonComponent from an existing Python instance.
*/
- PythonComponent(boost::python::object object) : object(object) {}
+ explicit PythonComponent(boost::python::object object) : object(object) {}
boost::python::object object;
boost::python::list args;
@@ -160,7 +160,7 @@ private:
* A helper function for class_ to assign a component to an entity.
*/
template <typename Component>
-void assign_to(entityx::shared_ptr<Component> component, Entity &entity) {
+void assign_to(entityx::shared_ptr<Component> component, Entity &entity) { // NOLINT
entity.assign<Component>(component);
}
@@ -170,7 +170,7 @@ void assign_to(entityx::shared_ptr<Component> component, Entity &entity) {
* entity.
*/
template <typename Component>
-entityx::shared_ptr<Component> get_component(Entity &entity) {
+entityx::shared_ptr<Component> get_component(Entity &entity) { // NOLINT
return entity.component<Component>();
}
@@ -206,7 +206,7 @@ class PythonSystem : public entityx::System<PythonSystem>, public entityx::Recei
public:
typedef boost::function<void (const std::string &)> LoggerFunction;
- PythonSystem(entityx::shared_ptr<EntityManager> entity_manager);
+ PythonSystem(entityx::shared_ptr<EntityManager> entity_manager); // NOLINT
virtual ~PythonSystem();
/**
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-25 11:34:38 +0000