Skip to content

Commit 7fa4082

Browse files
author
Thomas Ibanez
committed
removed legacy stuff
1 parent 787833c commit 7fa4082

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

ICE/Core/include/ICEEngine.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ICEEngine {
2222

2323
void initialize(const std::shared_ptr<GraphicsFactory>& graphics_factor, const std::shared_ptr<Window>& window);
2424

25-
void step(const std::shared_ptr<Scene>& scene);
25+
void step();
2626

2727
Eigen::Vector4i getPickingTextureAt(int x, int y);
2828

@@ -54,9 +54,6 @@ class ICEEngine {
5454
void importTexture(bool cubeMap);
5555

5656
private:
57-
std::shared_ptr<RenderSystem> m_rendersystem;
58-
std::vector<std::shared_ptr<System>> systems;
59-
6057
std::shared_ptr<GraphicsFactory> m_graphics_factory;
6158
std::shared_ptr<Context> ctx;
6259
std::shared_ptr<RendererAPI> api;

ICE/Core/src/ICEEngine.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ void ICEEngine::initialize(const std::shared_ptr<GraphicsFactory> &graphics_fact
2121
m_window->setResizeCallback([this](int w, int h) {
2222
if (project) {
2323
project->getCurrentScene()->getRegistry()->getSystem<RenderSystem>()->setViewport(0, 0, w, h);
24+
project->getCurrentScene()->getRegistry()->getSystem<RenderSystem>()->getCamera()->resize(w, h);
2425
}
2526
});
2627
ctx = graphics_factory->createContext(m_window);
@@ -30,10 +31,9 @@ void ICEEngine::initialize(const std::shared_ptr<GraphicsFactory> &graphics_fact
3031
internalFB = graphics_factory->createFramebuffer({720, 720, 1});
3132
}
3233

33-
void ICEEngine::step(const std::shared_ptr<Scene> &scene) {
34+
void ICEEngine::step() {
3435
auto render_system = project->getCurrentScene()->getRegistry()->getSystem<RenderSystem>();
3536
render_system->setTarget(m_target_fb);
36-
render_system->setCamera(camera);
3737
project->getCurrentScene()->getRegistry()->updateSystems(0.0);
3838
}
3939

@@ -96,11 +96,10 @@ void ICEEngine::setProject(const std::shared_ptr<Project> &project) {
9696
this->camera->getRotation() = project->getCameraRotation();
9797

9898
auto renderer = std::make_shared<ForwardRenderer>(api, m_graphics_factory, project->getCurrentScene()->getRegistry(), project->getAssetBank());
99-
m_rendersystem = std::make_shared<RenderSystem>();
100-
m_rendersystem->setCamera(camera);
101-
m_rendersystem->setRenderer(renderer);
102-
systems.push_back(m_rendersystem);
103-
project->getCurrentScene()->getRegistry()->addSystem(m_rendersystem);
99+
auto rs = std::make_shared<RenderSystem>();
100+
rs->setCamera(camera);
101+
rs->setRenderer(renderer);
102+
project->getCurrentScene()->getRegistry()->addSystem(rs);
104103

105104
auto [w, h] = m_window->getSize();
106105
renderer->resize(w, h);

ICEBERG/src/Iceberg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class Iceberg {
4444
}
4545

4646
if (m_state == UIState::EDITOR) {
47-
m_engine->step(m_engine->getProject()->getCurrentScene());
47+
m_engine->step();
4848
}
4949
ImGui::ShowDemoWindow();
5050

0 commit comments

Comments
 (0)