diff --git a/Nuake/src/Resource/StaticResources.cpp b/Nuake/src/Resource/StaticResources.cpp index 3cd3c81b..47093209 100644 --- a/Nuake/src/Resource/StaticResources.cpp +++ b/Nuake/src/Resource/StaticResources.cpp @@ -271844,22 +271844,35 @@ namespace Nuake { 0x61, 0x2C, 0x20, 0x61, 0x6C, 0x70, 0x68, 0x61, 0x29, 0x0D, 0x0A, 0x09, 0x09, 0x29, 0x3B, 0x0D, 0x0A, 0x0D, 0x0A, 0x09, 0x09, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x20, 0x3D, 0x20, 0x6F, 0x75, 0x74, - 0x70, 0x75, 0x74, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x3B, 0x0D, 0x0A, 0x3B, - 0x0D, 0x0A, 0x09, 0x7D, 0x0D, 0x0A, 0x09, 0x0D, 0x0A, 0x20, 0x20, 0x20, - 0x20, 0x69, 0x66, 0x28, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, - 0x72, 0x2E, 0x61, 0x20, 0x3E, 0x20, 0x30, 0x2E, 0x31, 0x29, 0x0D, 0x0A, - 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, 0x72, - 0x2E, 0x61, 0x20, 0x3D, 0x20, 0x31, 0x2E, 0x30, 0x66, 0x3B, 0x0D, 0x0A, - 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x0D, + 0x70, 0x75, 0x74, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x3B, 0x0D, 0x0A, 0x09, + 0x7D, 0x0D, 0x0A, 0x09, 0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, + 0x28, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x2E, 0x61, + 0x20, 0x3E, 0x20, 0x30, 0x2E, 0x31, 0x29, 0x0D, 0x0A, 0x20, 0x20, 0x20, + 0x20, 0x7B, 0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x2E, 0x61, 0x20, + 0x3D, 0x20, 0x31, 0x2E, 0x30, 0x66, 0x3B, 0x0D, 0x0A, 0x20, 0x20, 0x20, + 0x20, 0x7D, 0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x0D, 0x0A, 0x09, 0x66, + 0x6C, 0x6F, 0x61, 0x74, 0x20, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x20, 0x3D, + 0x20, 0x66, 0x6C, 0x6F, 0x61, 0x74, 0x28, 0x6D, 0x69, 0x64, 0x64, 0x6C, + 0x65, 0x53, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x20, 0x21, 0x3D, 0x20, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x26, 0x26, 0x20, 0x68, 0x61, 0x73, + 0x48, 0x69, 0x74, 0x20, 0x3E, 0x20, 0x30, 0x2E, 0x30, 0x66, 0x29, 0x3B, + 0x0D, 0x0A, 0x09, 0x76, 0x65, 0x63, 0x34, 0x20, 0x66, 0x69, 0x6E, 0x61, + 0x6C, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x20, 0x3D, 0x20, 0x76, 0x65, 0x63, + 0x34, 0x28, 0x0D, 0x0A, 0x09, 0x09, 0x6D, 0x69, 0x78, 0x28, 0x30, 0x2C, + 0x20, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x2E, 0x72, + 0x2C, 0x20, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x29, 0x2C, 0x0D, 0x0A, 0x09, + 0x09, 0x6D, 0x69, 0x78, 0x28, 0x30, 0x2C, 0x20, 0x66, 0x72, 0x61, 0x67, + 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x2E, 0x67, 0x2C, 0x20, 0x72, 0x61, 0x74, + 0x69, 0x6F, 0x29, 0x2C, 0x0D, 0x0A, 0x09, 0x09, 0x6D, 0x69, 0x78, 0x28, + 0x30, 0x2C, 0x20, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, 0x72, + 0x2E, 0x62, 0x2C, 0x20, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x29, 0x2C, 0x0D, + 0x0A, 0x09, 0x09, 0x6D, 0x69, 0x78, 0x28, 0x30, 0x2C, 0x20, 0x66, 0x72, + 0x61, 0x67, 0x43, 0x6F, 0x6C, 0x6F, 0x72, 0x2E, 0x61, 0x2C, 0x20, 0x72, + 0x61, 0x74, 0x69, 0x6F, 0x29, 0x2C, 0x0D, 0x0A, 0x09, 0x29, 0x3B, 0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x46, 0x72, 0x61, 0x67, 0x43, 0x6F, 0x6C, - 0x6F, 0x72, 0x20, 0x3D, 0x20, 0x6D, 0x69, 0x78, 0x28, 0x76, 0x65, 0x63, - 0x34, 0x28, 0x30, 0x29, 0x2C, 0x20, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6F, - 0x6C, 0x6F, 0x72, 0x2C, 0x20, 0x6D, 0x69, 0x64, 0x64, 0x6C, 0x65, 0x53, - 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x20, 0x21, 0x3D, 0x20, 0x74, 0x61, 0x72, - 0x67, 0x65, 0x74, 0x20, 0x26, 0x26, 0x20, 0x68, 0x61, 0x73, 0x48, 0x69, - 0x74, 0x20, 0x3E, 0x20, 0x30, 0x2E, 0x30, 0x66, 0x29, 0x3B, 0x0D, 0x0A, - 0x7D, 0x0D, 0x0A, + 0x6F, 0x72, 0x20, 0x3D, 0x20, 0x66, 0x69, 0x6E, 0x61, 0x6C, 0x43, 0x6F, + 0x6C, 0x6F, 0x72, 0x3B, 0x0D, 0x0A, 0x7D, 0x0D, 0x0A, }; unsigned int Resources_Shaders_outline_shader_len = sizeof(Resources_Shaders_outline_shader); diff --git a/Resources/Shaders/outline.shader b/Resources/Shaders/outline.shader index 0344d6f6..d8b3811d 100644 --- a/Resources/Shaders/outline.shader +++ b/Resources/Shaders/outline.shader @@ -72,7 +72,6 @@ void main() ); fragColor = outputColor; -; } if(fragColor.a > 0.1) @@ -80,5 +79,12 @@ void main() fragColor.a = 1.0f; } - FragColor = mix(vec4(0), fragColor, middleSample != target && hasHit > 0.0f); + float ratio = float(middleSample != target && hasHit > 0.0f); + vec4 finalColor = vec4( + mix(0, fragColor.r, ratio), + mix(0, fragColor.g, ratio), + mix(0, fragColor.b, ratio), + mix(0, fragColor.a, ratio), + ); + FragColor = finalColor; }