Переместил менеджер моделей в UwURenderEngine, так как у него нет прямой зависимости от ядра и у ядра нет зависимости от него
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
#include "GameInstance.hpp"
|
||||
|
||||
#include <filesystem>
|
||||
#include <fstream>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
|
||||
#include "ModelManager.hpp"
|
||||
#include "Core/CoreInstance.hpp"
|
||||
#include "Game/WorldFactory.hpp"
|
||||
#include "Game/World/World.hpp"
|
||||
@@ -19,8 +17,6 @@ GameInstance::GameInstance(CoreInstance& core) : core(core)
|
||||
// Init directories
|
||||
std::filesystem::create_directories(std::filesystem::path("./Resources"));
|
||||
|
||||
current_model_manager_ = new ModelManager();
|
||||
|
||||
for (auto& factories : world_factories)
|
||||
{
|
||||
if (factories.world_name == base_world)
|
||||
@@ -38,7 +34,6 @@ GameInstance::GameInstance(CoreInstance& core) : core(core)
|
||||
GameInstance::~GameInstance()
|
||||
{
|
||||
delete world;
|
||||
delete current_model_manager_;
|
||||
}
|
||||
|
||||
void GameInstance::start()
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
class CoreInstance;
|
||||
class World;
|
||||
class ModelManager;
|
||||
|
||||
#define GENERATE_FACTORY_GAME_INSTANCE(Class) \
|
||||
GameInstance* GameFactory(CoreInstance& core) { return new Class(core); }
|
||||
@@ -14,7 +13,6 @@ class GameInstance
|
||||
{
|
||||
CoreInstance& core;
|
||||
World* world = nullptr;
|
||||
ModelManager* current_model_manager_ = nullptr;
|
||||
|
||||
std::atomic<bool> is_running = true;
|
||||
|
||||
@@ -31,7 +29,6 @@ public:
|
||||
|
||||
World* GetWorld() const { return world; }
|
||||
CoreInstance& GetCore() const { return core; }
|
||||
ModelManager* GetCurrentModelManager() const { return current_model_manager_; }
|
||||
|
||||
friend class CoreInstance;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user