Сделал World потокобезопасным
This commit is contained in:
@@ -8,31 +8,32 @@ World::World(GameInstance& game_instance) : game_instance_(game_instance)
|
||||
|
||||
World::~World()
|
||||
{
|
||||
for (auto& i : actors_map)
|
||||
for (auto& i : actors_map_)
|
||||
i.second->OnDestroy();
|
||||
actors_map.clear();
|
||||
actors_map_.clear();
|
||||
}
|
||||
|
||||
void World::BeginPlay()
|
||||
{
|
||||
for (auto& i : actors_map)
|
||||
for (auto& i : actors_map_)
|
||||
i.second->BeginPlay();
|
||||
}
|
||||
|
||||
void World::Tick(double delta_time)
|
||||
{
|
||||
for (auto& i : actors_map)
|
||||
for (auto& i : actors_map_)
|
||||
i.second->Tick(delta_time);
|
||||
}
|
||||
|
||||
std::shared_ptr<SaveMap> World::save()
|
||||
{
|
||||
std::scoped_lock lock(m_actors_map_);
|
||||
std::shared_ptr<SaveMap> save = std::make_shared<SaveMap>("World");
|
||||
|
||||
std::vector<std::string> ActorsIDs;
|
||||
ActorsIDs.reserve(actors_map.size());
|
||||
ActorsIDs.reserve(actors_map_.size());
|
||||
std::list<std::shared_ptr<ISave>> actors;
|
||||
for (auto[it, flag] : actors_map)
|
||||
for (auto[it, flag] : actors_map_)
|
||||
{
|
||||
ActorsIDs.push_back(it);
|
||||
actors.push_back(flag);
|
||||
@@ -45,13 +46,14 @@ std::shared_ptr<SaveMap> World::save()
|
||||
|
||||
void World::load(std::shared_ptr<SaveMap> save)
|
||||
{
|
||||
std::scoped_lock lock(m_actors_map_);
|
||||
std::vector<std::string> actors_IDs = save->GetVectorString("ActorsIDs");
|
||||
std::list<std::shared_ptr<ISave>> act = save->GetListObject("Actors");
|
||||
|
||||
size_t i_id = 0;
|
||||
for (auto& i : act)
|
||||
{
|
||||
auto[it, flag] = actors_map.try_emplace(actors_IDs[i_id], std::static_pointer_cast<Actor>(i));
|
||||
auto[it, flag] = actors_map_.try_emplace(actors_IDs[i_id], std::static_pointer_cast<Actor>(i));
|
||||
it->second->world_ = std::static_pointer_cast<World>(shared_from_this());
|
||||
it->second->name_ = it->first;
|
||||
i_id++;
|
||||
@@ -60,11 +62,12 @@ void World::load(std::shared_ptr<SaveMap> save)
|
||||
|
||||
void World::DestroyActor(std::weak_ptr<Actor> ptr)
|
||||
{
|
||||
std::scoped_lock lock(m_actors_map_);
|
||||
std::shared_ptr<Actor> actor = ptr.lock();
|
||||
if (actor == nullptr)
|
||||
return;
|
||||
|
||||
std::string name = actor->GetName();
|
||||
actor->OnDestroy();
|
||||
actors_map.erase(name);
|
||||
actors_map_.erase(name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user