Skip to content

Commit 365fad6

Browse files
committed
-Dev: Finally fixed serious bug un bloom
1 parent 3106c9a commit 365fad6

File tree

28 files changed

+190772
-372574
lines changed

28 files changed

+190772
-372574
lines changed

examples/raytracing/application.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,25 +124,25 @@ void Application::setup() {
124124
plane->set_scale(5.0f);
125125

126126
Mesh* stoneMesh = new Mesh();
127-
Tools::Loaders::load_3D_file(stoneMesh, MESH_PATH + "stone_lantern.obj", false);
127+
Tools::Loaders::load_3D_file(stoneMesh, MESH_PATH + "moisturizer.obj", false);
128128
auto stoneMat = new PhysicallyBasedMaterial();
129129
Texture* stonelanternT = new Texture();
130-
Tools::Loaders::load_texture(stonelanternT, TEXTURE_PATH + "stone_diffuse.png");
130+
Tools::Loaders::load_texture(stonelanternT, TEXTURE_PATH + "moisturizer_color.png");
131131
stoneMat->set_albedo_texture(stonelanternT);
132132
Texture* stonelanternN = new Texture();
133-
Tools::Loaders::load_texture(stonelanternN, TEXTURE_PATH + "stone_normal.png", TEXTURE_FORMAT_TYPE_NORMAL);
133+
Tools::Loaders::load_texture(stonelanternN, TEXTURE_PATH + "moisturizer_normal.png", TEXTURE_FORMAT_TYPE_NORMAL);
134134
stoneMat->set_normal_texture(stonelanternN);
135135
stoneMesh->push_material(stoneMat);
136136
stoneMesh->set_name("Lantern");
137137
stoneMesh->set_position({2.0f, -2.3f, -2.3f});
138138
stoneMesh->set_rotation({0.0, 126.0f, 0.0f});
139-
stoneMesh->set_scale(1.5);
139+
// stoneMesh->set_scale(1.5);
140140
stoneMat->set_roughness(0.5f);
141141
stoneMat->set_metalness(0.0f);
142142
m_scene->add(stoneMesh);
143143

144144
Mesh* droidMesh = new Mesh();
145-
Tools::Loaders::load_3D_file(droidMesh, MESH_PATH + "droid2.obj", false);
145+
Tools::Loaders::load_3D_file(droidMesh, MESH_PATH + "droid.obj", false);
146146
auto droidMat = new PhysicallyBasedMaterial();
147147
Texture* droidText0 = new Texture();
148148
Tools::Loaders::load_texture(droidText0, TEXTURE_PATH + "DROID_Body_BaseColor.jpg");

examples/renderer-app/application.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ void Application::init(Systems::RendererSettings settings) {
2828
void Application::run(int argc, char* argv[]) {
2929

3030
Systems::RendererSettings settings{};
31-
settings.samplesMSAA = MSAASamples::x1;
31+
settings.samplesMSAA = MSAASamples::x8;
3232
settings.clearColor = Vec4(0.02, 0.02, 0.02, 1.0);
3333
settings.enableUI = true;
3434
settings.enableRaytracing = true;
35-
settings.softwareAA = true;
35+
settings.softwareAA = false;
3636

3737
if (argc == 1)
3838
std::cout << "No arguments submitted, initializing with default parameters..." << std::endl;
@@ -155,10 +155,10 @@ void Application::setup() {
155155
m_scene->get_lights()[2]->set_shadow_target({1.1f, 0.0f, 9.5f});
156156
m_scene->get_lights()[2]->set_shadow_fov(110.0f);
157157
m_scene->get_lights()[2]->set_color({0.25, 0.13, 0});
158-
m_scene->get_lights()[2]->set_intensity(0.6);
159158
PointLight* light2 = new PointLight();
160159
light2->set_area_of_effect(0.440);
161160
m_scene->add(light2);
161+
m_scene->get_lights()[3]->set_intensity(0.075);
162162
m_scene->get_lights()[3]->set_position({2.5f, -1.6f, 9.4f});
163163
m_scene->get_lights()[3]->set_color({0.25, 0.13, 0});
164164
m_scene->get_lights()[3]->set_cast_shadows(false);
@@ -353,7 +353,7 @@ void Application::setup_gui() {
353353
m_interface.scene = new Tools::SceneExplorerWidget(m_scene);
354354
explorerPanel->add_child(m_interface.scene);
355355
explorerPanel->add_child(new Tools::Space());
356-
explorerPanel->add_child(new Tools::RendererSettingsWidget(m_renderer));
356+
explorerPanel->add_child(new Tools::ForwardRendererWidget(static_cast<Systems::ForwardRenderer*>(m_renderer)));
357357
explorerPanel->add_child(new Tools::Separator());
358358
explorerPanel->add_child(new Tools::TextLine(" Application average"));
359359
explorerPanel->add_child(new Tools::Profiler());

0 commit comments

Comments
 (0)