#15 Introduce Text Renderer

Examples/MinecraftClone/Minecraft.cs

@@ -1,17 +1,20 @@
 using ImGuiNET;
+
 using Microsoft.Extensions.Logging;
 using Minecraft.Terrain.Block;
 using Minecraft.Terrain.Layers;
+
 using SharpEngine.Core;
 using SharpEngine.Core.Entities;
 using SharpEngine.Core.Entities.Properties;
-using SharpEngine.Core.Entities.UI;
-using SharpEngine.Core.Entities.UI.Layouts;
 using SharpEngine.Core.Enums;
 using SharpEngine.Core.Interfaces;
 using SharpEngine.Core.Numerics;
 using SharpEngine.Core.Scenes;
+using SharpEngine.Core.UI.Entities;
+using SharpEngine.Core.UI.Entities.Layouts;
 using SharpEngine.Core.Windowing;
+
 using Silk.NET.Input;
 using System;
 
@@ -32,7 +35,7 @@
 
     private UIElement _uiElem;
 
     private readonly Terrain.TerrainGenerator_New _terrain;
     private readonly SceneNode _blocksNode;
 
     /// <summary>
@@ -69,9 +72,19 @@
             _input = new Input(Camera);
             _inventory.Initialize();
 
-            _terrain.InitializeWorld();
+            // _terrain.InitializeWorld();
 
             InitializeUI();
+
+            // Test text renderer
+            var _textElem = new TextElement("text element")
+            {
+                Text = "Hello, World!",
+                Height = 200,
+                Color = new System.Numerics.Vector4(1, 1, 1, 1),
+            };
+
+            _uiElem.AddChild(_textElem);
         }
         catch (Exception ex)
         {

Examples/MinecraftClone/Minecraft.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -9,7 +9,9 @@
     <ItemGroup>
         <ProjectReference Include="..\..\SharpEngine.Core.DependencyInjection\SharpEngine.Core.DependencyInjection.csproj" />
         <ProjectReference Include="..\..\SharpEngine.Core.ObjLoader\SharpEngine.Core.ObjLoader.csproj" />
+        <ProjectReference Include="..\..\SharpEngine.Core.UI\SharpEngine.Core.UI.csproj" />
         <ProjectReference Include="..\..\SharpEngine.Core\SharpEngine.Core.csproj" />
+        <ProjectReference Include="..\..\SharpEngine.Text\SharpEngine.Core.UI.Text.csproj" />
     </ItemGroup>
 
     <ItemGroup>

Examples/MinecraftClone/Program.cs

@@ -1,14 +1,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using SharpEngine.Core;
+
 using SharpEngine.Core.DependencyInjection;
 using SharpEngine.Core.Entities.Views;
 using SharpEngine.Core.Handlers;
 using SharpEngine.Core.Interfaces;
 using SharpEngine.Core.Renderers;
 using SharpEngine.Core.Scenes;
-using SharpEngine.Core.Windowing;
-using System;
+using SharpEngine.Core.UI.Renderers;
 
 namespace Minecraft;
 

Examples/MinecraftClone/Terrain/Block/BlockBase.cs

@@ -41,7 +41,7 @@ protected BlockBase(Vector3 position, string name, string diffuseMapFile, string
 
     private void Initialize(Vector3 position, string name, string diffuseMapFile, string specularMapFile, string vertShaderFile, string fragShaderFile)
     {
-        var cube = PrimitiveFactory.Create(PrimitiveType.Cube, (SharpEngine.Core.Numerics.Vector3)position, diffuseMapFile, specularMapFile, vertShaderFile, fragShaderFile);
+        var cube = PrimitiveFactory.Create(PrimitiveType.Cube, position, diffuseMapFile, specularMapFile, vertShaderFile, fragShaderFile);
         AssignProperties(cube, name);
     }
 

Examples/MinecraftClone/Terrain/Block/Dirt.cs

@@ -1,6 +1,6 @@
-using SharpEngine.Core._Resources;
-using SharpEngine.Core.Extensions;
+using SharpEngine.Core.Defaults;
 using SharpEngine.Core.Numerics;
+using SharpEngine.IO.Extensions;
 
 namespace Minecraft.Terrain.Block;
 
@@ -16,8 +16,8 @@ internal class Dirt : BlockBase
     /// <param name="name">The name of the block to initialize.</param>
     public Dirt(Vector3 position, string name) : base(position, name, PathExtensions.GetAssemblyPath("Resources\\grass.jpg"), 
                                                                       PathExtensions.GetAssemblyPath("Resources\\container2_specular.png"),
-                                                                      Default.VertexShader, 
-                                                                      Default.FragmentShader) { }
+                                                                      Defaults.VertexShader, 
+                                                                      Defaults.FragmentShader) { }
 
     /// <inheritdoc />
     public override BlockId BlockId => BlockId.Dirt;

Examples/MinecraftClone/Terrain/Block/Grass.cs

@@ -1,6 +1,6 @@
-using SharpEngine.Core._Resources;
-using SharpEngine.Core.Extensions;
+using SharpEngine.Core.Defaults;
 using SharpEngine.Core.Numerics;
+using SharpEngine.IO.Extensions;
 
 namespace Minecraft.Terrain.Block;
 
@@ -13,8 +13,8 @@ internal class Grass : BlockBase
     /// <param name="name">The name of the block to initialize.</param>
     public Grass(Vector3 position, string name) : base(position, name, PathExtensions.GetAssemblyPath("Resources\\grass.jpg"),
                                                                       PathExtensions.GetAssemblyPath("Resources\\container2_specular.png"),
-                                                                      Default.VertexShader,
-                                                                      Default.FragmentShader) { }
+                                                                      Defaults.VertexShader,
+                                                                      Defaults.FragmentShader) { }
 
     /// <inheritdoc />
     public override BlockId BlockId => BlockId.Grass;

