diff --git a/ClickableTransparentOverlay/ClickableTransparentOverlay.csproj b/ClickableTransparentOverlay/ClickableTransparentOverlay.csproj index 5898980..2aa61c0 100644 --- a/ClickableTransparentOverlay/ClickableTransparentOverlay.csproj +++ b/ClickableTransparentOverlay/ClickableTransparentOverlay.csproj @@ -265,14 +265,8 @@ - - - - - - @@ -287,4 +281,4 @@ - \ No newline at end of file + diff --git a/ClickableTransparentOverlay/Overlay.cs b/ClickableTransparentOverlay/Overlay.cs index b5d80d7..d5ede5b 100644 --- a/ClickableTransparentOverlay/Overlay.cs +++ b/ClickableTransparentOverlay/Overlay.cs @@ -42,7 +42,7 @@ _future_size = Vector2.Zero; _future_pos = Vector2.Zero; - _window = new Sdl2Window("Overlay", x, x, width, height, SDL_WindowFlags.Borderless | SDL_WindowFlags.AlwaysOnTop | SDL_WindowFlags.SkipTaskbar, true); + _window = new Sdl2Window("Overlay", x, x, width, height, SDL_WindowFlags.Borderless | SDL_WindowFlags.AlwaysOnTop | SDL_WindowFlags.SkipTaskbar, false); // TODO: Create a new branch for Non-Veldrid dependent version. Ideally, we can directly use SDL2Window. _gd = VeldridStartup.CreateGraphicsDevice(_window, new GraphicsDeviceOptions(true, null, true), GraphicsBackend.Direct3D11); NativeMethods.EnableTransparent(_window.Handle, new System.Drawing.Rectangle(_window.X , _window.Y, _window.Width, _window.Height)); diff --git a/ClickableTransparentOverlay/Shaders/GLSL/imgui-frag.glsl b/ClickableTransparentOverlay/Shaders/GLSL/imgui-frag.glsl deleted file mode 100644 index 85e5ee9..0000000 --- a/ClickableTransparentOverlay/Shaders/GLSL/imgui-frag.glsl +++ /dev/null @@ -1,13 +0,0 @@ -#version 330 core - -uniform sampler2D FontTexture; - -in vec4 color; -in vec2 texCoord; - -out vec4 outputColor; - -void main() -{ - outputColor = color * texture(FontTexture, texCoord); -} diff --git a/ClickableTransparentOverlay/Shaders/GLSL/imgui-vertex.glsl b/ClickableTransparentOverlay/Shaders/GLSL/imgui-vertex.glsl deleted file mode 100644 index 997ce0d..0000000 --- a/ClickableTransparentOverlay/Shaders/GLSL/imgui-vertex.glsl +++ /dev/null @@ -1,20 +0,0 @@ -#version 330 core - -uniform ProjectionMatrixBuffer -{ - mat4 projection_matrix; -}; - -in vec2 in_position; -in vec2 in_texCoord; -in vec4 in_color; - -out vec4 color; -out vec2 texCoord; - -void main() -{ - gl_Position = projection_matrix * vec4(in_position, 0, 1); - color = in_color; - texCoord = in_texCoord; -} diff --git a/ClickableTransparentOverlay/Shaders/Metal/imgui-frag.metal b/ClickableTransparentOverlay/Shaders/Metal/imgui-frag.metal deleted file mode 100644 index ff3cbe6..0000000 --- a/ClickableTransparentOverlay/Shaders/Metal/imgui-frag.metal +++ /dev/null @@ -1,18 +0,0 @@ -#include -using namespace metal; - -struct PS_INPUT -{ - float4 pos [[ position ]]; - float4 col; - float2 uv; -}; - -fragment float4 FS( - PS_INPUT input [[ stage_in ]], - texture2d FontTexture [[ texture(0) ]], - sampler FontSampler [[ sampler(0) ]]) -{ - float4 out_col = input.col * FontTexture.sample(FontSampler, input.uv); - return out_col; -} \ No newline at end of file diff --git a/ClickableTransparentOverlay/Shaders/Metal/imgui-frag.metallib b/ClickableTransparentOverlay/Shaders/Metal/imgui-frag.metallib deleted file mode 100644 index 18a3d73..0000000 Binary files a/ClickableTransparentOverlay/Shaders/Metal/imgui-frag.metallib and /dev/null differ diff --git a/ClickableTransparentOverlay/Shaders/Metal/imgui-vertex.metal b/ClickableTransparentOverlay/Shaders/Metal/imgui-vertex.metal deleted file mode 100644 index 73d649e..0000000 --- a/ClickableTransparentOverlay/Shaders/Metal/imgui-vertex.metal +++ /dev/null @@ -1,27 +0,0 @@ -#include -using namespace metal; - -struct VS_INPUT -{ - float2 pos [[ attribute(0) ]]; - float2 uv [[ attribute(1) ]]; - float4 col [[ attribute(2) ]]; -}; - -struct PS_INPUT -{ - float4 pos [[ position ]]; - float4 col; - float2 uv; -}; - -vertex PS_INPUT VS( - VS_INPUT input [[ stage_in ]], - constant float4x4 &ProjectionMatrix [[ buffer(1) ]]) -{ - PS_INPUT output; - output.pos = ProjectionMatrix * float4(input.pos.xy, 0.f, 1.f); - output.col = input.col; - output.uv = input.uv; - return output; -} \ No newline at end of file diff --git a/ClickableTransparentOverlay/Shaders/Metal/imgui-vertex.metallib b/ClickableTransparentOverlay/Shaders/Metal/imgui-vertex.metallib deleted file mode 100644 index 2998b94..0000000 Binary files a/ClickableTransparentOverlay/Shaders/Metal/imgui-vertex.metallib and /dev/null differ diff --git a/ClickableTransparentOverlay/Shaders/SPIR-V/generate-spirv.bat b/ClickableTransparentOverlay/Shaders/SPIR-V/generate-spirv.bat deleted file mode 100644 index 62d1d99..0000000 --- a/ClickableTransparentOverlay/Shaders/SPIR-V/generate-spirv.bat +++ /dev/null @@ -1,2 +0,0 @@ -glslangvalidator -V imgui-vertex.glsl -o imgui-vertex.spv -S vert -glslangvalidator -V imgui-frag.glsl -o imgui-frag.spv -S frag diff --git a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-frag.glsl b/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-frag.glsl deleted file mode 100644 index 2d1c1d7..0000000 --- a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-frag.glsl +++ /dev/null @@ -1,16 +0,0 @@ -#version 450 - -#extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_420pack : enable - -layout(set = 1, binding = 0) uniform texture2D FontTexture; -layout(set = 0, binding = 1) uniform sampler FontSampler; - -layout (location = 0) in vec4 color; -layout (location = 1) in vec2 texCoord; -layout (location = 0) out vec4 outputColor; - -void main() -{ - outputColor = color * texture(sampler2D(FontTexture, FontSampler), texCoord); -} diff --git a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-frag.spv b/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-frag.spv deleted file mode 100644 index c8d71cc..0000000 Binary files a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-frag.spv and /dev/null differ diff --git a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-vertex.glsl b/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-vertex.glsl deleted file mode 100644 index 6fdab3f..0000000 --- a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-vertex.glsl +++ /dev/null @@ -1,29 +0,0 @@ -#version 450 - -#extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_420pack : enable - -layout (location = 0) in vec2 vsin_position; -layout (location = 1) in vec2 vsin_texCoord; -layout (location = 2) in vec4 vsin_color; - -layout (binding = 0) uniform Projection -{ - mat4 projection; -}; - -layout (location = 0) out vec4 vsout_color; -layout (location = 1) out vec2 vsout_texCoord; - -out gl_PerVertex -{ - vec4 gl_Position; -}; - -void main() -{ - gl_Position = projection * vec4(vsin_position, 0, 1); - vsout_color = vsin_color; - vsout_texCoord = vsin_texCoord; - gl_Position.y = -gl_Position.y; -} diff --git a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-vertex.spv b/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-vertex.spv deleted file mode 100644 index 795cd0e..0000000 Binary files a/ClickableTransparentOverlay/Shaders/SPIR-V/imgui-vertex.spv and /dev/null differ diff --git a/DriverProgram/Program.cs b/DriverProgram/Program.cs index d9a3fce..ab06a0b 100644 --- a/DriverProgram/Program.cs +++ b/DriverProgram/Program.cs @@ -29,7 +29,7 @@ public static void DistroyDemo() { - Thread.Sleep(100000); + Thread.Sleep(10000); //demo.ResizeWindow(0, 0, 2560, 1440); //Thread.Sleep(10000); //demo.HideWindow();