celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Can no longer select occluded gizmos

Browse Source
This commit is contained in:
Antoine Pilote
2024-03-16 11:51:32 -04:00
parent c49c0f7546
commit d3382e22ff
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235272,13 +235272,17 @@ const std::string Resources_Shaders_gizmo_shader_path = R"(Resources/Shaders/giz
0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x2a, 0x20, 0x76, 0x65, 0x63,
0x34, 0x28, 0x31, 0x2c, 0x20, 0x31, 0x2c, 0x20, 0x31, 0x2c, 0x20, 0x75,
0x5f, 0x4f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x29, 0x3b, 0x0d, 0x0a,
0x0d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x67, 0x45, 0x6e, 0x74, 0x69, 0x74,
0x79, 0x49, 0x44, 0x20, 0x3d, 0x20, 0x75, 0x5f, 0x45, 0x6e, 0x74, 0x69,
0x74, 0x79, 0x49, 0x44, 0x3b, 0x0d, 0x0a, 0x0d, 0x0a, 0x20, 0x20, 0x20,
0x20, 0x46, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d,
0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0d, 0x0a, 0x7d
0x0d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x28, 0x75, 0x5f, 0x4f,
0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x20, 0x3e, 0x3d, 0x20, 0x30, 0x2e,
0x35, 0x66, 0x29, 0x0d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7b, 0x0d, 0x0a,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x67, 0x45, 0x6e, 0x74,
0x69, 0x74, 0x79, 0x49, 0x44, 0x20, 0x3d, 0x20, 0x75, 0x5f, 0x45, 0x6e,
0x74, 0x69, 0x74, 0x79, 0x49, 0x44, 0x3b, 0x0d, 0x0a, 0x20, 0x20, 0x20,
0x20, 0x7d, 0x0d, 0x0a, 0x0d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x46, 0x72,
0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x63, 0x6f,
0x6c, 0x6f, 0x72, 0x3b, 0x0d, 0x0a, 0x7d
};
unsigned int Resources_Shaders_gizmo_shader_len = 994;
unsigned int Resources_Shaders_gizmo_shader_len = 1039;
// Data for file: Resources_Shaders_line_shader_path
const std::string Resources_Shaders_line_shader_path = R"(Resources/Shaders/line.shader)";
@@ -235440,7 +235444,7 @@ const std::string Resources_Shaders_outline_shader_path = R"(Resources/Shaders/o
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, 0x37, 0x2c, 0x20, 0x69, 0x6e, 0x74, 0x28, 0x63, 0x6f, 0x6c, 0x20,
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,

5
Resources/Shaders/gizmo.shader
View File

@@ -42,7 +42,10 @@ void main()
vec4 px_color = texture(gizmo_texture, a_UV).rgba;
color = px_color * vec4(1, 1, 1, u_Opacity);
gEntityID = u_EntityID;
if(u_Opacity >= 0.5f)
{
gEntityID = u_EntityID;
}
FragColor = color;
}

2
Resources/Shaders/outline.shader
View File

@@ -52,7 +52,7 @@ void main()
}
// Mix outline with background
float alpha = smoothstep(0.5, 0.7, int(col != target) * hasHit * 10.0f);
float alpha = smoothstep(0.5, 0.9, int(col != target) * hasHit * 10.0f);
fragColor = mix(fragColor, u_OutlineColor, alpha);
}