From efdc8aae6ff217d3275227f18f308a6000230c1d Mon Sep 17 00:00:00 2001
From: Alfred Burgess <aburgess@ucc.gu.uwa.edu.au>
Date: Wed, 13 Dec 2023 13:06:28 +0800
Subject: [PATCH] Renamed EntityGeneric to Entity
---
include/entities/{entity-generic.h => entity.h} | 8 +++-----
include/entity-manager.h | 7 +++----
include/main.h | 2 +-
include/scene.h | 2 +-
src/entities/{entity-generic.cpp => entity.cpp} | 6 +++---
src/entity-manager.cpp | 2 +-
src/main.cpp | 4 ++--
7 files changed, 14 insertions(+), 17 deletions(-)
rename include/entities/{entity-generic.h => entity.h} (77%)
rename src/entities/{entity-generic.cpp => entity.cpp} (59%)
diff --git a/include/entities/entity-generic.h b/include/entities/entity.h
similarity index 77%
rename from include/entities/entity-generic.h
rename to include/entities/entity.h
index aef3d46..3224a22 100644
--- a/include/entities/entity-generic.h
+++ b/include/entities/entity.h
@@ -5,12 +5,12 @@
// #include "entity-manager.h"
#include "logger.h"
-class EntityGeneric
+class Entity
{
// friend class EntityManager;
public:
- EntityGeneric( const std::string& tag, size_t id ); /** @todo make this private */
- ~EntityGeneric();
+ Entity( const std::string& tag, size_t id ); /** @todo make this private */
+ ~Entity();
bool isAlive() { return this->_alive; }
bool isDead() { return ! this->_alive; }
@@ -28,6 +28,4 @@ class EntityGeneric
};
-typedef EntityGeneric Entity;
-
#endif // __ENTITIES__ENTITY_GENERIC_H
diff --git a/include/entity-manager.h b/include/entity-manager.h
index c554c52..9be1add 100644
--- a/include/entity-manager.h
+++ b/include/entity-manager.h
@@ -7,10 +7,9 @@
#include <map>
#include "logger.h"
-#include "entities/entity-generic.h"
+#include "entities/entity.h"
-typedef EntityGeneric Entity;
-typedef std::vector<std::shared_ptr<EntityGeneric>> EntityVector;
+typedef std::vector<std::shared_ptr<Entity>> EntityVector;
typedef std::map< std::string, EntityVector > EntityMap;
class EntityManager
@@ -18,7 +17,7 @@ class EntityManager
public:
EntityManager();
~EntityManager();
- std::shared_ptr<EntityGeneric> addEntity( const std::string& tag );
+ std::shared_ptr<Entity> addEntity( const std::string& tag );
void removeEntity();
void update();
diff --git a/include/main.h b/include/main.h
index 2073f87..e6be204 100644
--- a/include/main.h
+++ b/include/main.h
@@ -19,7 +19,7 @@ enum GenerationMethod
#include "config-parser.h"
#include "game-engine.h"
#include "logger.h"
-#include "entities/entity-generic.h"
+#include "entities/entity.h"
#include "maths/maths.h"
#include "entity-manager.h"
diff --git a/include/scene.h b/include/scene.h
index 7974792..20d4568 100644
--- a/include/scene.h
+++ b/include/scene.h
@@ -7,7 +7,7 @@
#include "logger.h"
#include "asset.h"
-#include "entities/entity-generic.h"
+#include "entities/entity.h"
#include "entity-manager.h"
class Scene{
diff --git a/src/entities/entity-generic.cpp b/src/entities/entity.cpp
similarity index 59%
rename from src/entities/entity-generic.cpp
rename to src/entities/entity.cpp
index 9a56b64..2c0f0e9 100644
--- a/src/entities/entity-generic.cpp
+++ b/src/entities/entity.cpp
@@ -1,8 +1,8 @@
-#include "entities/entity-generic.h"
+#include "entities/entity.h"
-EntityGeneric::EntityGeneric(
+Entity::Entity(
const std::string& tag, size_t id
) : _tag( tag ), _id( id ),
_logger( Logger::instance() )
{ this->_logger.info( "Generic Entity Created" ); }
-EntityGeneric::~EntityGeneric(){}
+Entity::~Entity(){}
diff --git a/src/entity-manager.cpp b/src/entity-manager.cpp
index 4fb1e62..0c098dd 100644
--- a/src/entity-manager.cpp
+++ b/src/entity-manager.cpp
@@ -12,7 +12,7 @@ EntityManager::~EntityManager()
}
std::shared_ptr<Entity> EntityManager::addEntity( const std::string& tag )
{
- auto entity = std::shared_ptr< Entity >( new EntityGeneric( tag, this->nextId() ) );
+ auto entity = std::shared_ptr< Entity >( new Entity( tag, this->nextId() ) );
this->_entitiesToAdd.push_back( entity );
return entity;
}
diff --git a/src/main.cpp b/src/main.cpp
index 2e5a429..a92f1ab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@ int main( int argc, char* argv[] ) {
// Seed the random number generator
srand(static_cast<unsigned int>(time(nullptr)));
- std::vector< EntityGeneric* > entities;
+ std::vector< Entity* > entities;
// Genrate a Random chunk
WorldHex2D map( 5 );
//Chunk* chunk = new Chunk( 0, 0, 0);
@@ -48,7 +48,7 @@ int main( int argc, char* argv[] ) {
// Clean-up
while( entities.size() > 0 )
{
- EntityGeneric* entity = entities.back();
+ Entity* entity = entities.back();
entities.pop_back();
delete entity;
}
--
GitLab