Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
This commit is contained in:
@@ -7,6 +7,11 @@
|
||||
class World;
|
||||
struct EntityWrapper
|
||||
{
|
||||
EntityWrapper()
|
||||
: World(nullptr)
|
||||
, ID(EntityID_Invalid)
|
||||
{ }
|
||||
|
||||
EntityWrapper(::World* world, EntityID id)
|
||||
: World(world)
|
||||
, ID(id)
|
||||
|
||||
@@ -43,7 +43,7 @@ template <typename ContextType, typename EventType>
|
||||
class EventRelay : public BaseEventRelay
|
||||
{
|
||||
public:
|
||||
typedef std::function<bool(const EventType&)> CallbackType;
|
||||
typedef std::function<bool(EventType&)> CallbackType;
|
||||
|
||||
EventRelay()
|
||||
: m_Callback(nullptr)
|
||||
@@ -65,7 +65,7 @@ template <typename ContextType, typename EventType>
|
||||
bool EventRelay<ContextType, EventType>::Receive(const std::shared_ptr<Event> event)
|
||||
{
|
||||
if (m_Callback != nullptr) {
|
||||
return m_Callback(*static_cast<const EventType*>(event.get()));
|
||||
return m_Callback(*static_cast<EventType*>(event.get()));
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -34,6 +34,8 @@ public:
|
||||
EntityID GetParent(EntityID entity);
|
||||
// Change the parent of an entity
|
||||
void SetParent(EntityID entity, EntityID parent);
|
||||
// Get children of an entity
|
||||
const std::pair<std::unordered_multimap<EntityID, EntityID>::const_iterator, std::unordered_multimap<EntityID, EntityID>::const_iterator> GetChildren(EntityID entity);
|
||||
// Get all component pools
|
||||
const std::unordered_map<std::string, ComponentPool*>& GetComponentPools() const { return m_ComponentPools; }
|
||||
// Get the entity children map
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
#ifndef ESpawnerSpawn_h__
|
||||
#define ESpawnerSpawn_h__
|
||||
|
||||
#include "Core/Event.h"
|
||||
#include "Core/EntityWrapper.h"
|
||||
|
||||
namespace Events
|
||||
{
|
||||
|
||||
struct SpawnerSpawn : Event
|
||||
{
|
||||
EntityWrapper Spawner;
|
||||
EntityWrapper Parent;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,17 @@
|
||||
#include "Core/System.h"
|
||||
#include "Input/EInputCommand.h"
|
||||
#include "Events/ESpawnerSpawn.h"
|
||||
|
||||
class PlayerSpawnSystem : public ImpureSystem
|
||||
{
|
||||
public:
|
||||
PlayerSpawnSystem(EventBroker* eventBroker);
|
||||
|
||||
virtual void Update(World* world, double dt) override;
|
||||
|
||||
private:
|
||||
EventRelay<PlayerSpawnSystem, Events::InputCommand> m_OnInputCommand;
|
||||
bool OnInputCommand(const Events::InputCommand& e);
|
||||
|
||||
std::vector<int> m_SpawnRequests;
|
||||
};
|
||||
@@ -0,0 +1,20 @@
|
||||
#include <random>
|
||||
#include "Common.h"
|
||||
#include "GLM.h"
|
||||
#include "Core/System.h"
|
||||
#include "Events/ESpawnerSpawn.h"
|
||||
#include "Core/Transform.h"
|
||||
#include "Core/ResourceManager.h"
|
||||
#include "Core/EntityFileParser.h"
|
||||
|
||||
class SpawnerSystem : public System
|
||||
{
|
||||
public:
|
||||
SpawnerSystem(EventBroker* eventBroker);
|
||||
|
||||
private:
|
||||
EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;
|
||||
bool OnSpawnerSpawn(Events::SpawnerSpawn& e);
|
||||
|
||||
void spawnEntity(EntityWrapper spawner, EntityID parent, glm::vec3 position);
|
||||
};
|
||||
Reference in New Issue
Block a user