Examples/MinecraftClone/Terrain/Block/Iron.cs

@@ -1,13 +1,13 @@
-using SharpEngine.Core._Resources;
-using SharpEngine.Core.Extensions;
+using SharpEngine.Core.Defaults;
 using SharpEngine.Core.Numerics;
+using SharpEngine.IO.Extensions;
 
 namespace Minecraft.Terrain.Block;
 
 internal class Iron : BlockBase
 {
     public Iron(Vector3 position, string name)
-        : base(position, name, DiffuseMap(), SpecularMap(), Default.VertexShader, Default.FragmentShader) { }
+        : base(position, name, DiffuseMap(), SpecularMap(), Defaults.VertexShader, Defaults.FragmentShader) { }
 
     private static string DiffuseMap() => PathExtensions.GetAssemblyPath("Resources\\container2.png");
     private static string SpecularMap() => PathExtensions.GetAssemblyPath("Resources\\container2_specular.png");

Examples/MinecraftClone/Terrain/Block/Leaf.cs

@@ -1,13 +1,13 @@
-using SharpEngine.Core._Resources;
-using SharpEngine.Core.Extensions;
+using SharpEngine.Core.Defaults;
 using SharpEngine.Core.Numerics;
+using SharpEngine.IO.Extensions;
 
 namespace Minecraft.Terrain.Block;
 
 internal class Leaf : BlockBase
 {
     public Leaf(Vector3 position, string name)
-    : base(position, name, DiffuseMap(), SpecularMap(), Default.VertexShader, Default.FragmentShader) { }
+    : base(position, name, DiffuseMap(), SpecularMap(), Defaults.VertexShader, Defaults.FragmentShader) { }
 
     private static string DiffuseMap() => PathExtensions.GetAssemblyPath("Resources\\container2.png");
     private static string SpecularMap() => PathExtensions.GetAssemblyPath("Resources\\container2_specular.png");

Examples/MinecraftClone/Terrain/Block/Stone.cs

@@ -1,6 +1,6 @@
-using SharpEngine.Core._Resources;
-using SharpEngine.Core.Extensions;
+using SharpEngine.Core.Defaults;
 using SharpEngine.Core.Numerics;
+using SharpEngine.IO.Extensions;
 
 namespace Minecraft.Terrain.Block;
 
@@ -15,7 +15,7 @@ internal class Stone : BlockBase
     /// <param name="position">The position where the block is created.</param>
     /// <param name="name">The name of the object in the scene.</param>
     public Stone(Vector3 position, string name) 
-        : base(position, name, DiffuseMap(), SpecularMap(), Default.VertexShader, Default.FragmentShader) { }
+        : base(position, name, DiffuseMap(), SpecularMap(), Defaults.VertexShader, Defaults.FragmentShader) { }
 
     private static string DiffuseMap() => PathExtensions.GetAssemblyPath("Resources\\container2.png");
     private static string SpecularMap() => PathExtensions.GetAssemblyPath("Resources\\container2_specular.png");

Examples/MinecraftClone/Terrain/Block/Wood.cs

@@ -1,13 +1,13 @@
-using SharpEngine.Core._Resources;
-using SharpEngine.Core.Extensions;
+using SharpEngine.Core.Defaults;
 using SharpEngine.Core.Numerics;
+using SharpEngine.IO.Extensions;
 
 namespace Minecraft.Terrain.Block;
 
 internal class Wood : BlockBase
 {
     public Wood(Vector3 position, string name)
-    : base(position, name, DiffuseMap(), SpecularMap(), Default.VertexShader, Default.FragmentShader) { }
+    : base(position, name, DiffuseMap(), SpecularMap(), Defaults.VertexShader, Defaults.FragmentShader) { }
 
     private static string DiffuseMap() => PathExtensions.GetAssemblyPath("Resources\\container2.png");
     private static string SpecularMap() => PathExtensions.GetAssemblyPath("Resources\\container2_specular.png");

Examples/MultipleWindows/Program.cs

@@ -119,14 +119,14 @@ private static void EnqueueWindow()
         var window = CreateWindow();
 
         // Prefer the higher-level Window event to avoid wiring low-level input handlers.
-        window.InputManager.OnButtonMouseDown += (mouse, button) => Mouse_Click(mouse, (MouseButton)button, mouse.Position);
+        window.InputManager.OnButtonMouseDown += (mouse, button) => Mouse_Click(mouse, button, (SharpEngine.Core.Numerics.Vector2)mouse.Position);
 
         if (window.InputManager.Context is not null)
             _inputContexts.Add(window.InputManager.Context);
 
         _windows.Add(window);
     }
 
-    private static void Mouse_Click(IMouse args1, MouseButton arg2, System.Numerics.Vector2 arg3)
+    private static void Mouse_Click(IMouse args1, MouseButton arg2, SharpEngine.Core.Numerics.Vector2 arg3)
         => _windowQueue.Enqueue(WindowOptions.Default);
 }

Examples/Tutorial 4.1 - Model Loading/Program.cs

@@ -1,5 +1,3 @@
-using SharpEngine.Core._Resources;
-using SharpEngine.Core.Extensions;
 using SharpEngine.Core.Components.Properties.Meshes;
 using SharpEngine.Core.ObjLoader.Loaders.ObjLoader;
 using Shader = SharpEngine.Core.Shaders.Shader;
@@ -13,6 +11,8 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using SharpEngine.IO.Extensions;
+using SharpEngine.Core.Defaults;
 
 namespace Tutorial
 {
@@ -82,7 +82,7 @@ private static void OnLoad()
 
             Gl = GL.GetApi(window);
 
-            Shader = new Shader(Gl, PathExtensions.GetAssemblyPath("shader2.vert"), Default.LightShader, "test");
+            Shader = new Shader(Gl, PathExtensions.GetAssemblyPath("shader2.vert"), Defaults.LightShader, "test");
             Texture = new Texture(Gl, "silk.png");
 
             if (ObjLoaderFactory.Load(Gl, "D:\\Untitled2.obj", out var model))

Examples/Tutorial 4.1 - Model Loading/Tutorial 4.1 - Model Loading.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -7,7 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\SharpEngine.Core.ObjLoader\SharpEngine.Core.ObjLoader.csproj" />
       <ProjectReference Include="..\..\SharpEngine.Core.Components\SharpEngine.Core.Components.csproj" />
       <ProjectReference Include="..\..\SharpEngine.Core.ObjLoader\SharpEngine.Core.ObjLoader.csproj" />
       <ProjectReference Include="..\..\SharpEngine.Core\SharpEngine.Core.csproj" />

SharpEngine.Core/Audio/Audio.cs → SharpEngine.Core.Audio/Audio.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using SharpEngine.Core.Audio.Players;
 
 namespace SharpEngine.Core.Audio;
 

SharpEngine.Core/Audio/AudioBuffer.cs → SharpEngine.Core.Audio/AudioBuffer.cs

@@ -1,5 +1,4 @@
 using Silk.NET.OpenAL;
-using System;
 
 namespace SharpEngine.Core.Audio;
 
@@ -39,5 +38,4 @@ public void LoadData(ReadOnlySpan<byte> data, AudioData wavData)
             }
         }
     }
