From fe571568aec9ca9828f3ae114243403b4ff6b80b Mon Sep 17 00:00:00 2001 From: Linloir <3145078758@qq.com> Date: Mon, 19 Dec 2022 17:11:15 +0800 Subject: [PATCH] [CORE][FIX] Fix fragment shader - wrong uniform struct member name causing failure in setting spot light --- FinalProject/fragmentshader.glsl | 8 ++++---- FinalProject/main.cpp | 4 ++++ FinalProject/mainwindow.qrc | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/FinalProject/fragmentshader.glsl b/FinalProject/fragmentshader.glsl index 648e6c4..11a251f 100644 --- a/FinalProject/fragmentshader.glsl +++ b/FinalProject/fragmentshader.glsl @@ -30,8 +30,8 @@ struct PointLight { struct SpotLight { vec3 position; vec3 direction; - float cutOff; - float outerCutOff; + float innercutoff; + float outercutoff; float constant; float linear; @@ -143,8 +143,8 @@ vec3 CalcSpotLight(SpotLight light, vec3 normal, vec3 fragPos, vec3 viewDir) float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance)); // spotlight intensity float theta = dot(lightDir, normalize(-light.direction)); - float epsilon = light.cutOff - light.outerCutOff; - float intensity = clamp((theta - light.outerCutOff) / epsilon, 0.0, 1.0); + float epsilon = light.innercutoff - light.outercutoff; + float intensity = clamp((theta - light.outercutoff) / epsilon, 0.0, 1.0); // combine results vec3 ambient = light.ambient * vec3(texture(material.texture_diffuse1, TexCoords)); vec3 diffuse = light.diffuse * diff * vec3(texture(material.texture_diffuse1, TexCoords)); diff --git a/FinalProject/main.cpp b/FinalProject/main.cpp index 1b8bb85..ca8deb9 100644 --- a/FinalProject/main.cpp +++ b/FinalProject/main.cpp @@ -11,6 +11,10 @@ int main(int argc, char *argv[]) QFontDatabase::addApplicationFont(":/fonts/font_awesome_6_regular_free.otf"); // Add font awesome font to application QFontDatabase::addApplicationFont(":/fonts/font_awesome_6_solid_free.otf"); // Add font awesome font to application + QFontDatabase::addApplicationFont(":/fonts/corbel.ttf"); // Add corbel font to application + QFontDatabase::addApplicationFont(":/fonts/Deng.ttf"); // Add Deng Xian font to application + QFontDatabase::addApplicationFont(":/fonts/Dengb.ttf"); // Add Deng Xian Bold font to application + QFontDatabase::addApplicationFont(":/fonts/Dengl.ttf"); // Add Deng Xian Light font to application MainWindow w; w.setMouseTracking(true); diff --git a/FinalProject/mainwindow.qrc b/FinalProject/mainwindow.qrc index 9b8663a..53f6c03 100644 --- a/FinalProject/mainwindow.qrc +++ b/FinalProject/mainwindow.qrc @@ -14,5 +14,9 @@ font_awesome_6_regular_free.otf font_awesome_6_solid_free.otf + corbel.ttf + Deng.ttf + Dengb.ttf + Dengl.ttf