opengl4
This commit is contained in:
+4
-18
@@ -26,8 +26,7 @@ public class Program
|
||||
ImGui.SetNextWindowSize(viewport.WorkSize);
|
||||
ImGui.SetNextWindowViewport(viewport.ID);
|
||||
|
||||
if (ImGui.Begin("MainWindow", ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.MenuBar | ImGuiWindowFlags.NoDocking | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoBringToFrontOnFocus))
|
||||
{
|
||||
ImGui.Begin("MainWindow", ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.MenuBar | ImGuiWindowFlags.NoDocking | ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoBringToFrontOnFocus);
|
||||
if (ImGui.BeginMenuBar())
|
||||
{
|
||||
if (ImGui.BeginMenu("Stuff"))
|
||||
@@ -48,15 +47,13 @@ public class Program
|
||||
|
||||
ImGui.EndMenuBar();
|
||||
}
|
||||
|
||||
ImGui.End();
|
||||
}
|
||||
|
||||
if (_fontStuff)
|
||||
{
|
||||
ImGui.SetNextWindowSize(new Vector2(250, 500), ImGuiCond.FirstUseEver);
|
||||
if (ImGui.Begin("FontStuff", ref _fontStuff))
|
||||
{
|
||||
ImGui.Begin("FontStuff", ref _fontStuff);
|
||||
|
||||
ImGui.ShowFontSelector("Font");
|
||||
|
||||
bool change = false;
|
||||
@@ -120,13 +117,10 @@ public class Program
|
||||
}
|
||||
|
||||
ImGui.PopFont();
|
||||
|
||||
ImGui.End();
|
||||
}
|
||||
}
|
||||
|
||||
if (ImGui.Begin("Thing"))
|
||||
{
|
||||
ImGui.Begin("Thing");
|
||||
float time = (float)ImGui.GetTime() * 5;
|
||||
if (ImPlot.BeginPlot("Moving Rainbow Sine Wave"))
|
||||
{
|
||||
@@ -165,15 +159,7 @@ public class Program
|
||||
ImPlot.EndPlot();
|
||||
}
|
||||
ImGui.SliderFloat("Sine", ref size, 1f, 120f);
|
||||
|
||||
ImGui.End();
|
||||
}
|
||||
|
||||
if (ImGui.Begin("ImageThing"))
|
||||
{
|
||||
|
||||
ImGui.End();
|
||||
}
|
||||
|
||||
if (_demoWindowVisible)
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<PackageReference Include="Hexa.NET.ImGui" Version="2.2.9" />
|
||||
<PackageReference Include="Hexa.NET.ImGui.Widgets" Version="1.2.18" />
|
||||
<PackageReference Include="Hexa.NET.ImPlot" Version="2.2.9" />
|
||||
<PackageReference Include="Hexa.NET.OpenGL3" Version="1.1.0" />
|
||||
<PackageReference Include="Hexa.NET.OpenGL4" Version="1.1.0" />
|
||||
<PackageReference Include="Hexa.NET.Utilities" Version="2.2.12" />
|
||||
<PackageReference Include="SDL3-CS" Version="3.2.18" />
|
||||
<PackageReference Include="SDL3-CS.Native" Version="3.2.18" />
|
||||
|
||||
+336
-285
File diff suppressed because it is too large
Load Diff
+18
-10
@@ -10,6 +10,8 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
{
|
||||
public class RendererData
|
||||
{
|
||||
public GL Gl = null!;
|
||||
|
||||
public uint GlVersion; // e.g. 320 for GL 3.2
|
||||
public string GlslVersionString = ""; // e.g. "#version 330 core\n"
|
||||
public bool GlProfileIsES2;
|
||||
@@ -35,8 +37,6 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
|
||||
public bool UseTexParameterToSetSampler;
|
||||
public int NextSampler; // GL_LINEAR or GL_NEAREST
|
||||
|
||||
public GL Gl = null!;
|
||||
}
|
||||
|
||||
public static RendererData? GetRendererData() => ImGui.GetCurrentContext().Handle != null ? ImGuiUserData<RendererData>.Get(ImGui.GetIO().BackendRendererUserData) : null;
|
||||
@@ -143,7 +143,6 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
io.BackendRendererName = null;
|
||||
io.BackendRendererUserData = null;
|
||||
io.BackendFlags &= ~(ImGuiBackendFlags.RendererHasVtxOffset | ImGuiBackendFlags.RendererHasTextures | ImGuiBackendFlags.RendererHasViewports);
|
||||
|
||||
}
|
||||
|
||||
public static void NewFrame()
|
||||
@@ -222,7 +221,6 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
int idxSize = drawList.IdxBuffer.Size * sizeof(ushort);
|
||||
|
||||
gl.BufferData(GLBufferTargetARB.ArrayBuffer, vtxSize, drawList.VtxBuffer.Data, GLBufferUsageARB.StreamDraw);
|
||||
|
||||
gl.BufferData(GLBufferTargetARB.ElementArrayBuffer, idxSize, drawList.IdxBuffer.Data, GLBufferUsageARB.StreamDraw);
|
||||
|
||||
for (int cmdIdx = 0; cmdIdx < drawList.CmdBuffer.Size; cmdIdx++)
|
||||
@@ -234,11 +232,17 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
|
||||
nint cbPtr = (nint)cmd.UserCallback;
|
||||
if (cbPtr == (nint)DelegateStorage.DrawCallbackResetRenderStateDelegate.GetPtrForDelegate())
|
||||
{
|
||||
SetupRenderState(drawData, fbWidth, fbHeight, vao);
|
||||
}
|
||||
else if (cbPtr == (nint)DelegateStorage.DrawCallbackSetSamplerLinearDelegate.GetPtrForDelegate())
|
||||
{
|
||||
ApplySamplerLinear(bd);
|
||||
}
|
||||
else if (cbPtr == (nint)DelegateStorage.DrawCallbackSetSamplerNearestDelegate.GetPtrForDelegate())
|
||||
{
|
||||
ApplySamplerNearest(bd);
|
||||
}
|
||||
else
|
||||
{
|
||||
ImDrawCmdPtr cmdPtr = new ImDrawCmdPtr { Handle = &cmd };
|
||||
@@ -352,7 +356,7 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
2.0f / (R - L), 0.0f, 0.0f, 0.0f,
|
||||
0.0f, 2.0f / (T - B), 0.0f, 0.0f,
|
||||
0.0f, 0.0f, -1.0f, 0.0f,
|
||||
(R + L) / (L - R), (T + B) / (B - T), 0.0f, 1.0f,
|
||||
(R + L) / (L - R), (T + B) / (B - T), 0.0f, 1.0f
|
||||
};
|
||||
|
||||
gl.UseProgram(bd.ShaderHandle);
|
||||
@@ -467,7 +471,7 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
< 130 => (vertSrc120, fragSrc120),
|
||||
300 => (vertSrc300es, fragSrc300es),
|
||||
>= 410 => (vertSrc410, fragSrc410),
|
||||
_ => (vertSrc130, fragSrc130),
|
||||
_ => (vertSrc130, fragSrc130)
|
||||
};
|
||||
|
||||
string fullVert = bd.GlslVersionString + vertSrc;
|
||||
@@ -577,7 +581,10 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
|
||||
private static void ApplySamplerLinear(RendererData bd)
|
||||
{
|
||||
if (bd.HasBindSampler) bd.Gl.BindSampler(0, bd.TexSamplers[0]);
|
||||
if (bd.HasBindSampler)
|
||||
{
|
||||
bd.Gl.BindSampler(0, bd.TexSamplers[0]);
|
||||
}
|
||||
else
|
||||
{
|
||||
bd.UseTexParameterToSetSampler = true;
|
||||
@@ -587,7 +594,10 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
|
||||
private static void ApplySamplerNearest(RendererData bd)
|
||||
{
|
||||
if (bd.HasBindSampler) bd.Gl.BindSampler(0, bd.TexSamplers[1]);
|
||||
if (bd.HasBindSampler)
|
||||
{
|
||||
bd.Gl.BindSampler(0, bd.TexSamplers[1]);
|
||||
}
|
||||
else
|
||||
{
|
||||
bd.UseTexParameterToSetSampler = true;
|
||||
@@ -630,8 +640,6 @@ public unsafe static class ImGuiSDL3Renderer
|
||||
|
||||
public static class DelegateStorage
|
||||
{
|
||||
|
||||
|
||||
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
||||
internal delegate void DrawCallbackFn(ImDrawListPtr drawList, ImDrawCmdPtr cmd);
|
||||
|
||||
|
||||
+6
-3
@@ -35,13 +35,16 @@ public sealed unsafe class SDL3Window : IDisposable
|
||||
|
||||
public SDL3Window(string name, int posX, int posY, int width, int height, SDL.WindowFlags flags = SDL.WindowFlags.Resizable | SDL.WindowFlags.HighPixelDensity)
|
||||
{
|
||||
if (OperatingSystem.IsLinux())
|
||||
SDL.SetHint(SDL.Hints.VideoDriver, "x11");
|
||||
|
||||
if (!SDL.Init(SDL.InitFlags.Events | SDL.InitFlags.Video | SDL.InitFlags.Gamepad))
|
||||
throw new Exception($"SDL_Init failed: {SDL.GetError()}");
|
||||
|
||||
SDL.GLSetAttribute(SDL.GLAttr.ContextFlags, (int)SDL.GLContextFlag.ForwardCompatible);
|
||||
SDL.GLSetAttribute(SDL.GLAttr.ContextProfileMask, (int)SDL.GLProfile.Core);
|
||||
SDL.GLSetAttribute(SDL.GLAttr.ContextMajorVersion, 3);
|
||||
SDL.GLSetAttribute(SDL.GLAttr.ContextMinorVersion, 3);
|
||||
SDL.GLSetAttribute(SDL.GLAttr.ContextMajorVersion, 4);
|
||||
SDL.GLSetAttribute(SDL.GLAttr.ContextMinorVersion, 6);
|
||||
|
||||
SDL.SetHint(SDL.Hints.IMEImplementedUI, "1");
|
||||
|
||||
@@ -116,7 +119,7 @@ public sealed unsafe class SDL3Window : IDisposable
|
||||
_gl = new GL(new BindingsContext(Window, glContext));
|
||||
|
||||
// Init platform and renderer
|
||||
ImGuiSDL3Platform.Init(_gl, glContext, Window, this);
|
||||
ImGuiSDL3Platform.Init(_gl, Window, glContext);
|
||||
ImGuiSDL3Renderer.Init(_gl, "#version 330");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user