Added emission mapping and change camera location when pressing the 'F' button.

Author: AlonsoCerpa

NeonEngine/imgui.ini

@@ -26,13 +26,13 @@ Collapsed=0
 
 [Window][Viewport]
 Pos=0,36
-Size=1680,990
+Size=1796,1067
 Collapsed=0
 DockId=0x00000003,0
 
 [Window][Details]
-Pos=1682,776
-Size=878,664
+Pos=1798,776
+Size=762,664
 Collapsed=0
 DockId=0x00000002,0
 
@@ -43,8 +43,8 @@ Collapsed=0
 DockId=0x3BC79352,0
 
 [Window][Content Browser]
-Pos=0,1028
-Size=1680,412
+Pos=0,1105
+Size=1796,335
 Collapsed=0
 DockId=0x00000001,0
 
@@ -55,20 +55,20 @@ Size=1441,1038
 Collapsed=0
 
 [Window][Outliner]
-Pos=1682,36
-Size=878,738
+Pos=1798,36
+Size=762,738
 Collapsed=0
 DockId=0x00000006,0
 
 [Window][Logger]
-Pos=0,1028
-Size=1680,412
+Pos=0,1105
+Size=1796,335
 Collapsed=0
 DockId=0x00000001,1
 
 [Window][World Settings]
-Pos=1682,776
-Size=878,664
+Pos=1798,776
+Size=762,664
 Collapsed=0
 DockId=0x00000002,1
 
@@ -86,8 +86,8 @@ Column 0  Weight=0.5767
 Column 1  Weight=1.4233
 
 [Table][0xFE3FDFD6,2]
-Column 0  Weight=0.6932
-Column 1  Weight=1.3068
+Column 0  Weight=0.7707
+Column 1  Weight=1.2293
 
 [Table][0x7B1C85EA,2]
 Column 0  Weight=0.6747
@@ -119,11 +119,11 @@ Column 1  Weight=1.3204
 
 [Docking][Data]
 DockSpace     ID=0x3BC79352 Pos=49,119 Size=2560,1404 CentralNode=1 Selected=0x13926F0B
-DockSpace     ID=0xD2411A5B Window=0x0FB73749 Pos=556,479 Size=2560,1404 Split=X Selected=0x13926F0B
-  DockNode    ID=0x00000004 Parent=0xD2411A5B SizeRef=1680,1404 Split=Y
-    DockNode  ID=0x00000003 Parent=0x00000004 SizeRef=2560,990 CentralNode=1 Selected=0x13926F0B
-    DockNode  ID=0x00000001 Parent=0x00000004 SizeRef=2560,412 Selected=0x0340EFE6
-  DockNode    ID=0x00000005 Parent=0xD2411A5B SizeRef=878,1404 Split=Y Selected=0x94263E27
+DockSpace     ID=0xD2411A5B Window=0x0FB73749 Pos=734,401 Size=2560,1404 Split=X Selected=0x13926F0B
+  DockNode    ID=0x00000004 Parent=0xD2411A5B SizeRef=1796,1404 Split=Y
+    DockNode  ID=0x00000003 Parent=0x00000004 SizeRef=2560,1067 CentralNode=1 Selected=0x13926F0B
+    DockNode  ID=0x00000001 Parent=0x00000004 SizeRef=2560,335 Selected=0x0340EFE6
+  DockNode    ID=0x00000005 Parent=0xD2411A5B SizeRef=762,1404 Split=Y Selected=0x94263E27
     DockNode  ID=0x00000006 Parent=0x00000005 SizeRef=721,738 Selected=0x94263E27
     DockNode  ID=0x00000002 Parent=0x00000005 SizeRef=721,664 Selected=0xFC3EA205
 

NeonEngine/log.txt

@@ -1,6 +1,6 @@
-2023-05-20 16:31:46 Loading model: knight
-2023-05-20 16:31:46 Model loaded in 0.354591 seconds
-2023-05-20 16:31:46 Loading model: mutant
-2023-05-20 16:31:47 Model loaded in 0.398365 seconds
-2023-05-20 16:31:47 Loading model: android
-2023-05-20 16:31:49 Model loaded in 2.193132 seconds
+2023-05-20 18:09:04 Loading model: knight
+2023-05-20 18:09:04 Model loaded in 0.354199 seconds
+2023-05-20 18:09:04 Loading model: mutant
+2023-05-20 18:09:04 Model loaded in 0.392867 seconds
+2023-05-20 18:09:04 Loading model: android
+2023-05-20 18:09:07 Model loaded in 2.226358 seconds

NeonEngine/shaders/PBR.frag

@@ -29,6 +29,8 @@ uniform float metalness_model;
 uniform float roughness_model;
 uniform vec3 emission_model;
 
+uniform float emission_strength;
+
 // IBL
 uniform samplerCube irradianceMap;
 uniform samplerCube prefilterMap;
@@ -160,7 +162,7 @@ void main() {
         }
         vec3 emission = emission_model;
         if (has_texture_emission == 1) {
-            emission = texture(texture_emission, TexCoords).rgb;
+            emission = pow(texture(texture_emission, TexCoords).rgb, vec3(2.2));
         }
         float ambient_occlusion = 1.0;
         if (has_texture_ambient_occlusion == 1) {
@@ -314,7 +316,7 @@ void main() {
 
         vec3 color = ambient + Lo;
 
-        FragColor = vec4(color , 1.0);
+        FragColor = vec4(color + emission_strength * emission , 1.0);
     }
 
     float brightness = dot(FragColor.rgb, vec3(0.2126, 0.7152, 0.0722));

NeonEngine/src/input.cpp

@@ -159,6 +159,12 @@ void Input::process_viewport_input() {
             firstMouse = true;
         }
     }
