forked from mirror/DotRecast
for macOSX
This commit is contained in:
parent
6a31bfee32
commit
ecce6dcb95
|
@ -15,6 +15,7 @@
|
||||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
||||||
<PackageReference Include="Silk.NET" Version="2.16.0" />
|
<PackageReference Include="Silk.NET" Version="2.16.0" />
|
||||||
<PackageReference Include="Silk.NET.OpenGL.Extensions.ImGui" Version="2.16.0" />
|
<PackageReference Include="Silk.NET.OpenGL.Extensions.ImGui" Version="2.16.0" />
|
||||||
|
<PackageReference Include="ImGui.NET" Version="1.89.4" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -76,8 +76,8 @@ public class ModernOpenGLDraw : OpenGLDraw
|
||||||
|
|
||||||
public unsafe void init()
|
public unsafe void init()
|
||||||
{
|
{
|
||||||
string NK_SHADER_VERSION = PlatformID.MacOSX == Environment.OSVersion.Platform ? "#version 150\n" : "#version 300 es\n";
|
string SHADER_VERSION = "#version 330\n";
|
||||||
string vertex_shader = NK_SHADER_VERSION + "uniform mat4 ProjMtx;\n" //
|
string vertex_shader = SHADER_VERSION + "uniform mat4 ProjMtx;\n" //
|
||||||
+ "uniform mat4 ViewMtx;\n" //
|
+ "uniform mat4 ViewMtx;\n" //
|
||||||
+ "in vec3 Position;\n" //
|
+ "in vec3 Position;\n" //
|
||||||
+ "in vec2 TexCoord;\n" //
|
+ "in vec2 TexCoord;\n" //
|
||||||
|
@ -92,7 +92,7 @@ public class ModernOpenGLDraw : OpenGLDraw
|
||||||
+ " Frag_Depth = -VSPosition.z;\n" //
|
+ " Frag_Depth = -VSPosition.z;\n" //
|
||||||
+ " gl_Position = ProjMtx * VSPosition;\n" //
|
+ " gl_Position = ProjMtx * VSPosition;\n" //
|
||||||
+ "}\n";
|
+ "}\n";
|
||||||
string fragment_shader = NK_SHADER_VERSION + "precision mediump float;\n" //
|
string fragment_shader = SHADER_VERSION + "precision mediump float;\n" //
|
||||||
+ "uniform sampler2D Texture;\n" //
|
+ "uniform sampler2D Texture;\n" //
|
||||||
+ "uniform float UseTexture;\n" //
|
+ "uniform float UseTexture;\n" //
|
||||||
+ "uniform float EnableFog;\n" //
|
+ "uniform float EnableFog;\n" //
|
||||||
|
|
|
@ -43,10 +43,7 @@ using DotRecast.Recast.Demo.Geom;
|
||||||
using DotRecast.Recast.Demo.Settings;
|
using DotRecast.Recast.Demo.Settings;
|
||||||
using DotRecast.Recast.Demo.Tools;
|
using DotRecast.Recast.Demo.Tools;
|
||||||
using DotRecast.Recast.Demo.UI;
|
using DotRecast.Recast.Demo.UI;
|
||||||
using Silk.NET.SDL;
|
|
||||||
using Silk.NET.Windowing.Sdl;
|
|
||||||
using static DotRecast.Core.RecastMath;
|
using static DotRecast.Core.RecastMath;
|
||||||
using Color = System.Drawing.Color;
|
|
||||||
using Window = Silk.NET.Windowing.Window;
|
using Window = Silk.NET.Windowing.Window;
|
||||||
|
|
||||||
namespace DotRecast.Recast.Demo;
|
namespace DotRecast.Recast.Demo;
|
||||||
|
@ -60,7 +57,6 @@ public class RecastDemo
|
||||||
private IInputContext _input;
|
private IInputContext _input;
|
||||||
private ImGuiController _imgui;
|
private ImGuiController _imgui;
|
||||||
private GL _gl;
|
private GL _gl;
|
||||||
private Sdl _sdl;
|
|
||||||
private int width = 1000;
|
private int width = 1000;
|
||||||
private int height = 900;
|
private int height = 900;
|
||||||
|
|
||||||
|
@ -257,33 +253,6 @@ public class RecastDemo
|
||||||
|
|
||||||
private IWindow CreateWindow()
|
private IWindow CreateWindow()
|
||||||
{
|
{
|
||||||
SdlWindowing.Use();
|
|
||||||
//var glfw = GlfwProvider.GLFW.Value;
|
|
||||||
|
|
||||||
// glfw.SetErrorCallback(ErrorCallback);
|
|
||||||
// if (!glfw.Init())
|
|
||||||
// {
|
|
||||||
// throw new InvalidOperationException("Unable to initialize GLFW");
|
|
||||||
// }
|
|
||||||
|
|
||||||
// glfw.DefaultWindowHints();
|
|
||||||
// glfw.WindowHint(WindowHintBool.Visible, false);
|
|
||||||
// glfw.WindowHint(WindowHintBool.Resizable, false);
|
|
||||||
// glfw.WindowHint(WindowHintBool.SrgbCapable, true);
|
|
||||||
// glfw.WindowHint(WindowHintInt.RedBits, 8);
|
|
||||||
// glfw.WindowHint(WindowHintInt.GreenBits, 8);
|
|
||||||
// glfw.WindowHint(WindowHintInt.BlueBits, 8);
|
|
||||||
// glfw.WindowHint(WindowHintInt.Samples, 4);
|
|
||||||
// glfw.WindowHint(WindowHintBool.DoubleBuffer, true);
|
|
||||||
// glfw.WindowHint(WindowHintInt.DepthBits, 24);
|
|
||||||
//
|
|
||||||
// glfw.WindowHint(WindowHintInt.ContextVersionMajor, 3);
|
|
||||||
// glfw.WindowHint(WindowHintInt.ContextVersionMinor, 2);
|
|
||||||
// glfw.WindowHint(WindowHintBool.OpenGLForwardCompat, true);
|
|
||||||
// glfw.WindowHint(WindowHintOpenGlProfile.OpenGlProfile, OpenGlProfile.Core);
|
|
||||||
// glfw.WindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
|
||||||
// glfw.WindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
|
|
||||||
|
|
||||||
var monitor = Window.Platforms.First().GetMainMonitor();
|
var monitor = Window.Platforms.First().GetMainMonitor();
|
||||||
// // if (monitors.limit() > 1) {
|
// // if (monitors.limit() > 1) {
|
||||||
// // monitor = monitors[1];
|
// // monitor = monitors[1];
|
||||||
|
@ -295,11 +264,6 @@ public class RecastDemo
|
||||||
height = resolution.Y - 100;
|
height = resolution.Y - 100;
|
||||||
viewport = new int[] { 0, 0, width, height };
|
viewport = new int[] { 0, 0, width, height };
|
||||||
|
|
||||||
// glfwWindowHint(GLFW_RED_BITS, mode.redBits());
|
|
||||||
// glfwWindowHint(GLFW_GREEN_BITS, mode.greenBits());
|
|
||||||
// glfwWindowHint(GLFW_BLUE_BITS, mode.blueBits());
|
|
||||||
// glfwWindowHint(GLFW_REFRESH_RATE, mode.refreshRate());
|
|
||||||
|
|
||||||
var options = WindowOptions.Default;
|
var options = WindowOptions.Default;
|
||||||
options.Title = title;
|
options.Title = title;
|
||||||
options.Size = new Vector2D<int>(width, height);
|
options.Size = new Vector2D<int>(width, height);
|
||||||
|
@ -373,9 +337,6 @@ public class RecastDemo
|
||||||
{
|
{
|
||||||
width = size.X;
|
width = size.X;
|
||||||
height = size.Y;
|
height = size.Y;
|
||||||
|
|
||||||
//_gl.FramebufferParameter(GLEnum.Size);
|
|
||||||
//_graphicsDevice.ResizeMainWindow((uint)size.X, (uint)size.Y);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnWindowFramebufferSizeChanged(Vector2D<int> size)
|
private void OnWindowFramebufferSizeChanged(Vector2D<int> size)
|
||||||
|
@ -387,8 +348,6 @@ public class RecastDemo
|
||||||
|
|
||||||
private void OnWindowOnLoad()
|
private void OnWindowOnLoad()
|
||||||
{
|
{
|
||||||
_sdl = SdlWindowing.GetExistingApi(window);
|
|
||||||
|
|
||||||
_input = window.CreateInput();
|
_input = window.CreateInput();
|
||||||
|
|
||||||
// mouse input
|
// mouse input
|
||||||
|
|
Loading…
Reference in New Issue