From 3230622c79a20fe264e2250c7fe197d1da1af412 Mon Sep 17 00:00:00 2001
From: "R.E. Kovalev" <re.kovalev@gmail.com>
Date: Mon, 19 Jun 2023 10:40:17 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D0=B3=D0=B0=D0=BC=D0=BC=D0=B0-=D0=BA=D0=BE=D1=80?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=86=D0=B8=D0=B8=20=D0=BC=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B0=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Model.cpp | 7 +++++--
 src/main.cpp  | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Model.cpp b/src/Model.cpp
index 89c8339..de90918 100644
--- a/src/Model.cpp
+++ b/src/Model.cpp
@@ -268,6 +268,9 @@ GrouptedModel loadOBJtoGroupted(const char* filename, const char* mtl_directory,
 
     std::string err;
 
+    // Значение гамма-коррекции
+    extern float inv_gamma;
+
     // Если в процессе загрузки возникли ошибки - выдадим исключение
     if (!tinyobj::LoadObj(&attrib, &shapes, &materials, &err, filename, mtl_directory))
         throw std::runtime_error(err);
@@ -367,8 +370,8 @@ GrouptedModel loadOBJtoGroupted(const char* filename, const char* mtl_directory,
         s->set_texture(specular);
 
         // Материал
-        s->material.ka = glm::vec3(materials[materials_ids[i]].ambient[0],  materials[materials_ids[i]].ambient[1],  materials[materials_ids[i]].ambient[2]);
-        s->material.kd = glm::vec3(materials[materials_ids[i]].diffuse[0],  materials[materials_ids[i]].diffuse[1],  materials[materials_ids[i]].diffuse[2]);
+        s->material.ka = pow(glm::vec3(materials[materials_ids[i]].ambient[0],  materials[materials_ids[i]].ambient[1],  materials[materials_ids[i]].ambient[2]), glm::vec3(1/inv_gamma));
+        s->material.kd = pow(glm::vec3(materials[materials_ids[i]].diffuse[0],  materials[materials_ids[i]].diffuse[1],  materials[materials_ids[i]].diffuse[2]), glm::vec3(1/inv_gamma));
         s->material.ks = glm::vec3(materials[materials_ids[i]].specular[0], materials[materials_ids[i]].specular[1], materials[materials_ids[i]].specular[2]);
         s->material.p  = (materials[materials_ids[i]].shininess > 0.0f) ? 1000.0f / materials[materials_ids[i]].shininess : 1000.0f;
     }    
diff --git a/src/main.cpp b/src/main.cpp
index e851b65..9305004 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,6 +16,9 @@
 #define WINDOW_HEIGHT 600
 #define WINDOW_CAPTION "OPENGL notes on rekovalev.site"
 
+// Значение гамма-коррекции
+float inv_gamma = 1/2.2;
+
 // Функция-callback для изменения размеров буфера кадра в случае изменения размеров поверхности окна
 void framebuffer_size_callback(GLFWwindow* window, int width, int height)
 {
@@ -390,7 +393,6 @@ int main(void)
     skyboxShader.bindTextures(skybox_shader_names, sizeof(skybox_shader_names)/sizeof(const char*));
     
     // Значение гамма-коррекции
-    float inv_gamma = 1/2.2;
     UBO gamma(&inv_gamma, sizeof(inv_gamma), 4);
 
     // Пока не произойдет событие запроса закрытия окна