From 8624ad6d48dcc89a46a87ad6e249ce59d8f577a6 Mon Sep 17 00:00:00 2001 From: JerryImMouse Date: Thu, 11 Jul 2024 02:37:05 +0500 Subject: [PATCH 1/2] DO A FCKN FLIP! --- .../Graphics/Rendering/Renderer.Render.cs | 2 +- .../Graphics/Rendering/Renderer.cs | 4 ++ .../Graphics/Texturing/ITextureManager.cs | 7 +++ .../Graphics/Texturing/TextureManager.cs | 10 ++++ .../Manager/GlfwWindowManager.Window.cs | 47 ++++++++++++++++-- .../Windows/Manager/IWindowManager.cs | 3 ++ .../Graphics/Windows/WindowCreateSettings.cs | 2 + Resources/Icons/image.png | Bin 0 -> 1184 bytes Resources/Textures/icon.png | Bin 0 -> 1680 bytes 9 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 Resources/Icons/image.png create mode 100644 Resources/Textures/icon.png diff --git a/Hypercube.Client/Graphics/Rendering/Renderer.Render.cs b/Hypercube.Client/Graphics/Rendering/Renderer.Render.cs index bbfb1fd..4ba1f23 100644 --- a/Hypercube.Client/Graphics/Rendering/Renderer.Render.cs +++ b/Hypercube.Client/Graphics/Rendering/Renderer.Render.cs @@ -32,7 +32,7 @@ public sealed partial class Renderer private void OnLoad() { _baseShader = new Shader("Resources/Shaders/base"); - _baseTexture = _textureManager.CreateHandler("Resources/Textures/opengl_logo.png"); + _baseTexture = _textureManager.CreateHandler("Resources/Textures/icon.png"); _baseTexture.Bind(); _vbo = new BufferObject(BufferTarget.ArrayBuffer); diff --git a/Hypercube.Client/Graphics/Rendering/Renderer.cs b/Hypercube.Client/Graphics/Rendering/Renderer.cs index 057a1e5..4d55791 100644 --- a/Hypercube.Client/Graphics/Rendering/Renderer.cs +++ b/Hypercube.Client/Graphics/Rendering/Renderer.cs @@ -93,6 +93,10 @@ private void OnStartup(RuntimeStartupEvent args) break; } + var windowIcons = _windowManager.LoadWindowIcon(_textureManager, "Resources/Icons").ToList(); + _windowManager.SetWindowIcons(MainWindow, windowIcons); + + InitOpenGL(); OnLoad(); diff --git a/Hypercube.Client/Graphics/Texturing/ITextureManager.cs b/Hypercube.Client/Graphics/Texturing/ITextureManager.cs index b6b7f9e..75cc0ce 100644 --- a/Hypercube.Client/Graphics/Texturing/ITextureManager.cs +++ b/Hypercube.Client/Graphics/Texturing/ITextureManager.cs @@ -3,6 +3,13 @@ public interface ITextureManager { ITexture Create(string path); + /// + /// Creates ITexture, allows to set flipping mode + /// + /// Path to image + /// DO FLIP + /// ITexture + ITexture Create(string path, bool doFlip); ITextureHandle CreateHandler(string path); ITextureHandle CreateHandler(ITexture texture); diff --git a/Hypercube.Client/Graphics/Texturing/TextureManager.cs b/Hypercube.Client/Graphics/Texturing/TextureManager.cs index 7420b4e..b241759 100644 --- a/Hypercube.Client/Graphics/Texturing/TextureManager.cs +++ b/Hypercube.Client/Graphics/Texturing/TextureManager.cs @@ -15,6 +15,16 @@ public ITexture Create(string path) return Create(ImageResult.FromStream(stream, ColorComponents.RedGreenBlueAlpha)); } + public ITexture Create(string path, bool doFlip) + { + if (doFlip) + StbImage.stbi_set_flip_vertically_on_load(0); + var texture = Create(path); + + StbImage.stbi_set_flip_vertically_on_load(1); + return texture; + } + public ITextureHandle CreateHandler(ITexture texture) { return new TextureHandle(texture); diff --git a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs index 74dc1c1..3f22442 100644 --- a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs +++ b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs @@ -1,9 +1,12 @@ using System.Diagnostics.CodeAnalysis; +using System.Runtime.InteropServices; using Hypercube.Client.Graphics.OpenGL; +using Hypercube.Client.Graphics.Texturing; using Hypercube.Client.Graphics.Windows.Manager.Registrations; using Hypercube.Client.Utilities; using OpenTK.Windowing.Common; using OpenTK.Windowing.GraphicsLibraryFramework; +using GlfwImage = OpenTK.Windowing.GraphicsLibraryFramework.Image; using Monitor = OpenTK.Windowing.GraphicsLibraryFramework.Monitor; namespace Hypercube.Client.Graphics.Windows.Manager; @@ -103,10 +106,10 @@ public WindowCreateResult WindowCreate(ContextInfo? context, WindowCreateSetting if (settings.NoTitleBar) GLFW.WindowHint(WindowHintBool.Decorated, false); - return new WindowCreateResult(WindowSetup(window), null); + return new WindowCreateResult(WindowSetup(window, settings), null); } - private GlfwWindowRegistration WindowSetup(Window* window) + private GlfwWindowRegistration WindowSetup(Window* window, WindowCreateSettings settings) { GLFWHelper.GetFramebufferSize(window, out var framebufferSize); GLFWHelper.GetWindowSize(window, out var size); @@ -122,14 +125,17 @@ private GlfwWindowRegistration WindowSetup(Window* window) }; registration.Handle = new WindowHandle(_renderer, registration); - + + // Setting icons + if (settings.WindowImages != null) + SetWindowIcons(registration, settings.WindowImages.ToList()); + // Setting callbacks GLFW.SetKeyCallback(window, OnWindowKeyHandled); GLFW.SetWindowCloseCallback(window, OnWindowClosed); GLFW.SetWindowSizeCallback(window, OnWindowResized); GLFW.SetWindowFocusCallback(window, OnWindowFocusChanged); - return registration; } @@ -179,5 +185,36 @@ private bool TryGetWindow(Window* window, [NotNullWhen(true)] out GlfwWindowRegi return null; } - + + public IEnumerable LoadWindowIcon(ITextureManager textureMan, string resPath) + { + var files = Directory.EnumerateFiles(resPath, "*.png"); + + foreach (var file in files) + { + yield return textureMan.Create(file, true); + } + } + + public void SetWindowIcons(WindowRegistration window, List images) + { + if (window is not GlfwWindowRegistration glfwWindow) + return; + + var count = images.Count; + + // ReSharper disable once SuggestVarOrType_Elsewhere + Span handles = stackalloc GCHandle[count]; + Span glfwImages = stackalloc GlfwImage[count]; + + for (var i = 0; i < count; i++) + { + var image = images[i]; + handles[i] = GCHandle.Alloc(image.Data, GCHandleType.Pinned); + var addrOfPinnedObject = (byte*) handles[i].AddrOfPinnedObject(); + glfwImages[i] = new GlfwImage(image.Width, image.Height, addrOfPinnedObject); + } + + GLFW.SetWindowIcon(glfwWindow.Pointer, glfwImages); + } } \ No newline at end of file diff --git a/Hypercube.Client/Graphics/Windows/Manager/IWindowManager.cs b/Hypercube.Client/Graphics/Windows/Manager/IWindowManager.cs index 52b9992..b9a4b3d 100644 --- a/Hypercube.Client/Graphics/Windows/Manager/IWindowManager.cs +++ b/Hypercube.Client/Graphics/Windows/Manager/IWindowManager.cs @@ -1,5 +1,6 @@ using Hypercube.Client.Graphics.Monitors; using Hypercube.Client.Graphics.OpenGL; +using Hypercube.Client.Graphics.Texturing; using Hypercube.Shared.Math.Vector; namespace Hypercube.Client.Graphics.Windows.Manager; @@ -29,6 +30,8 @@ public interface IWindowManager : IDisposable void WindowSetVisible(WindowRegistration registration, bool visible); void WindowSetSize(WindowRegistration registration, Vector2Int size); void WindowSwapBuffers(WindowRegistration window); + IEnumerable LoadWindowIcon(ITextureManager textureMan, string resPath); + void SetWindowIcons(WindowRegistration window, List images); nint GetProcAddress(string procName); } \ No newline at end of file diff --git a/Hypercube.Client/Graphics/Windows/WindowCreateSettings.cs b/Hypercube.Client/Graphics/Windows/WindowCreateSettings.cs index 813a230..eea9672 100644 --- a/Hypercube.Client/Graphics/Windows/WindowCreateSettings.cs +++ b/Hypercube.Client/Graphics/Windows/WindowCreateSettings.cs @@ -1,4 +1,5 @@ using Hypercube.Client.Graphics.Monitors; +using Hypercube.Client.Graphics.Texturing; using Hypercube.Shared.Math.Vector; namespace Hypercube.Client.Graphics.Windows; @@ -15,6 +16,7 @@ public class WindowCreateSettings public Vector2Int Size = new(1280, 720); public WindowStyles Styles; public Version Version; + public ITexture[]? WindowImages = null; public IMonitorHandle? Monitor; diff --git a/Resources/Icons/image.png b/Resources/Icons/image.png new file mode 100644 index 0000000000000000000000000000000000000000..f3df425b1f74cfe6d5c660a950e0fedc028025bb GIT binary patch literal 1184 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 a2mk;800000(o>TF0000 Date: Thu, 11 Jul 2024 09:09:16 +1000 Subject: [PATCH 2/2] Fixed settings usage --- .../Graphics/Windows/Manager/GlfwWindowManager.Window.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs index d45139b..4a92ee6 100644 --- a/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs +++ b/Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.Window.cs @@ -105,7 +105,7 @@ public WindowCreateResult WindowCreate(ContextInfo? context, WindowCreateSetting return new WindowCreateResult(null, GLFWHelper.GetError()); } - return new WindowCreateResult(WindowSetup(window), null); + return new WindowCreateResult(WindowSetup(window, settings), null); } private GlfwWindowRegistration WindowSetup(Window* window, WindowCreateSettings settings)