+
+    if (rendering->last_selected_object != nullptr && ImGui::IsKeyPressed(ImGuiKey_F, false)) {
+        rendering->camera_viewport->Position += rendering->last_selected_object->position - rendering->camera_viewport->Position;
+        rendering->camera_viewport->Position -= 10.0f * rendering->camera_viewport->Front;
+        std::cout << "F pressed" << std::endl;
+    }
 }
 
 void Input::mouse_rotate_camera() {

NeonEngine/src/rendering.cpp

@@ -56,6 +56,7 @@ Rendering::Rendering() {
     bloom_filter_radius = 0.005f;
     bloom_strength = 0.04f;
     bloom_activated = true;
+    emission_strength = 8.0f;
 
     // PBR parameters
     ENVIRONMENT_MAP_WIDTH = 2048;
@@ -676,7 +677,7 @@ void Rendering::initialize_game_objects() {
     PointLight* point_light1 = new PointLight("point_light1", "sphere");
     point_light1->type = TypePointLight;
     point_light1->position = glm::vec3(-10.0f, 10.0f, 10.0f);
-    point_light1->albedo = glm::vec3(1.0f, 0.0f, 0.0f);
+    point_light1->albedo = glm::vec3(170.0f/255.0f, 0.0f/255.0f, 255.0f/255.0f);
     point_light1->intensity = 5.0f;
     point_light1->render_only_ambient = true;
     point_light1->render_one_color = true;
@@ -688,7 +689,7 @@ void Rendering::initialize_game_objects() {
     PointLight* point_light2 = new PointLight("point_light2", "sphere");
     point_light2->type = TypePointLight;
     point_light2->position = glm::vec3(10.0f, 10.0f, 10.0f);
-    point_light2->albedo = glm::vec3(0.0f, 1.0f, 0.0f);
+    point_light2->albedo = glm::vec3(76.0f/255.0f, 255.0f/255.0f, 0.0f/255.0f);
     point_light2->intensity = 5.0f;
     point_light2->render_only_ambient = true;
     point_light2->render_one_color = true;
@@ -700,7 +701,7 @@ void Rendering::initialize_game_objects() {
     PointLight* point_light3 = new PointLight("point_light3", "sphere");
     point_light3->type = TypePointLight;
     point_light3->position = glm::vec3(-10.0f, -10.0f, 10.0f);
-    point_light3->albedo = glm::vec3(0.0f, 0.0f, 1.0f);
+    point_light3->albedo = glm::vec3(255.0f/255.0f, 98.0f/255.0f, 0.0f/255.0f);
     point_light3->intensity = 25.0f;
     point_light3->render_only_ambient = true;
     point_light3->render_one_color = true;
@@ -712,7 +713,7 @@ void Rendering::initialize_game_objects() {
     PointLight* point_light4 = new PointLight("point_light4", "sphere");
     point_light4->type = TypePointLight;
     point_light4->position = glm::vec3(10.0f, -10.0f, 10.0f);
-    point_light4->albedo = glm::vec3(1.0f, 1.0f, 1.0f);
+    point_light4->albedo = glm::vec3(255.0f/255.0f, 255.0f/255.0f, 255.0f/255.0f);
     point_light4->intensity = 5.0f;
     point_light4->render_only_ambient = true;
     point_light4->render_one_color = true;
@@ -822,6 +823,8 @@ void Rendering::render_viewport() {
     lighting_shader->setInt("num_directional_lights", directional_lights.size());
     lighting_shader->setInt("num_spot_lights", spot_lights.size());
 
+    lighting_shader->setFloat("emission_strength", emission_strength);
+
     int idx_point_light = 0;
     for (auto it = point_lights.begin(); it != point_lights.end(); it++, idx_point_light++) {
         lighting_shader->setVec3("pointLights[" + std::to_string(idx_point_light) + "].position", it->second->position);

NeonEngine/src/rendering.h

@@ -88,6 +88,7 @@ class Rendering {
     Shader* hdr_to_ldr_shader;
     Cubemap* cubemap;
     CubemapTextureType cubemap_texture_type;
+    float emission_strength;
     float cubemap_texture_mipmap_level;
     unsigned int bloom_fbo;
     float bloom_filter_radius;

NeonEngine/src/user_interface.cpp

@@ -348,6 +348,15 @@ void UserInterface::render_app() {
             ImGui::DragFloat("##BloomStrength", &(rendering->bloom_strength), 0.001f, 0.0f, std::numeric_limits<float>::max());
         }
 
+        // Row 4: Emission Strength
+        ImGui::TableNextRow();
+
+        ImGui::TableSetColumnIndex(0);
+        ImGui::Text("Emission strength");
+
+        ImGui::TableSetColumnIndex(1);
+        ImGui::DragFloat("##EmissionStrength", &(rendering->emission_strength), 0.2f, 0.0f, std::numeric_limits<float>::max());
+
         ImGui::PopItemWidth();
 
         ImGui::EndTable();