From 708f9a0aefd36c9df6a34da180f16f8941f18ec4 Mon Sep 17 00:00:00 2001 From: ikpil Date: Wed, 22 Mar 2023 23:11:01 +0900 Subject: [PATCH] removed test project --- DotRecast.sln | 7 - src/DotRecast.Silk/DotRecast.Silk.csproj | 20 --- src/DotRecast.Silk/Program.cs | 28 ---- src/DotRecast.Silk/SilkDemo.cs | 172 ----------------------- 4 files changed, 227 deletions(-) delete mode 100644 src/DotRecast.Silk/DotRecast.Silk.csproj delete mode 100644 src/DotRecast.Silk/Program.cs delete mode 100644 src/DotRecast.Silk/SilkDemo.cs diff --git a/DotRecast.sln b/DotRecast.sln index 95795cc..e07d120 100644 --- a/DotRecast.sln +++ b/DotRecast.sln @@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotRecast.Detour.TileCache. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotRecast.Recast.Demo", "src\DotRecast.Recast.Demo\DotRecast.Recast.Demo.csproj", "{023E1E6A-4895-4573-89AE-3D5D8E0B39C8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotRecast.Silk", "src\DotRecast.Silk\DotRecast.Silk.csproj", "{330F016B-70AE-473F-A06E-1976721B87CC}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -102,10 +100,6 @@ Global {023E1E6A-4895-4573-89AE-3D5D8E0B39C8}.Debug|Any CPU.Build.0 = Debug|Any CPU {023E1E6A-4895-4573-89AE-3D5D8E0B39C8}.Release|Any CPU.ActiveCfg = Release|Any CPU {023E1E6A-4895-4573-89AE-3D5D8E0B39C8}.Release|Any CPU.Build.0 = Release|Any CPU - {330F016B-70AE-473F-A06E-1976721B87CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {330F016B-70AE-473F-A06E-1976721B87CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {330F016B-70AE-473F-A06E-1976721B87CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {330F016B-70AE-473F-A06E-1976721B87CC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {FFE40BBF-843B-41FA-8504-F4ABD166762E} = {8ED75CF7-A3D6-423D-8499-9316DD413DAD} @@ -122,6 +116,5 @@ Global {DEB16B90-CCD4-497E-A2E9-4CC66FD7EF47} = {8ED75CF7-A3D6-423D-8499-9316DD413DAD} {3CAA7306-088E-4373-A406-99755CC2B605} = {A7CB8D8B-70DA-4567-8316-0659FCAE1C73} {023E1E6A-4895-4573-89AE-3D5D8E0B39C8} = {8ED75CF7-A3D6-423D-8499-9316DD413DAD} - {330F016B-70AE-473F-A06E-1976721B87CC} = {8ED75CF7-A3D6-423D-8499-9316DD413DAD} EndGlobalSection EndGlobal diff --git a/src/DotRecast.Silk/DotRecast.Silk.csproj b/src/DotRecast.Silk/DotRecast.Silk.csproj deleted file mode 100644 index 331d88b..0000000 --- a/src/DotRecast.Silk/DotRecast.Silk.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - Exe - net7.0 - true - - - - - - - - - - - - - - diff --git a/src/DotRecast.Silk/Program.cs b/src/DotRecast.Silk/Program.cs deleted file mode 100644 index 9b67e20..0000000 --- a/src/DotRecast.Silk/Program.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using DotRecast.Silk; -using Serilog; -using Serilog.Enrichers; - -public class Program -{ - // Only Graphics Test - public static void Main(string[] args) - { - var format = "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level:u3}] {Message:lj} [{MemberName}()] [{ThreadName}:{ThreadId}] at {FilePath}:{LineNumber} {NewLine}{Exception}"; - Log.Logger = new LoggerConfiguration() - .MinimumLevel.Verbose() - .Enrich.WithThreadId() - .Enrich.WithThreadName() - .Enrich.WithProperty(ThreadNameEnricher.ThreadNamePropertyName, "main") - .WriteTo.Console(outputTemplate: format) - .WriteTo.File( - "logs/log.log", - rollingInterval: RollingInterval.Day, - rollOnFileSizeLimit: true, - outputTemplate: format) - .CreateLogger(); - - var demo = new SilkDemo(); - demo.Run(); - } -} \ No newline at end of file diff --git a/src/DotRecast.Silk/SilkDemo.cs b/src/DotRecast.Silk/SilkDemo.cs deleted file mode 100644 index 232dff9..0000000 --- a/src/DotRecast.Silk/SilkDemo.cs +++ /dev/null @@ -1,172 +0,0 @@ -using System; -using Serilog; -using Silk.NET.Input; -using Silk.NET.Maths; -using Silk.NET.OpenGL; -using Silk.NET.Windowing; - -namespace DotRecast.Silk; - -public class SilkDemo -{ - private static readonly ILogger Logger = Log.ForContext(); - - private IWindow _win; - private IInputContext _input; - private GL _gl; - private uint _vao; // vertex array object - private uint _vbo; // vertex buffer object - private uint _ebo; // - private uint _program; - - public void Run() - { - Log.Logger.Information("running"); - - var options = WindowOptions.Default; - options.Title = "silk demo"; - options.Size = new Vector2D(1024, 768); - options.VSync = false; - options.ShouldSwapAutomatically = false; - _win = Window.Create(options); - - _win.Closing += OnWindowClosing; - _win.Load += OnWindowLoad; - _win.Resize += OnWindowResize; - _win.FramebufferResize += OnWindowFramebufferResize; - _win.Update += OnWindowUpdate; - _win.Render += OnWindowRender; - - _win.Run(); - } - - private void OnWindowClosing() - { - } - - private unsafe void OnWindowLoad() - { - _input = _win.CreateInput(); - _gl = _win.CreateOpenGL(); - - Logger.Information($"{_win.API.Profile}"); - Logger.Information($"{_win.API.Version.MajorVersion} {_win.API.Version.MinorVersion}"); - - //_gl.ClearColor(Color.CornflowerBlue); - - // Create the VAO. - _vao = _gl.GenVertexArray(); - _vbo = _gl.GenBuffer(); // Create the VBO. - _ebo = _gl.GenBuffer(); // Create the EBO. - - _gl.BindVertexArray(_vao); - _gl.BindBuffer(BufferTargetARB.ArrayBuffer, _vbo); - _gl.BindBuffer(BufferTargetARB.ElementArrayBuffer, _ebo); - - // The quad vertices data. - float[] vertices = - { - 0.5f, 0.5f, 0.0f, - 0.5f, -0.5f, 0.0f, - -0.5f, -0.5f, 0.0f, - -0.5f, 0.5f, 0.0f - }; - - - // Upload the vertices data to the VBO. - fixed (float* buf = vertices) - _gl.BufferData(BufferTargetARB.ArrayBuffer, (nuint) (vertices.Length * sizeof(float)), buf, BufferUsageARB.StaticDraw); - - // The quad indices data. - uint[] indices = - { - 0u, 1u, 3u, - 1u, 2u, 3u - }; - - - // Upload the indices data to the EBO. - fixed (uint* buf = indices) - _gl.BufferData(BufferTargetARB.ElementArrayBuffer, (nuint) (indices.Length * sizeof(uint)), buf, BufferUsageARB.StaticDraw); - - const string vertexCode = @" -#version 330 core -layout (location = 0) in vec3 aPosition; -void main() -{ - gl_Position = vec4(aPosition, 1.0); -}"; - - const string fragmentCode = @" -#version 330 core -out vec4 out_color; -void main() -{ - out_color = vec4(1.0, 0.5, 0.2, 1.0); -}"; - - _program = _gl.CreateProgram(); - uint vertexShader = _gl.CreateShader(ShaderType.VertexShader); - uint fragmentShader = _gl.CreateShader(ShaderType.FragmentShader); - - _gl.ShaderSource(vertexShader, vertexCode); - _gl.ShaderSource(fragmentShader, fragmentCode); - - _gl.CompileShader(vertexShader); - _gl.CompileShader(fragmentShader); - - _gl.GetShader(vertexShader, ShaderParameterName.CompileStatus, out int vStatus); - if (vStatus != (int) GLEnum.True) - throw new Exception("Vertex shader failed to compile: " + _gl.GetShaderInfoLog(vertexShader)); - - _gl.GetShader(fragmentShader, ShaderParameterName.CompileStatus, out int fStatus); - if (fStatus != (int) GLEnum.True) - throw new Exception("Fragment shader failed to compile: " + _gl.GetShaderInfoLog(fragmentShader)); - - _gl.AttachShader(_program, vertexShader); - _gl.AttachShader(_program, fragmentShader); - _gl.LinkProgram(_program); - - _gl.GetProgram(_program, ProgramPropertyARB.LinkStatus, out int lStatus); - if (lStatus != (int) GLEnum.True) - throw new Exception("Program failed to link: " + _gl.GetProgramInfoLog(_program)); - - _gl.DetachShader(_program, vertexShader); - _gl.DetachShader(_program, fragmentShader); - _gl.DeleteShader(vertexShader); - _gl.DeleteShader(fragmentShader); - - var positionLoc = (uint)_gl.GetAttribLocation(_program, "aPosition"); - _gl.EnableVertexAttribArray(positionLoc); - _gl.VertexAttribPointer(positionLoc, 3, VertexAttribPointerType.Float, false, 3 * sizeof(float), (void*) 0); - - _gl.BindVertexArray(0); - _gl.BindBuffer(BufferTargetARB.ArrayBuffer, 0); - _gl.BindBuffer(BufferTargetARB.ElementArrayBuffer, 0); - } - - - private void OnWindowResize(Vector2D size) - { - } - - private void OnWindowFramebufferResize(Vector2D size) - { - } - - private void OnWindowUpdate(double dt) - { - } - - private unsafe void OnWindowRender(double dt) - { - _gl.ClearColor(0.3f, 0.3f, 0.32f, 1.0f); - _gl.Clear((uint)GLEnum.ColorBufferBit | (uint)GLEnum.DepthBufferBit); - - _gl.BindVertexArray(_vao); - _gl.UseProgram(_program); - _gl.DrawElements(PrimitiveType.Triangles, 6, DrawElementsType.UnsignedInt, (void*) 0); - - _win.SwapBuffers(); - } -} \ No newline at end of file