-Dev: Finally fixed serious bug un bloom

AEspinosaDev · Dec 8, 2024 · 365fad6 · 365fad6
1 parent 3106c9a
commit 365fad6
Show file tree

Hide file tree

Showing 28 changed files with 190,772 additions and 372,574 deletions.
diff --git a/examples/raytracing/application.cpp b/examples/raytracing/application.cpp
@@ -124,25 +124,25 @@ void Application::setup() {
     plane->set_scale(5.0f);
 
     Mesh* stoneMesh = new Mesh();
-    Tools::Loaders::load_3D_file(stoneMesh, MESH_PATH + "stone_lantern.obj", false);
+    Tools::Loaders::load_3D_file(stoneMesh, MESH_PATH + "moisturizer.obj", false);
     auto     stoneMat      = new PhysicallyBasedMaterial();
     Texture* stonelanternT = new Texture();
-    Tools::Loaders::load_texture(stonelanternT, TEXTURE_PATH + "stone_diffuse.png");
+    Tools::Loaders::load_texture(stonelanternT, TEXTURE_PATH + "moisturizer_color.png");
     stoneMat->set_albedo_texture(stonelanternT);
     Texture* stonelanternN = new Texture();
-    Tools::Loaders::load_texture(stonelanternN, TEXTURE_PATH + "stone_normal.png", TEXTURE_FORMAT_TYPE_NORMAL);
+    Tools::Loaders::load_texture(stonelanternN, TEXTURE_PATH + "moisturizer_normal.png", TEXTURE_FORMAT_TYPE_NORMAL);
     stoneMat->set_normal_texture(stonelanternN);
     stoneMesh->push_material(stoneMat);
     stoneMesh->set_name("Lantern");
     stoneMesh->set_position({2.0f, -2.3f, -2.3f});
     stoneMesh->set_rotation({0.0, 126.0f, 0.0f});
-    stoneMesh->set_scale(1.5);
+    // stoneMesh->set_scale(1.5);
     stoneMat->set_roughness(0.5f);
     stoneMat->set_metalness(0.0f);
     m_scene->add(stoneMesh);
 
     Mesh* droidMesh = new Mesh();
-    Tools::Loaders::load_3D_file(droidMesh, MESH_PATH + "droid2.obj", false);
+    Tools::Loaders::load_3D_file(droidMesh, MESH_PATH + "droid.obj", false);
     auto     droidMat   = new PhysicallyBasedMaterial();
     Texture* droidText0 = new Texture();
     Tools::Loaders::load_texture(droidText0, TEXTURE_PATH + "DROID_Body_BaseColor.jpg");

diff --git a/examples/renderer-app/application.cpp b/examples/renderer-app/application.cpp
@@ -28,11 +28,11 @@ void Application::init(Systems::RendererSettings settings) {
 void Application::run(int argc, char* argv[]) {
 
     Systems::RendererSettings settings{};
-    settings.samplesMSAA      = MSAASamples::x1;
+    settings.samplesMSAA      = MSAASamples::x8;
     settings.clearColor       = Vec4(0.02, 0.02, 0.02, 1.0);
     settings.enableUI         = true;
     settings.enableRaytracing = true;
-    settings.softwareAA       = true;
+    settings.softwareAA       = false;
 
     if (argc == 1)
         std::cout << "No arguments submitted, initializing with default parameters..." << std::endl;
@@ -155,10 +155,10 @@ void Application::setup() {
     m_scene->get_lights()[2]->set_shadow_target({1.1f, 0.0f, 9.5f});
     m_scene->get_lights()[2]->set_shadow_fov(110.0f);
     m_scene->get_lights()[2]->set_color({0.25, 0.13, 0});
-    m_scene->get_lights()[2]->set_intensity(0.6);
     PointLight* light2 = new PointLight();
     light2->set_area_of_effect(0.440);
     m_scene->add(light2);
+    m_scene->get_lights()[3]->set_intensity(0.075);
     m_scene->get_lights()[3]->set_position({2.5f, -1.6f, 9.4f});
     m_scene->get_lights()[3]->set_color({0.25, 0.13, 0});
     m_scene->get_lights()[3]->set_cast_shadows(false);
@@ -353,7 +353,7 @@ void Application::setup_gui() {
     m_interface.scene           = new Tools::SceneExplorerWidget(m_scene);
     explorerPanel->add_child(m_interface.scene);
     explorerPanel->add_child(new Tools::Space());
-    explorerPanel->add_child(new Tools::RendererSettingsWidget(m_renderer));
+    explorerPanel->add_child(new Tools::ForwardRendererWidget(static_cast<Systems::ForwardRenderer*>(m_renderer)));
     explorerPanel->add_child(new Tools::Separator());
     explorerPanel->add_child(new Tools::TextLine(" Application average"));
     explorerPanel->add_child(new Tools::Profiler());