It finally imports somewhat
This commit is contained in:
@@ -24,7 +24,7 @@ public:
|
||||
return Dependencies<>();
|
||||
}
|
||||
template<typename... Deps>
|
||||
void setupView(Dependencies<Deps...>, ThreadPool& pool)
|
||||
void setupView(Dependencies<Deps...>)
|
||||
{
|
||||
List<std::function<void()>> work;
|
||||
registry.view<Components..., Deps...>().each([&](Components&... comp, Deps&... deps){
|
||||
@@ -33,12 +33,12 @@ public:
|
||||
update(comp...);
|
||||
});
|
||||
});
|
||||
pool.runAndWait(std::move(work));
|
||||
getThreadPool().runAndWait(std::move(work));
|
||||
}
|
||||
virtual void run(ThreadPool& pool, double delta) override
|
||||
virtual void run(double delta) override
|
||||
{
|
||||
SystemBase::run(pool, delta);
|
||||
setupView((getDependencies<Components>() | ...), pool);
|
||||
SystemBase::run(delta);
|
||||
setupView((getDependencies<Components>() | ...));
|
||||
}
|
||||
virtual void update() override {}
|
||||
virtual void update(Components&... components) = 0;
|
||||
|
||||
@@ -11,8 +11,6 @@ class Executor
|
||||
public:
|
||||
Executor();
|
||||
~Executor();
|
||||
private:
|
||||
ThreadPool pool;
|
||||
};
|
||||
} // namespace System
|
||||
} // namespace Seele
|
||||
|
||||
@@ -12,7 +12,7 @@ class SystemBase
|
||||
public:
|
||||
SystemBase(PScene scene) : registry(scene->registry), scene(scene) {}
|
||||
virtual ~SystemBase() {}
|
||||
virtual void run(ThreadPool&, double delta)
|
||||
virtual void run(double delta)
|
||||
{
|
||||
deltaTime = delta;
|
||||
update();
|
||||
|
||||
@@ -7,9 +7,9 @@ void SystemGraph::addSystem(System::OSystemBase system)
|
||||
systems.add(std::move(system));
|
||||
}
|
||||
|
||||
void SystemGraph::run(ThreadPool& threadPool, float deltaTime)
|
||||
void SystemGraph::run(float deltaTime)
|
||||
{
|
||||
for(auto& system : systems) {
|
||||
system->run(threadPool, deltaTime);
|
||||
system->run(deltaTime);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ class SystemGraph
|
||||
{
|
||||
public:
|
||||
void addSystem(System::OSystemBase system);
|
||||
void run(ThreadPool& threadPool, float deltaTime);
|
||||
void run(float deltaTime);
|
||||
private:
|
||||
Array<System::OSystemBase> systems;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user