Skip to content

Commit 5371a99

Browse files
committed
-Reformat: new tonemapping pass
1 parent 4b52a42 commit 5371a99

32 files changed

+964
-500
lines changed

examples/lighting-test/application.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ void Application::setup_gui() {
259259
m_interface.tutorial = tutorialPanel;
260260

261261
Tools::Panel* explorerPanel = new Tools::Panel("EXPLORER", 0, 0, 0.2f, 0.7f, PanelWidgetFlags::NoMove, false);
262-
m_interface.scene = new Tools::SceneExplorerWidget(m_scene);
262+
m_interface.scene = new Tools::ExplorerWidget(m_scene, m_renderer);
263263
explorerPanel->add_child(m_interface.scene);
264264
explorerPanel->add_child(new Tools::Space());
265265
explorerPanel->add_child(new Tools::RendererSettingsWidget(m_renderer));

examples/lighting-test/application.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <engine/tools/controller.h>
1010
#include <engine/tools/gui.h>
1111
#include <engine/tools/loaders.h>
12-
#include <engine/tools/renderer_widget.h>
1312

1413
/**
1514
* Example app
@@ -24,7 +23,7 @@ class Application
2423
Tools::Panel *explorer{nullptr};
2524
Tools::Panel *tutorial{nullptr};
2625
Tools::Panel *properties{nullptr};
27-
Tools::SceneExplorerWidget *scene{nullptr};
26+
Tools::ExplorerWidget *scene{nullptr};
2827
Tools::ObjectExplorerWidget *object{nullptr};
2928
};
3029
UserInterface m_interface{};

examples/raytracing/application.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ void Application::setup_gui() {
288288
m_interface.tutorial = tutorialPanel;
289289

290290
Tools::Panel* explorerPanel = new Tools::Panel("EXPLORER", 0, 0, 0.2f, 0.7f, PanelWidgetFlags::NoMove, false);
291-
m_interface.scene = new Tools::SceneExplorerWidget(m_scene);
291+
m_interface.scene = new Tools::ExplorerWidget(m_scene, m_renderer);
292292
explorerPanel->add_child(m_interface.scene);
293293
explorerPanel->add_child(new Tools::Space());
294294
explorerPanel->add_child(new Tools::DeferredRendererWidget(static_cast<Systems::DeferredRenderer*>(m_renderer)));

examples/raytracing/application.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <engine/tools/controller.h>
1111
#include <engine/tools/gui.h>
1212
#include <engine/tools/loaders.h>
13-
#include <engine/tools/renderer_widget.h>
1413

1514
/**
1615
* Example app
@@ -27,7 +26,7 @@ class Application
2726
Tools::Panel *explorer{nullptr};
2827
Tools::Panel *tutorial{nullptr};
2928
Tools::Panel *properties{nullptr};
30-
Tools::SceneExplorerWidget *scene{nullptr};
29+
Tools::ExplorerWidget *scene{nullptr};
3130
Tools::ObjectExplorerWidget *object{nullptr};
3231
};
3332
UserInterface m_interface{};

examples/renderer-app/application.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ void Application::setup_gui() {
351351
m_interface.tutorial = tutorialPanel;
352352

353353
Tools::Panel* explorerPanel = new Tools::Panel("EXPLORER", 0, 0, 0.2f, 0.7f, PanelWidgetFlags::NoMove, false);
354-
m_interface.scene = new Tools::SceneExplorerWidget(m_scene);
354+
m_interface.scene = new Tools::ExplorerWidget(m_scene, m_renderer);
355355
explorerPanel->add_child(m_interface.scene);
356356
explorerPanel->add_child(new Tools::Space());
357357
explorerPanel->add_child(new Tools::ForwardRendererWidget(static_cast<Systems::ForwardRenderer*>(m_renderer)));

examples/renderer-app/application.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <engine/tools/controller.h>
1111
#include <engine/tools/gui.h>
1212
#include <engine/tools/loaders.h>
13-
#include <engine/tools/renderer_widget.h>
1413

1514
/**
1615
* Example app
@@ -27,7 +26,7 @@ class Application
2726
Tools::Panel *explorer{nullptr};
2827
Tools::Panel *tutorial{nullptr};
2928
Tools::Panel *properties{nullptr};
30-
Tools::SceneExplorerWidget *scene{nullptr};
29+
Tools::ExplorerWidget *scene{nullptr};
3130
Tools::ObjectExplorerWidget *object{nullptr};
3231
};
3332
UserInterface m_interface{};

examples/resources/scenes/sponza.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<!-- MESHES -->
1515
<Mesh type="file" name="Sponza">
1616

17-
<Filename value="meshes/testWall.obj" />
17+
<Filename value="meshes/walls.obj" />
1818

1919
<Transform>
2020
<translate x="0.0" y="-2.0" z="0.0" />
@@ -272,7 +272,7 @@
272272
<albedo r="0.5" g="0.5" b="0.5" />
273273
</Material>
274274
</Mesh>
275-
<Mesh type="file" name="Curtain 0">
275+
<!-- <Mesh type="file" name="Curtain 0">
276276
<Filename value="meshes/curtain1.obj" />
277277
278278
<Material type="physical">
@@ -355,7 +355,7 @@
355355
</Textures>
356356
<albedo r="0.5" g="0.5" b="0.5" />
357357
</Material>
358-
</Mesh>
358+
</Mesh> -->
359359
<!-- <Mesh type="file" name="Carpet">
360360
<Filename value="meshes/carpet.obj" />
361361

examples/sponza/application.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ void Application::setup_gui() {
6868

6969

7070
Tools::Panel* explorerPanel = new Tools::Panel("EXPLORER", 0, 0, 0.2f, 0.7f, PanelWidgetFlags::NoMove, false);
71-
m_interface.scene = new Tools::SceneExplorerWidget(m_scene);
71+
m_interface.scene = new Tools::ExplorerWidget(m_scene, m_renderer);
7272
explorerPanel->add_child(m_interface.scene);
7373
explorerPanel->add_child(new Tools::Space());
74-
explorerPanel->add_child(new Tools::DeferredRendererWidget(static_cast<Systems::DeferredRenderer*>(m_renderer)));
7574
explorerPanel->add_child(new Tools::ControllerWidget(m_controller));
7675
explorerPanel->add_child(new Tools::Separator());
7776
explorerPanel->add_child(new Tools::TextLine(" Application average"));

examples/sponza/application.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <engine/tools/controller.h>
1111
#include <engine/tools/gui.h>
1212
#include <engine/tools/loaders.h>
13-
#include <engine/tools/renderer_widget.h>
1413

1514
/**
1615
* Example app
@@ -27,7 +26,7 @@ class Application
2726
Tools::Panel *explorer{nullptr};
2827
Tools::Panel *tutorial{nullptr};
2928
Tools::Panel *properties{nullptr};
30-
Tools::SceneExplorerWidget *scene{nullptr};
29+
Tools::ExplorerWidget *scene{nullptr};
3130
Tools::ObjectExplorerWidget *object{nullptr};
3231
};
3332
UserInterface m_interface{};

include/engine/core/passes/bloom_pass.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class BloomPass : public BasePass
7373

7474
void link_previous_images(std::vector<Graphics::Image> images);
7575

76-
void update();
76+
void update_framebuffer();
7777

7878
void cleanup();
7979
};

0 commit comments

Comments
 (0)