Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement glfw window methods #1

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Hypercube.Client/Graphics/Event/WindowFocusChangedEvent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
using Hypercube.Client.Graphics.Windows;

namespace Hypercube.Client.Graphics.Event;

public readonly record struct WindowFocusChangedEvent(WindowRegistration Registration, bool Focused);
2 changes: 2 additions & 0 deletions Hypercube.Client/Graphics/Rendering/IRenderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public interface IRenderer

void AddMonitor(MonitorRegistration monitor);

void OnFocusChanged(WindowRegistration window, bool focused);

// Drawing
void DrawTexture(ITextureHandle texture, Box2 quad, Box2 uv, Color color);
}
4 changes: 4 additions & 0 deletions Hypercube.Client/Graphics/Rendering/Renderer.Render.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Hypercube.Client.Graphics.Shading;
using Hypercube.Client.Graphics.Texturing;
using Hypercube.Client.Graphics.Viewports;
using Hypercube.Client.Graphics.Windows;
using Hypercube.Shared.Math;
using Hypercube.Shared.Math.Box;
using Hypercube.Shared.Runtimes.Loop.Event;
Expand Down Expand Up @@ -57,6 +58,9 @@ private void OnLoad()

private void OnFrameUpdate(UpdateFrameEvent args)
{
#if DEBUG
_windowManager.WindowSetTitle(MainWindow, $"FPS: {_timing.Fps} | RealTime: {_timing.RealTime}");
#endif
_windowManager.PollEvents();
}

Expand Down
5 changes: 5 additions & 0 deletions Hypercube.Client/Graphics/Rendering/Renderer.Window.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,9 @@ private bool InitMainWindow(ContextInfo? context, WindowCreateSettings settings)

return (registration, null);
}

public void OnFocusChanged(WindowRegistration window, bool focused)
{
_eventBus.Invoke(new WindowFocusChangedEvent(window, focused));
}
}
1 change: 1 addition & 0 deletions Hypercube.Client/Graphics/Rendering/Renderer.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Frozen;
using Hypercube.Client.Graphics.Event;
using Hypercube.Client.Graphics.OpenGL;
using Hypercube.Client.Graphics.Texturing;
using Hypercube.Client.Graphics.Windows;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Hypercube.Client.Input;
using Hypercube.Client.Graphics.Event;
using Hypercube.Client.Input;
using Hypercube.Client.Utilities;
using OpenTK.Windowing.GraphicsLibraryFramework;
using GlfwKeyModifiers = OpenTK.Windowing.GraphicsLibraryFramework.KeyModifiers;
Expand Down Expand Up @@ -56,4 +57,12 @@ private void OnWindowResized(Window* window, int width, int height)

registration.SetSize(width, height);
}

private void OnWindowFocusChanged(Window* window, bool focused)
{
if (!TryGetWindow(window, out var registration))
return;

_renderer.OnFocusChanged(registration, focused);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private void ThreadSetupMonitor(Monitor* monitor)
modes
);

var registration = new GlfwMonitorRegistration(id, handle);;
var registration = new GlfwMonitorRegistration(monitor, handle);;
_monitors[id] = registration;

_renderer.AddMonitor(registration);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ private GlfwWindowRegistration WindowSetup(Window* window)
GLFW.SetKeyCallback(window, OnWindowKeyHandled);
GLFW.SetWindowCloseCallback(window, OnWindowClosed);
GLFW.SetWindowSizeCallback(window, OnWindowResized);
GLFW.SetWindowFocusCallback(window, OnWindowFocusChanged);


return registration;
}
Expand Down
60 changes: 53 additions & 7 deletions Hypercube.Client/Graphics/Windows/Manager/GlfwWindowManager.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using Hypercube.Client.Graphics.Rendering;
using Hypercube.Client.Graphics.Monitors;
using Hypercube.Client.Graphics.Rendering;
using Hypercube.Client.Graphics.Windows.Manager.Registrations;
using Hypercube.Client.Input.Handler;
using Hypercube.Shared.Dependency;
using Hypercube.Shared.Logging;
using Hypercube.Shared.Math.Vector;
using OpenTK.Windowing.GraphicsLibraryFramework;

