celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-15 20:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed outline wrapping vertically when outline is on edge

Browse Source
This commit is contained in:
Antoine Pilote
2024-08-16 18:03:19 -04:00
parent 48949ba6eb
commit 1fd9ce8cae
2 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Nuake/src/Resource/StaticResources.cpp
View File

@@ -271593,56 +271593,58 @@ const std::string Resources_Shaders_outline_shader_path = R"(Resources/Shaders/o
0x0a, 0x09, 0x09, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x76, 0x2e,
0x78, 0x20, 0x3d, 0x20, 0x63, 0x6c, 0x61, 0x6d, 0x70, 0x28, 0x73, 0x61,
0x6d, 0x70, 0x6c, 0x65, 0x55, 0x76, 0x2e, 0x78, 0x2c, 0x20, 0x30, 0x2e,
0x30, 0x2c, 0x20, 0x31, 0x2e, 0x30, 0x29, 0x3b, 0x0d, 0x0a, 0x09, 0x09,
0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x76, 0x2e, 0x79, 0x20, 0x3d,
0x20, 0x63, 0x6c, 0x61, 0x6d, 0x70, 0x28, 0x73, 0x61, 0x6d, 0x70, 0x6c,
0x65, 0x55, 0x76, 0x2e, 0x79, 0x2c, 0x20, 0x30, 0x2e, 0x30, 0x2c, 0x20,
0x31, 0x2e, 0x30, 0x29, 0x3b, 0x0d, 0x0a, 0x0d, 0x0a, 0x09, 0x09, 0x75,
0x69, 0x6e, 0x74, 0x20, 0x63, 0x6f, 0x6c, 0x20, 0x3d, 0x20, 0x74, 0x65,
0x78, 0x74, 0x75, 0x72, 0x65, 0x28, 0x75, 0x5f, 0x45, 0x6e, 0x74, 0x69,
0x74, 0x79, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x2c, 0x20, 0x73,
0x61, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x76, 0x29, 0x2e, 0x72, 0x3b, 0x0d,
0x0a, 0x09, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x20, 0x64, 0x65, 0x70,
0x74, 0x68, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x3d, 0x20, 0x74,
0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x28, 0x75, 0x5f, 0x44, 0x65, 0x70,
0x74, 0x68, 0x2c, 0x20, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x76,
0x29, 0x2e, 0x72, 0x3b, 0x0d, 0x0a, 0x09, 0x09, 0x69, 0x66, 0x28, 0x63,
0x6f, 0x6c, 0x20, 0x3d, 0x3d, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
0x20, 0x26, 0x26, 0x20, 0x64, 0x65, 0x70, 0x74, 0x68, 0x54, 0x61, 0x72,
0x67, 0x65, 0x74, 0x20, 0x3c, 0x20, 0x64, 0x65, 0x70, 0x74, 0x68, 0x29,
0x0d, 0x0a, 0x09, 0x09, 0x7b, 0x0d, 0x0a, 0x09, 0x09, 0x09, 0x68, 0x61,
0x73, 0x48, 0x69, 0x74, 0x20, 0x3d, 0x20, 0x31, 0x2e, 0x30, 0x66, 0x3b,
0x0d, 0x0a, 0x09, 0x09, 0x7d, 0x0d, 0x0a, 0x0d, 0x0a, 0x09, 0x09, 0x2f,
0x2f, 0x20, 0x4d, 0x69, 0x78, 0x20, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e,
0x65, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67,
0x72, 0x6f, 0x75, 0x6e, 0x64, 0x0d, 0x0a, 0x09, 0x09, 0x66, 0x6c, 0x6f,
0x61, 0x74, 0x20, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x20, 0x3d, 0x20, 0x73,
0x6d, 0x6f, 0x6f, 0x74, 0x68, 0x73, 0x74, 0x65, 0x70, 0x28, 0x30, 0x2e,
0x35, 0x2c, 0x20, 0x30, 0x2e, 0x39, 0x2c, 0x20, 0x69, 0x6e, 0x74, 0x28,
0x63, 0x6f, 0x6c, 0x20, 0x21, 0x3d, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65,
0x74, 0x29, 0x20, 0x2a, 0x20, 0x68, 0x61, 0x73, 0x48, 0x69, 0x74, 0x20,
0x2a, 0x20, 0x31, 0x30, 0x2e, 0x30, 0x66, 0x29, 0x3b, 0x0d, 0x0a, 0x09,
0x09, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d,
0x20, 0x6d, 0x69, 0x78, 0x28, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c,
0x6f, 0x72, 0x2c, 0x20, 0x75, 0x5f, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e,
0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x2c, 0x20, 0x61, 0x6c, 0x70, 0x68,
0x61, 0x29, 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, 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
0x30, 0x2c, 0x20, 0x30, 0x2e, 0x39, 0x39, 0x39, 0x29, 0x3b, 0x0d, 0x0a,
0x09, 0x09, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x76, 0x2e, 0x79,
0x20, 0x3d, 0x20, 0x63, 0x6c, 0x61, 0x6d, 0x70, 0x28, 0x73, 0x61, 0x6d,
0x70, 0x6c, 0x65, 0x55, 0x76, 0x2e, 0x79, 0x2c, 0x20, 0x30, 0x2e, 0x30,
0x2c, 0x20, 0x30, 0x2e, 0x39, 0x39, 0x39, 0x29, 0x3b, 0x0d, 0x0a, 0x0d,
0x0a, 0x09, 0x09, 0x75, 0x69, 0x6e, 0x74, 0x20, 0x63, 0x6f, 0x6c, 0x20,
0x3d, 0x20, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x28, 0x75, 0x5f,
0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72,
0x65, 0x2c, 0x20, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x55, 0x76, 0x29,
0x2e, 0x72, 0x3b, 0x0d, 0x0a, 0x09, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74,
0x20, 0x64, 0x65, 0x70, 0x74, 0x68, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
0x20, 0x3d, 0x20, 0x74, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x28, 0x75,
0x5f, 0x44, 0x65, 0x70, 0x74, 0x68, 0x2c, 0x20, 0x73, 0x61, 0x6d, 0x70,
0x6c, 0x65, 0x55, 0x76, 0x29, 0x2e, 0x72, 0x3b, 0x0d, 0x0a, 0x09, 0x09,
0x69, 0x66, 0x28, 0x63, 0x6f, 0x6c, 0x20, 0x3d, 0x3d, 0x20, 0x74, 0x61,
0x72, 0x67, 0x65, 0x74, 0x20, 0x26, 0x26, 0x20, 0x64, 0x65, 0x70, 0x74,
0x68, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x21, 0x3d, 0x20, 0x30,
0x2e, 0x30, 0x66, 0x20, 0x26, 0x26, 0x20, 0x64, 0x65, 0x70, 0x74, 0x68,
0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x20, 0x3c, 0x20, 0x64, 0x65, 0x70,
0x74, 0x68, 0x29, 0x0d, 0x0a, 0x09, 0x09, 0x7b, 0x0d, 0x0a, 0x09, 0x09,
0x09, 0x68, 0x61, 0x73, 0x48, 0x69, 0x74, 0x20, 0x3d, 0x20, 0x31, 0x2e,
0x30, 0x66, 0x3b, 0x0d, 0x0a, 0x09, 0x09, 0x7d, 0x0d, 0x0a, 0x0d, 0x0a,
0x09, 0x09, 0x2f, 0x2f, 0x20, 0x4d, 0x69, 0x78, 0x20, 0x6f, 0x75, 0x74,
0x6c, 0x69, 0x6e, 0x65, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x62, 0x61,
0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x0d, 0x0a, 0x09, 0x09,
0x66, 0x6c, 0x6f, 0x61, 0x74, 0x20, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x20,
0x3d, 0x20, 0x73, 0x6d, 0x6f, 0x6f, 0x74, 0x68, 0x73, 0x74, 0x65, 0x70,
0x28, 0x30, 0x2e, 0x35, 0x2c, 0x20, 0x30, 0x2e, 0x39, 0x2c, 0x20, 0x69,
0x6e, 0x74, 0x28, 0x63, 0x6f, 0x6c, 0x20, 0x21, 0x3d, 0x20, 0x74, 0x61,
0x72, 0x67, 0x65, 0x74, 0x29, 0x20, 0x2a, 0x20, 0x68, 0x61, 0x73, 0x48,
0x69, 0x74, 0x20, 0x2a, 0x20, 0x31, 0x30, 0x2e, 0x30, 0x66, 0x29, 0x3b,
0x0d, 0x0a, 0x09, 0x09, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f,
0x72, 0x20, 0x3d, 0x20, 0x6d, 0x69, 0x78, 0x28, 0x66, 0x72, 0x61, 0x67,
0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x2c, 0x20, 0x75, 0x5f, 0x4f, 0x75, 0x74,
0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x2c, 0x20, 0x61,
0x6c, 0x70, 0x68, 0x61, 0x29, 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, 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
};
unsigned int Resources_Shaders_outline_shader_len = 1734;
unsigned int Resources_Shaders_outline_shader_len = 1761;
// Data for file: Resources_Shaders_pbr_shader_path
const std::string Resources_Shaders_pbr_shader_path = R"(Resources/Shaders/pbr.shader)";
@@ -272946,7 +272948,7 @@ const std::string Resources_Shaders_shadowMap_skinned_shader_path = R"(Resources
unsigned char Resources_Shaders_shadowMap_skinned_shader[] = {
0x23, 0x73, 0x68, 0x61, 0x64, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x74,
0x65, 0x78, 0x0d, 0x0a, 0x23, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
0x20, 0x34, 0x36, 0x30, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x0d, 0x0a, 0x0d,
0x20, 0x34, 0x34, 0x30, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x0d, 0x0a, 0x0d,
0x0a, 0x6c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x28, 0x6c, 0x6f, 0x63, 0x61,
0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x30, 0x29, 0x20, 0x69, 0x6e,
0x20, 0x76, 0x65, 0x63, 0x33, 0x20, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69,
@@ -273035,7 +273037,7 @@ const std::string Resources_Shaders_shadowMap_skinned_shader_path = R"(Resources
0x6c, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x0d, 0x0a,
0x7d, 0x0d, 0x0a, 0x0d, 0x0a, 0x23, 0x73, 0x68, 0x61, 0x64, 0x65, 0x72,
0x20, 0x66, 0x72, 0x61, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x0d, 0x0a, 0x23,
0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x34, 0x36, 0x30, 0x20,
0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x34, 0x34, 0x30, 0x20,
0x63, 0x6f, 0x72, 0x65, 0x0d, 0x0a, 0x0d, 0x0a, 0x76, 0x6f, 0x69, 0x64,
0x20, 0x6d, 0x61, 0x69, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x20, 0x7d
};

6
Resources/Shaders/outline.shader
View File

@@ -49,12 +49,12 @@ void main()
// We dont want to sample outside the viewport
vec2 sampleUv = uv + offset;
sampleUv.x = clamp(sampleUv.x, 0.0, 1.0);
sampleUv.y = clamp(sampleUv.y, 0.0, 1.0);
sampleUv.x = clamp(sampleUv.x, 0.0, 0.999);
sampleUv.y = clamp(sampleUv.y, 0.0, 0.999);
uint col = texture(u_EntityTexture, sampleUv).r;
float depthTarget = texture(u_Depth, sampleUv).r;
if(col == target && depthTarget < depth)
if(col == target && depthTarget != 0.0f && depthTarget < depth)
{
hasHit = 1.0f;
}