Fixed AIs and crashes
This commit is contained in:
@@ -13,8 +13,10 @@
|
||||
#include "TerrainModule.h"
|
||||
#include "physics.h"
|
||||
#include "PhysicsModule.h"
|
||||
#include "CharacterManagerModule.h"
|
||||
#include "items.h"
|
||||
#include "StaticGeometryModule.h"
|
||||
#include "CharacterAIModule.h"
|
||||
#include <tracy/Tracy.hpp>
|
||||
|
||||
namespace ECS
|
||||
@@ -28,6 +30,8 @@ StaticGeometryModule::StaticGeometryModule(flecs::world &ecs)
|
||||
{
|
||||
ZoneScoped;
|
||||
ecs.module<StaticGeometryModule>();
|
||||
ecs.import <CharacterManagerModule>();
|
||||
ecs.import <CharacterAIModule>();
|
||||
ecs.component<TerrainSlotParent>();
|
||||
ecs.component<TerrainItem>();
|
||||
ecs.component<FurnitureItem>();
|
||||
@@ -89,6 +93,19 @@ StaticGeometryModule::StaticGeometryModule(flecs::world &ecs)
|
||||
});
|
||||
if (!Ogre::MeshLodGenerator::getSingletonPtr())
|
||||
new Ogre::MeshLodGenerator();
|
||||
ecs.system<TerrainItem>("SetupTowns")
|
||||
.kind(flecs::OnUpdate)
|
||||
.without<TownNPCs>()
|
||||
.without<TownAI>()
|
||||
.each([&](flecs::entity e, TerrainItem &item) {
|
||||
Ogre::String props = item.properties;
|
||||
nlohmann::json jp = nlohmann::json::parse(props);
|
||||
if (jp.find("type") == jp.end())
|
||||
return;
|
||||
Ogre::String itemType = jp["type"].get<Ogre::String>();
|
||||
if (itemType == "town")
|
||||
Geometry::registerTownItem(e);
|
||||
});
|
||||
ecs.system("AddGeometryQueue").kind(flecs::OnUpdate).run([&](flecs::iter &it) {
|
||||
ZoneScopedN("AddGeometryQueue");
|
||||
std::list<flecs::entity> items;
|
||||
@@ -134,9 +151,8 @@ StaticGeometryModule::StaticGeometryModule(flecs::world &ecs)
|
||||
const TerrainItem &item) {
|
||||
items.push_back(e);
|
||||
});
|
||||
for (auto e : items) {
|
||||
for (auto e : items)
|
||||
createItemGeometry(e);
|
||||
}
|
||||
addQueue.pop_front();
|
||||
} else {
|
||||
output.push_back(item);
|
||||
|
||||
Reference in New Issue
Block a user