namespace Hypercube.Client.Graphics.Windows.Manager;
Expand Down Expand Up @@ -90,14 +92,33 @@ public nint GetProcAddress(string procName)
return GLFW.GetProcAddress(procName);
}

public void WindowSetTitle()
public void WindowSetTitle(WindowRegistration window, string title)
{
throw new NotImplementedException();
if (window is not GlfwWindowRegistration glfwWindow)
return;

GLFW.SetWindowTitle(glfwWindow.Pointer, title);
}

public void WindowSetMonitor(WindowRegistration window, MonitorRegistration monitor, Vector2Int vector)
{
if (monitor is not GlfwMonitorRegistration glfwMonitor)
return;

if (window is not GlfwWindowRegistration glfwWindow)
return;

GLFW.SetWindowMonitor(
glfwWindow.Pointer,
glfwMonitor.Pointer,
vector.X, vector.Y,
monitor.Handle.Size.X, monitor.Handle.Size.Y,
monitor.Handle.RefreshRate);
}

public void WindowSetMonitor()
public void WindowSetMonitor(WindowRegistration window, MonitorRegistration registration)
{
throw new NotImplementedException();
WindowSetMonitor(window, registration, Vector2Int.Zero);
}

public void WindowRequestAttention(WindowRegistration window)
Expand All @@ -108,9 +129,34 @@ public void WindowRequestAttention(WindowRegistration window)
GLFW.RequestWindowAttention(glfwWindow.Pointer);
}

public void WindowSetVisible()
public void WindowSetSize(WindowRegistration window, Vector2Int size)
{
if (window is not GlfwWindowRegistration glfwWindow)
return;

GLFW.SetWindowSize(glfwWindow.Pointer, size.X, size.Y);
}

public void WindowSetVisible(WindowRegistration registration, bool visible)
{
if (registration is not GlfwWindowRegistration glfwWindow)
return;

if (visible)
{
GLFW.ShowWindow(glfwWindow.Pointer);
return;
}

GLFW.HideWindow(glfwWindow.Pointer);
}

public void WindowSetOpacity(WindowRegistration window, float opacity)
{
throw new NotImplementedException();
if (window is not GlfwWindowRegistration glfwWindow)
return;

GLFW.SetWindowOpacity(glfwWindow.Pointer, opacity);
}

public void WindowSwapBuffers(WindowRegistration window)
Expand Down
13 changes: 9 additions & 4 deletions Hypercube.Client/Graphics/Windows/Manager/IWindowManager.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Hypercube.Client.Graphics.OpenGL;
using Hypercube.Client.Graphics.Monitors;
using Hypercube.Client.Graphics.OpenGL;
using Hypercube.Shared.Math.Vector;

namespace Hypercube.Client.Graphics.Windows.Manager;

Expand All @@ -19,10 +21,13 @@ public interface IWindowManager : IDisposable
WindowCreateResult WindowCreate(ContextInfo? context, WindowCreateSettings settings, WindowRegistration? contextShare);
void MakeContextCurrent(WindowRegistration? window);
void WindowDestroy(WindowRegistration window);
void WindowSetTitle();
void WindowSetMonitor();
void WindowSetTitle(WindowRegistration window, string title);
void WindowSetMonitor(WindowRegistration window, MonitorRegistration monitor, Vector2Int vector2Int);
void WindowSetMonitor(WindowRegistration window, MonitorRegistration monitor);
void WindowRequestAttention(WindowRegistration window);
void WindowSetVisible();
void WindowSetOpacity(WindowRegistration window, float opacity);
void WindowSetVisible(WindowRegistration registration, bool visible);
void WindowSetSize(WindowRegistration registration, Vector2Int size);
void WindowSwapBuffers(WindowRegistration window);

nint GetProcAddress(string procName);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using Hypercube.Client.Graphics.Monitors;
using Monitor = OpenTK.Windowing.GraphicsLibraryFramework.Monitor;

namespace Hypercube.Client.Graphics.Windows.Manager.Registrations;

public sealed class GlfwMonitorRegistration(int id, IMonitorHandle handle) : MonitorRegistration(handle)
public sealed unsafe class GlfwMonitorRegistration(Monitor* monitor, IMonitorHandle handle) : MonitorRegistration(handle)
{
public int Id = id;
public Monitor* Pointer;
}
Loading