-
 }

SharpEngine.Core/Audio/AudioPlayerBase.cs → SharpEngine.Core.Audio/AudioPlayerBase.cs

@@ -1,9 +1,6 @@
 using SharpEngine.Core.Scenes;
 using Silk.NET.OpenAL;
 
-using System;
-using System.IO;
-
 namespace SharpEngine.Core.Audio;
 
 /// <summary>

SharpEngine.Core/Audio/Mp3Player.cs → SharpEngine.Core.Audio/Players/Mp3Player.cs

@@ -1,11 +1,8 @@
 using Microsoft.Extensions.Logging;
-using System;
-using System.Buffers.Binary;
-using System.IO;
 using NLayer;
 using Silk.NET.OpenAL;
 
-namespace SharpEngine.Core.Audio;
+namespace SharpEngine.Core.Audio.Players;
 
 internal class Mp3Player : AudioPlayerBase
 {
@@ -14,9 +11,10 @@ internal class Mp3Player : AudioPlayerBase
     /// <inheritdoc />
     protected override string FileExtension => AudioFileExtensions.Mp3Extension;
 
-    public Mp3Player()
-    {
-    }
+    /// <summary>
+    ///     Initializes a new instance of <see cref="Mp3Player" />
+    /// </summary>
+    public Mp3Player() { }
 
     /// <inheritdoc />
     /// <exception cref="InvalidOperationException">Thrown if the audio data contains more than 2 channels.</exception>
@@ -45,9 +43,14 @@ public override void Play(string filePath)
                 float f = floatBuffer[i];
                 // clamp and convert
                 int intVal = (int)MathF.Round(f * 32767f);
-                if (intVal > short.MaxValue) intVal = short.MaxValue;
-                else if (intVal < short.MinValue) intVal = short.MinValue;
+                if (intVal > short.MaxValue) 
+                    intVal = short.MaxValue;
+
+                else if (intVal < short.MinValue) 
+                    intVal = short.MinValue;
+
                 short s = (short)intVal;
+
                 bytes[i * 2] = (byte)(s & 0xFF);
                 bytes[i * 2 + 1] = (byte)((s >> 8) & 0xFF);
             }

SharpEngine.Core/Audio/WavPlayer.cs → SharpEngine.Core.Audio/Players/WavPlayer.cs

@@ -1,11 +1,9 @@
 using Microsoft.Extensions.Logging;
 using Silk.NET.OpenAL;
 
-using System;
 using System.Buffers.Binary;
-using System.IO;
 
-namespace SharpEngine.Core.Audio;
+namespace SharpEngine.Core.Audio.Players;
 
 /// <summary>
 ///     Represents a player for .wav files.

SharpEngine.Core.Audio/SharpEngine.Core.Audio.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- TODO: This required by the AudioDevice class. -->
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Silk.NET.OpenAL" Version="2.23.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SharpEngine.Core\SharpEngine.Core.csproj" />
+  </ItemGroup>
+
+</Project>