diff --git a/.gitignore b/.gitignore index 24a020e..1f244f7 100644 --- a/.gitignore +++ b/.gitignore @@ -478,3 +478,5 @@ $RECYCLE.BIN/ /Diagnostics + +!Ion/Ion.Core/Debug \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 037d3f7..40ac8d6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,22 +1,6 @@ { "version": "0.2.0", "configurations": [ - { - // Use IntelliSense to find out which attributes exist for C# debugging - // Use hover for the description of the existing attributes - // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md - "name": ".NET Core Launch (console)", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build", - // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/Kyber.ECS/Kyber.ECS.Tests/bin/Debug/net6.0/Kyber.ECS.Tests.dll", - "args": [], - "cwd": "${workspaceFolder}/Kyber.ECS/Kyber.ECS.Tests", - // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console - "console": "internalConsole", - "stopAtEntry": false - }, { "name": ".NET Core Attach", "type": "coreclr", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 53aaab1..0edd552 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/Kyber.ECS/Kyber.ECS.Tests/Kyber.ECS.Tests.csproj", + "${workspaceFolder}/Ion.ECS/Ion.ECS.Tests/Ion.ECS.Tests.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -19,7 +19,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/Kyber.ECS/Kyber.ECS.Tests/Kyber.ECS.Tests.csproj", + "${workspaceFolder}/Ion.ECS/Ion.ECS.Tests/Ion.ECS.Tests.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -33,7 +33,7 @@ "watch", "run", "--project", - "${workspaceFolder}/Kyber.ECS/Kyber.ECS.Tests/Kyber.ECS.Tests.csproj" + "${workspaceFolder}/Ion.ECS/Ion.ECS.Tests/Ion.ECS.Tests.csproj" ], "problemMatcher": "$msCompile" } diff --git a/CHANGELOG.md b/CHANGELOG.md index c4f2cf4..8a04230 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,49 +1,49 @@ My Changelog -## [0.1.3](https://www.github.com/jimbuck/Kyber/releases/tag/v0.1.3) (2024-1-8) +## [0.1.3](https://www.github.com/jimbuck/Ion/releases/tag/v0.1.3) (2024-1-8) ### ✨ Features -* Middleware Architecture (#18) ([8781b04](https://www.github.com/jimbuck/Kyber/commit/8781b04943ec067e9dcab80f5d3ba7c1ec1f1ad8)) +* Middleware Architecture (#18) ([8781b04](https://www.github.com/jimbuck/Ion/commit/8781b04943ec067e9dcab80f5d3ba7c1ec1f1ad8)) -## [0.1.2](https://www.github.com/jimbuck/Kyber/releases/tag/v0.1.2) (2023-4-19) +## [0.1.2](https://www.github.com/jimbuck/Ion/releases/tag/v0.1.2) (2023-4-19) ### ✨ Features -* Core Engine (#17) ([d9f1f98](https://www.github.com/jimbuck/Kyber/commit/d9f1f98838d8c83ac9d6b5ce4be9abb41cec3dd4)) +* Core Engine (#17) ([d9f1f98](https://www.github.com/jimbuck/Ion/commit/d9f1f98838d8c83ac9d6b5ce4be9abb41cec3dd4)) -## [0.1.1](https://www.github.com/jimbuck/Kyber/releases/tag/v0.1.1) (2022-10-10) +## [0.1.1](https://www.github.com/jimbuck/Ion/releases/tag/v0.1.1) (2022-10-10) ### ✨ Features -* Added Entity methods. (#10) ([f003315](https://www.github.com/jimbuck/Kyber/commit/f003315a11ae7ee5a5286fded3a7dac9c150f66e)) +* Added Entity methods. (#10) ([f003315](https://www.github.com/jimbuck/Ion/commit/f003315a11ae7ee5a5286fded3a7dac9c150f66e)) -## [0.1.0](https://www.github.com/jimbuck/Kyber/releases/tag/v0.1.0) (2022-10-9) +## [0.1.0](https://www.github.com/jimbuck/Ion/releases/tag/v0.1.0) (2022-10-9) ### 🛠 Internal -* Added main build & version action. (#3) ([1032b9a](https://www.github.com/jimbuck/Kyber/commit/1032b9ae58905ae7084f12c0187ce7355e8b89b1)) -* Fixed main action config. (#9) ([2333fd1](https://www.github.com/jimbuck/Kyber/commit/2333fd1bebdd140753291edd279b89772a01f05b)) -* Update changelog generation. (#5) ([9347ac7](https://www.github.com/jimbuck/Kyber/commit/9347ac7a390615e9adcd1b36f18df38e7db21f98)) -* Update changelog generation. (#6) ([62176fc](https://www.github.com/jimbuck/Kyber/commit/62176fc3ce5d3600f0fbcc3458905c5c5b490907)) -* Update changelog generation. (#7) ([5c9abc7](https://www.github.com/jimbuck/Kyber/commit/5c9abc71ba6e5c342f6b61a83e9793a0781f1db1)) -* Update changelog generation. (#8) ([b2f7e70](https://www.github.com/jimbuck/Kyber/commit/b2f7e70249f2c736ca5af654b491278d5f603578)) -* Updated main action order. ([04a82ec](https://www.github.com/jimbuck/Kyber/commit/04a82ec861a96fe428fa5312eb3716c464881444)) -* Updated versionize config/usage. (#4) ([5bac9ea](https://www.github.com/jimbuck/Kyber/commit/5bac9eae2952f17ff5ac1184f7222b4f18f086d7)) +* Added main build & version action. (#3) ([1032b9a](https://www.github.com/jimbuck/Ion/commit/1032b9ae58905ae7084f12c0187ce7355e8b89b1)) +* Fixed main action config. (#9) ([2333fd1](https://www.github.com/jimbuck/Ion/commit/2333fd1bebdd140753291edd279b89772a01f05b)) +* Update changelog generation. (#5) ([9347ac7](https://www.github.com/jimbuck/Ion/commit/9347ac7a390615e9adcd1b36f18df38e7db21f98)) +* Update changelog generation. (#6) ([62176fc](https://www.github.com/jimbuck/Ion/commit/62176fc3ce5d3600f0fbcc3458905c5c5b490907)) +* Update changelog generation. (#7) ([5c9abc7](https://www.github.com/jimbuck/Ion/commit/5c9abc71ba6e5c342f6b61a83e9793a0781f1db1)) +* Update changelog generation. (#8) ([b2f7e70](https://www.github.com/jimbuck/Ion/commit/b2f7e70249f2c736ca5af654b491278d5f603578)) +* Updated main action order. ([04a82ec](https://www.github.com/jimbuck/Ion/commit/04a82ec861a96fe428fa5312eb3716c464881444)) +* Updated versionize config/usage. (#4) ([5bac9ea](https://www.github.com/jimbuck/Ion/commit/5bac9eae2952f17ff5ac1184f7222b4f18f086d7)) ### Other -* Fixed ComponentId generation issue. ([0347130](https://www.github.com/jimbuck/Kyber/commit/034713074429e238cd841a5b5e1578080993b7b5)) -* Initial commit ([b293ddb](https://www.github.com/jimbuck/Kyber/commit/b293ddb273c4b44e7a1b893f1d2246954870d30c)) -* Initial ECS implementation. ([0327e46](https://www.github.com/jimbuck/Kyber/commit/0327e4608b65c37c5d7c1cc529dafc8d6c4b4474)) -* Merge pull request #2 from jimbuck/feature/test-pr-build ([38f078d](https://www.github.com/jimbuck/Kyber/commit/38f078d187c61759b45743601b568be0105d650b)) -* Setup initial PR action. ([ae1e6a8](https://www.github.com/jimbuck/Kyber/commit/ae1e6a851641da0090017e2dae7b2e52ef053445)) -* Update main.yml ([078665e](https://www.github.com/jimbuck/Kyber/commit/078665e4134071cf211e93919c6eec65e91cb2b6)) -* Update README.md ([eee6be9](https://www.github.com/jimbuck/Kyber/commit/eee6be957164dbadc0b68eb6f5c4a9d913152627)) -* Update README.md ([1bc8961](https://www.github.com/jimbuck/Kyber/commit/1bc8961212588331580eb49e62a0cfcfb939408a)) -* Updated folder names, added vscode settings file. ([3f02e33](https://www.github.com/jimbuck/Kyber/commit/3f02e33690773ffc41247a36965c7f0961399917)) -* **internal:** Test commit. ([7490f74](https://www.github.com/jimbuck/Kyber/commit/7490f74661b79d06f9fbc53b72514a0d67affad7)) +* Fixed ComponentId generation issue. ([0347130](https://www.github.com/jimbuck/Ion/commit/034713074429e238cd841a5b5e1578080993b7b5)) +* Initial commit ([b293ddb](https://www.github.com/jimbuck/Ion/commit/b293ddb273c4b44e7a1b893f1d2246954870d30c)) +* Initial ECS implementation. ([0327e46](https://www.github.com/jimbuck/Ion/commit/0327e4608b65c37c5d7c1cc529dafc8d6c4b4474)) +* Merge pull request #2 from jimbuck/feature/test-pr-build ([38f078d](https://www.github.com/jimbuck/Ion/commit/38f078d187c61759b45743601b568be0105d650b)) +* Setup initial PR action. ([ae1e6a8](https://www.github.com/jimbuck/Ion/commit/ae1e6a851641da0090017e2dae7b2e52ef053445)) +* Update main.yml ([078665e](https://www.github.com/jimbuck/Ion/commit/078665e4134071cf211e93919c6eec65e91cb2b6)) +* Update README.md ([eee6be9](https://www.github.com/jimbuck/Ion/commit/eee6be957164dbadc0b68eb6f5c4a9d913152627)) +* Update README.md ([1bc8961](https://www.github.com/jimbuck/Ion/commit/1bc8961212588331580eb49e62a0cfcfb939408a)) +* Updated folder names, added vscode settings file. ([3f02e33](https://www.github.com/jimbuck/Ion/commit/3f02e33690773ffc41247a36965c7f0961399917)) +* **internal:** Test commit. ([7490f74](https://www.github.com/jimbuck/Ion/commit/7490f74661b79d06f9fbc53b72514a0d67affad7)) diff --git a/Kyber.Examples/Kyber.Examples.Breakout/Kyber.Examples.Breakout.csproj b/Ion.Examples/Ion.Examples.Breakout/Ion.Examples.Breakout.csproj similarity index 75% rename from Kyber.Examples/Kyber.Examples.Breakout/Kyber.Examples.Breakout.csproj rename to Ion.Examples/Ion.Examples.Breakout/Ion.Examples.Breakout.csproj index 77f4e0b..915d598 100644 --- a/Kyber.Examples/Kyber.Examples.Breakout/Kyber.Examples.Breakout.csproj +++ b/Ion.Examples/Ion.Examples.Breakout/Ion.Examples.Breakout.csproj @@ -19,8 +19,9 @@ - - + + + diff --git a/Kyber.Examples/Kyber.Examples.Breakout/Program.cs b/Ion.Examples/Ion.Examples.Breakout/Program.cs similarity index 97% rename from Kyber.Examples/Kyber.Examples.Breakout/Program.cs rename to Ion.Examples/Ion.Examples.Breakout/Program.cs index e4f02ef..26a4440 100644 --- a/Kyber.Examples/Kyber.Examples.Breakout/Program.cs +++ b/Ion.Examples/Ion.Examples.Breakout/Program.cs @@ -1,12 +1,12 @@ using System.Numerics; using Microsoft.Extensions.DependencyInjection; -using Kyber; -using Kyber.Extensions.Graphics; +using Ion; +using Ion.Extensions.Graphics; -var builder = KyberApplication.CreateBuilder(args); +var builder = IonApplication.CreateBuilder(args); -builder.Services.AddKyber(builder.Configuration, graphics => +builder.Services.AddIon(builder.Configuration, graphics => { graphics.Output = GraphicsOutput.Window; graphics.ClearColor = Color.DarkSlateGray; @@ -15,7 +15,7 @@ builder.Services.AddSingleton(); var game = builder.Build(); -game.UseKyber() +game.UseIon() .UseSystem(); //Thread.Sleep(10 * 1000); // Delay to let diagnostics warm up. diff --git a/Kyber.Examples/Kyber.Examples.Scenes/Properties/launchSettings.json b/Ion.Examples/Ion.Examples.Breakout/Properties/launchSettings.json similarity index 57% rename from Kyber.Examples/Kyber.Examples.Scenes/Properties/launchSettings.json rename to Ion.Examples/Ion.Examples.Breakout/Properties/launchSettings.json index f36fe4f..7bc2142 100644 --- a/Kyber.Examples/Kyber.Examples.Scenes/Properties/launchSettings.json +++ b/Ion.Examples/Ion.Examples.Breakout/Properties/launchSettings.json @@ -1,9 +1,9 @@ { "profiles": { - "Kyber.Examples.Scenes": { + "Ion.Examples.Breakout": { "commandName": "Project", "environmentVariables": { - "Logging__LogLevel__Kyber": "Debug" + "Logging__LogLevel__Ion": "Debug" } } } diff --git a/Kyber.Examples/Kyber.Examples.Breakout/appsettings.json b/Ion.Examples/Ion.Examples.Breakout/appsettings.json similarity index 78% rename from Kyber.Examples/Kyber.Examples.Breakout/appsettings.json rename to Ion.Examples/Ion.Examples.Breakout/appsettings.json index fae30fc..e106015 100644 --- a/Kyber.Examples/Kyber.Examples.Breakout/appsettings.json +++ b/Ion.Examples/Ion.Examples.Breakout/appsettings.json @@ -2,11 +2,11 @@ "Logging": { "LogLevel": { // All providers, LogLevel applies to all the enabled providers. "Default": "Debug", - "Kyber": "Debug" + "Ion": "Debug" } }, - "Kyber": { - "Title": "Kyber Breakout Example", + "Ion": { + "Title": "Ion Breakout Example", "MaxFPS": 500, "Debug": { "TraceEnabled": true diff --git a/Kyber.Examples/Kyber.Examples.Generators/Game.cs b/Ion.Examples/Ion.Examples.Generators/Game.cs similarity index 68% rename from Kyber.Examples/Kyber.Examples.Generators/Game.cs rename to Ion.Examples/Ion.Examples.Generators/Game.cs index 1e713d4..a3764fc 100644 --- a/Kyber.Examples/Kyber.Examples.Generators/Game.cs +++ b/Ion.Examples/Ion.Examples.Generators/Game.cs @@ -1,4 +1,4 @@ -namespace Kyber.Examples.Generators; +namespace Ion.Examples.Generators; [System] [System] diff --git a/Ion.Examples/Ion.Examples.Generators/Ion.Examples.Generators.csproj b/Ion.Examples/Ion.Examples.Generators/Ion.Examples.Generators.csproj new file mode 100644 index 0000000..1de44cb --- /dev/null +++ b/Ion.Examples/Ion.Examples.Generators/Ion.Examples.Generators.csproj @@ -0,0 +1,21 @@ + + + + Exe + net7.0 + enable + enable + preview + true + $(BaseIntermediateOutputPath)Generated + true + Debug;Release;DebugGenerators + + + + + + + + + diff --git a/Kyber.Examples/Kyber.Examples.Generators/Program.cs b/Ion.Examples/Ion.Examples.Generators/Program.cs similarity index 60% rename from Kyber.Examples/Kyber.Examples.Generators/Program.cs rename to Ion.Examples/Ion.Examples.Generators/Program.cs index ba89791..8d7b7a0 100644 --- a/Kyber.Examples/Kyber.Examples.Generators/Program.cs +++ b/Ion.Examples/Ion.Examples.Generators/Program.cs @@ -1,14 +1,14 @@ global using Microsoft.Extensions.Logging; -global using Kyber; +global using Ion; -using Kyber.Hosting; +using Ion.Hosting; -using Kyber.Examples.Generators; +using Ion.Examples.Generators; -var gameHost = KyberHost.CreateDefaultBuilder() - .ConfigureKyber(static (game) => +var gameHost = IonHost.CreateDefaultBuilder() + .ConfigureIon(static (game) => { - game.Config.Title = "Kyber Veldrid Example"; + game.Config.Title = "Ion Veldrid Example"; game.Config.WindowWidth = 900; game.Config.WindowHeight = 900; game.Config.VSync = false; diff --git a/Kyber.Examples/Kyber.Examples.Generators/QuadRendererSystem.cs b/Ion.Examples/Ion.Examples.Generators/QuadRendererSystem.cs similarity index 98% rename from Kyber.Examples/Kyber.Examples.Generators/QuadRendererSystem.cs rename to Ion.Examples/Ion.Examples.Generators/QuadRendererSystem.cs index 4de9e1e..3473877 100644 --- a/Kyber.Examples/Kyber.Examples.Generators/QuadRendererSystem.cs +++ b/Ion.Examples/Ion.Examples.Generators/QuadRendererSystem.cs @@ -1,12 +1,12 @@ using System.Numerics; using System.Text; -using Kyber.Graphics; +using Ion.Graphics; using Veldrid; using Veldrid.SPIRV; -namespace Kyber.Examples.Generators; +namespace Ion.Examples.Generators; public class QuadRendererSystem : IInitializeSystem, IRenderSystem, IDisposable { diff --git a/Kyber.Examples/Kyber.Examples.Generators/TestLoggerSystem.cs b/Ion.Examples/Ion.Examples.Generators/TestLoggerSystem.cs similarity index 98% rename from Kyber.Examples/Kyber.Examples.Generators/TestLoggerSystem.cs rename to Ion.Examples/Ion.Examples.Generators/TestLoggerSystem.cs index 5d5e6c4..03f743f 100644 --- a/Kyber.Examples/Kyber.Examples.Generators/TestLoggerSystem.cs +++ b/Ion.Examples/Ion.Examples.Generators/TestLoggerSystem.cs @@ -1,4 +1,4 @@ -namespace Kyber.Examples.Generators; +namespace Ion.Examples.Generators; public class TestLoggerSystem : IInitializeSystem, IDestroySystem, IUpdateSystem { diff --git a/Kyber.Examples/Kyber.Examples.Scenes/Kyber.Examples.Scenes.csproj b/Ion.Examples/Ion.Examples.Scenes/Ion.Examples.Scenes.csproj similarity index 75% rename from Kyber.Examples/Kyber.Examples.Scenes/Kyber.Examples.Scenes.csproj rename to Ion.Examples/Ion.Examples.Scenes/Ion.Examples.Scenes.csproj index 77f4e0b..915d598 100644 --- a/Kyber.Examples/Kyber.Examples.Scenes/Kyber.Examples.Scenes.csproj +++ b/Ion.Examples/Ion.Examples.Scenes/Ion.Examples.Scenes.csproj @@ -19,8 +19,9 @@ - - + + + diff --git a/Kyber.Examples/Kyber.Examples.Scenes/Program.cs b/Ion.Examples/Ion.Examples.Scenes/Program.cs similarity index 95% rename from Kyber.Examples/Kyber.Examples.Scenes/Program.cs rename to Ion.Examples/Ion.Examples.Scenes/Program.cs index f81beae..c18fd1f 100644 --- a/Kyber.Examples/Kyber.Examples.Scenes/Program.cs +++ b/Ion.Examples/Ion.Examples.Scenes/Program.cs @@ -3,13 +3,13 @@ using Microsoft.Extensions.DependencyInjection; -using Kyber; -using Kyber.Extensions.Debug; -using Kyber.Extensions.Graphics; -using Kyber.Extensions.Scenes; -using Kyber.Extensions.Coroutines; +using Ion; +using Ion.Extensions.Debug; +using Ion.Extensions.Graphics; +using Ion.Extensions.Scenes; +using Ion.Extensions.Coroutines; -var builder = KyberApplication.CreateBuilder(args); +var builder = IonApplication.CreateBuilder(args); builder.Services.AddDebugUtils(builder.Configuration); builder.Services.AddVeldridGraphics(builder.Configuration, graphics => diff --git a/Kyber.Examples/Kyber.Examples.Veldrid/Properties/launchSettings.json b/Ion.Examples/Ion.Examples.Scenes/Properties/launchSettings.json similarity index 57% rename from Kyber.Examples/Kyber.Examples.Veldrid/Properties/launchSettings.json rename to Ion.Examples/Ion.Examples.Scenes/Properties/launchSettings.json index f29abb8..266f9d0 100644 --- a/Kyber.Examples/Kyber.Examples.Veldrid/Properties/launchSettings.json +++ b/Ion.Examples/Ion.Examples.Scenes/Properties/launchSettings.json @@ -1,9 +1,9 @@ { "profiles": { - "Kyber.Examples.Veldrid": { + "Ion.Examples.Scenes": { "commandName": "Project", "environmentVariables": { - "Logging__LogLevel__Kyber": "Debug" + "Logging__LogLevel__Ion": "Debug" } } } diff --git a/Kyber.Examples/Kyber.Examples.Scenes/appsettings.json b/Ion.Examples/Ion.Examples.Scenes/appsettings.json similarity index 65% rename from Kyber.Examples/Kyber.Examples.Scenes/appsettings.json rename to Ion.Examples/Ion.Examples.Scenes/appsettings.json index 31127e9..f5264e2 100644 --- a/Kyber.Examples/Kyber.Examples.Scenes/appsettings.json +++ b/Ion.Examples/Ion.Examples.Scenes/appsettings.json @@ -2,14 +2,14 @@ "Logging": { "LogLevel": { // All providers, LogLevel applies to all the enabled providers. "Default": "Debug", - "Kyber": "Debug" + "Ion": "Debug" } }, - "Kyber": { - "Title": "Kyber Scene Example", + "Ion": { + "Title": "Ion Scene Example", "MaxFPS": 500, "Debug": { - "TraceEnabled": true + "TraceEnabled": true } } } \ No newline at end of file diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/Kyber.Examples.SpriteRenderer.csproj b/Ion.Examples/Ion.Examples.SpriteRenderer/Ion.Examples.SpriteRenderer.csproj similarity index 89% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/Kyber.Examples.SpriteRenderer.csproj rename to Ion.Examples/Ion.Examples.SpriteRenderer/Ion.Examples.SpriteRenderer.csproj index c87e04a..ecbd5e6 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/Kyber.Examples.SpriteRenderer.csproj +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/Ion.Examples.SpriteRenderer.csproj @@ -19,7 +19,8 @@ - + + diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/Program.cs b/Ion.Examples/Ion.Examples.SpriteRenderer/Program.cs similarity index 72% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/Program.cs rename to Ion.Examples/Ion.Examples.SpriteRenderer/Program.cs index 5f71584..843280f 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/Program.cs +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/Program.cs @@ -1,15 +1,15 @@ global using System.Numerics; global using Microsoft.Extensions.Logging; -global using Kyber; +global using Ion; -using Kyber.Hosting; -using Kyber.Examples.SpriteRenderer; +using Ion.Hosting; +using Ion.Examples.SpriteRenderer; -var gameHost = KyberHost.CreateDefaultBuilder() - .ConfigureKyber(static (game) => +var gameHost = IonHost.CreateDefaultBuilder() + .ConfigureIon(static (game) => { - game.Config.Title = "Kyber SpriteRenderer Example"; + game.Config.Title = "Ion SpriteRenderer Example"; game.Config.WindowWidth = 1920; game.Config.WindowHeight = 1080; //game.Config.PreferredBackend = Veldrid.GraphicsBackend.Vulkan; diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/Properties/launchSettings.json b/Ion.Examples/Ion.Examples.SpriteRenderer/Properties/launchSettings.json similarity index 54% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/Properties/launchSettings.json rename to Ion.Examples/Ion.Examples.SpriteRenderer/Properties/launchSettings.json index 8ddb717..3905821 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/Properties/launchSettings.json +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/Properties/launchSettings.json @@ -1,9 +1,9 @@ { "profiles": { - "Kyber.Examples.SpriteRenderer": { + "Ion.Examples.SpriteRenderer": { "commandName": "Project", "environmentVariables": { - "Logging__LogLevel__Kyber": "Debug" + "Logging__LogLevel__Ion": "Debug" } } } diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/RenderDoc.cap b/Ion.Examples/Ion.Examples.SpriteRenderer/RenderDoc.cap similarity index 82% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/RenderDoc.cap rename to Ion.Examples/Ion.Examples.SpriteRenderer/RenderDoc.cap index 60a40a8..62ebb6e 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/RenderDoc.cap +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/RenderDoc.cap @@ -5,7 +5,7 @@ "commandLine": "", "environment": [ ], - "executable": "C:\\Projects\\Kyber\\Kyber.Examples\\Kyber.Examples.SpriteRenderer\\bin\\Release\\net6.0\\Kyber.Examples.SpriteRenderer.exe", + "executable": "C:\\Projects\\Ion\\Ion.Examples\\Ion.Examples.SpriteRenderer\\bin\\Release\\net6.0\\Ion.Examples.SpriteRenderer.exe", "inject": false, "numQueuedFrames": 0, "options": { diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/TestLoggerSystem.cs b/Ion.Examples/Ion.Examples.SpriteRenderer/TestLoggerSystem.cs similarity index 98% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/TestLoggerSystem.cs rename to Ion.Examples/Ion.Examples.SpriteRenderer/TestLoggerSystem.cs index 5f6b46f..2151429 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/TestLoggerSystem.cs +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/TestLoggerSystem.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace Kyber.Examples.SpriteRenderer; +namespace Ion.Examples.SpriteRenderer; public class TestLoggerSystem : IInitializeSystem, IDestroySystem, IUpdateSystem { diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/TestSpriteRendererSystem.cs b/Ion.Examples/Ion.Examples.SpriteRenderer/TestSpriteRendererSystem.cs similarity index 97% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/TestSpriteRendererSystem.cs rename to Ion.Examples/Ion.Examples.SpriteRenderer/TestSpriteRendererSystem.cs index 9181076..8bf1d6b 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/TestSpriteRendererSystem.cs +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/TestSpriteRendererSystem.cs @@ -1,10 +1,10 @@ using Arch.Core; -using Kyber.Assets; -using Kyber.Graphics; -using Kyber.Utils; +using Ion.Assets; +using Ion.Graphics; +using Ion.Utils; -namespace Kyber.Examples.SpriteRenderer; +namespace Ion.Examples.SpriteRenderer; struct HueComponent { diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/UserInputSystem.cs b/Ion.Examples/Ion.Examples.SpriteRenderer/UserInputSystem.cs similarity index 91% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/UserInputSystem.cs rename to Ion.Examples/Ion.Examples.SpriteRenderer/UserInputSystem.cs index 0880289..596e1fb 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/UserInputSystem.cs +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/UserInputSystem.cs @@ -1,4 +1,4 @@ -namespace Kyber.Examples.SpriteRenderer; +namespace Ion.Examples.SpriteRenderer; public class UserInputSystem : IUpdateSystem { diff --git a/Kyber.Examples/Kyber.Examples.SpriteRenderer/appsettings.json b/Ion.Examples/Ion.Examples.SpriteRenderer/appsettings.json similarity index 85% rename from Kyber.Examples/Kyber.Examples.SpriteRenderer/appsettings.json rename to Ion.Examples/Ion.Examples.SpriteRenderer/appsettings.json index f3d1312..3402d40 100644 --- a/Kyber.Examples/Kyber.Examples.SpriteRenderer/appsettings.json +++ b/Ion.Examples/Ion.Examples.SpriteRenderer/appsettings.json @@ -2,7 +2,7 @@ "Logging": { "LogLevel": { // All providers, LogLevel applies to all the enabled providers. "Default": "Debug", - "Kyber": "Debug" + "Ion": "Debug" } } } \ No newline at end of file diff --git a/Kyber.Examples/Kyber.Examples.Veldrid/Kyber.Examples.Veldrid.csproj b/Ion.Examples/Ion.Examples.Veldrid/Ion.Examples.Veldrid.csproj similarity index 90% rename from Kyber.Examples/Kyber.Examples.Veldrid/Kyber.Examples.Veldrid.csproj rename to Ion.Examples/Ion.Examples.Veldrid/Ion.Examples.Veldrid.csproj index 19b8903..303e2d5 100644 --- a/Kyber.Examples/Kyber.Examples.Veldrid/Kyber.Examples.Veldrid.csproj +++ b/Ion.Examples/Ion.Examples.Veldrid/Ion.Examples.Veldrid.csproj @@ -23,7 +23,8 @@ - + + diff --git a/Kyber.Examples/Kyber.Examples.Veldrid/Program.cs b/Ion.Examples/Ion.Examples.Veldrid/Program.cs similarity index 63% rename from Kyber.Examples/Kyber.Examples.Veldrid/Program.cs rename to Ion.Examples/Ion.Examples.Veldrid/Program.cs index 9f00159..0173b94 100644 --- a/Kyber.Examples/Kyber.Examples.Veldrid/Program.cs +++ b/Ion.Examples/Ion.Examples.Veldrid/Program.cs @@ -1,14 +1,14 @@ global using Microsoft.Extensions.Logging; -global using Kyber; +global using Ion; -using Kyber.Hosting; +using Ion.Hosting; -using Kyber.Examples.Veldrid; +using Ion.Examples.Veldrid; -var gameHost = KyberHost.CreateDefaultBuilder() - .ConfigureKyber(static (game) => +var gameHost = IonHost.CreateDefaultBuilder() + .ConfigureIon(static (game) => { - game.Config.Title = "Kyber Veldrid Example"; + game.Config.Title = "Ion Veldrid Example"; game.Config.WindowWidth = 900; game.Config.WindowHeight = 900; game.Config.VSync = false; diff --git a/Kyber.Examples/Kyber.Examples.Breakout/Properties/launchSettings.json b/Ion.Examples/Ion.Examples.Veldrid/Properties/launchSettings.json similarity index 56% rename from Kyber.Examples/Kyber.Examples.Breakout/Properties/launchSettings.json rename to Ion.Examples/Ion.Examples.Veldrid/Properties/launchSettings.json index ea96710..3333af2 100644 --- a/Kyber.Examples/Kyber.Examples.Breakout/Properties/launchSettings.json +++ b/Ion.Examples/Ion.Examples.Veldrid/Properties/launchSettings.json @@ -1,9 +1,9 @@ { "profiles": { - "Kyber.Examples.Breakout": { + "Ion.Examples.Veldrid": { "commandName": "Project", "environmentVariables": { - "Logging__LogLevel__Kyber": "Debug" + "Logging__LogLevel__Ion": "Debug" } } } diff --git a/Kyber.Examples/Kyber.Examples.Veldrid/QuadRendererSystem.cs b/Ion.Examples/Ion.Examples.Veldrid/QuadRendererSystem.cs similarity index 98% rename from Kyber.Examples/Kyber.Examples.Veldrid/QuadRendererSystem.cs rename to Ion.Examples/Ion.Examples.Veldrid/QuadRendererSystem.cs index 415f1c7..aea53b2 100644 --- a/Kyber.Examples/Kyber.Examples.Veldrid/QuadRendererSystem.cs +++ b/Ion.Examples/Ion.Examples.Veldrid/QuadRendererSystem.cs @@ -1,12 +1,12 @@ using System.Numerics; using System.Text; -using Kyber.Graphics; +using Ion.Graphics; using Veldrid; using Veldrid.SPIRV; -namespace Kyber.Examples.Veldrid; +namespace Ion.Examples.Veldrid; public class QuadRendererSystem : IInitializeSystem, IRenderSystem, IDisposable { diff --git a/Kyber.Examples/Kyber.Examples.Veldrid/TestLoggerSystem.cs b/Ion.Examples/Ion.Examples.Veldrid/TestLoggerSystem.cs similarity index 98% rename from Kyber.Examples/Kyber.Examples.Veldrid/TestLoggerSystem.cs rename to Ion.Examples/Ion.Examples.Veldrid/TestLoggerSystem.cs index c496380..264373e 100644 --- a/Kyber.Examples/Kyber.Examples.Veldrid/TestLoggerSystem.cs +++ b/Ion.Examples/Ion.Examples.Veldrid/TestLoggerSystem.cs @@ -1,4 +1,4 @@ -namespace Kyber.Examples.Veldrid; +namespace Ion.Examples.Veldrid; public class TestLoggerSystem : IInitializeSystem, IDestroySystem, IUpdateSystem { diff --git a/Kyber.Examples/Kyber.Examples.Veldrid/UserInputSystem.cs b/Ion.Examples/Ion.Examples.Veldrid/UserInputSystem.cs similarity index 92% rename from Kyber.Examples/Kyber.Examples.Veldrid/UserInputSystem.cs rename to Ion.Examples/Ion.Examples.Veldrid/UserInputSystem.cs index 902c074..2963588 100644 --- a/Kyber.Examples/Kyber.Examples.Veldrid/UserInputSystem.cs +++ b/Ion.Examples/Ion.Examples.Veldrid/UserInputSystem.cs @@ -1,4 +1,4 @@ -namespace Kyber.Examples.Veldrid; +namespace Ion.Examples.Veldrid; public class UserInputSystem : IUpdateSystem { diff --git a/Kyber.Examples/Kyber.Examples.Veldrid/appsettings.json b/Ion.Examples/Ion.Examples.Veldrid/appsettings.json similarity index 85% rename from Kyber.Examples/Kyber.Examples.Veldrid/appsettings.json rename to Ion.Examples/Ion.Examples.Veldrid/appsettings.json index f3d1312..3402d40 100644 --- a/Kyber.Examples/Kyber.Examples.Veldrid/appsettings.json +++ b/Ion.Examples/Ion.Examples.Veldrid/appsettings.json @@ -2,7 +2,7 @@ "Logging": { "LogLevel": { // All providers, LogLevel applies to all the enabled providers. "Default": "Debug", - "Kyber": "Debug" + "Ion": "Debug" } } } \ No newline at end of file diff --git a/Kyber.lutconfig b/Ion.lutconfig similarity index 100% rename from Kyber.lutconfig rename to Ion.lutconfig diff --git a/Kyber.sln b/Ion.sln similarity index 76% rename from Kyber.sln rename to Ion.sln index a5ccf86..c416e74 100644 --- a/Kyber.sln +++ b/Ion.sln @@ -22,47 +22,47 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{ .github\workflows\create-release.yml = .github\workflows\create-release.yml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kyber", "Kyber", "{A38C6AA1-BA6E-4DBC-BC7C-F0BD034224CE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ion", "Ion", "{A38C6AA1-BA6E-4DBC-BC7C-F0BD034224CE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kyber.Examples", "Kyber.Examples", "{8FBD5536-6567-4933-BD14-4A1575F4EE43}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ion.Examples", "Ion.Examples", "{8FBD5536-6567-4933-BD14-4A1575F4EE43}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Examples.Scenes", "Kyber.Examples\Kyber.Examples.Scenes\Kyber.Examples.Scenes.csproj", "{94ACED8A-3370-48F3-A749-68C81FDDE652}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Examples.Scenes", "Ion.Examples\Ion.Examples.Scenes\Ion.Examples.Scenes.csproj", "{94ACED8A-3370-48F3-A749-68C81FDDE652}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Core", "Kyber\Kyber.Core\Kyber.Core.csproj", "{FF7891A1-606D-413D-B9F2-918D2DB5F266}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Core", "Ion\Ion.Core\Ion.Core.csproj", "{FF7891A1-606D-413D-B9F2-918D2DB5F266}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Core.Abstractions", "Kyber\Kyber.Core.Abstractions\Kyber.Core.Abstractions.csproj", "{74342FF5-BD87-4F81-A783-1A13ADE5F052}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Core.Abstractions", "Ion\Ion.Core.Abstractions\Ion.Core.Abstractions.csproj", "{74342FF5-BD87-4F81-A783-1A13ADE5F052}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber", "Kyber\Kyber\Kyber.csproj", "{B6044750-A205-4D10-AD02-02707AE9FC0A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion", "Ion\Ion\Ion.csproj", "{B6044750-A205-4D10-AD02-02707AE9FC0A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Scenes", "Kyber\Kyber.Extensions.Scenes\Kyber.Extensions.Scenes.csproj", "{700C404D-596B-4F79-9E4A-1B49355059D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Scenes", "Ion\Ion.Extensions.Scenes\Ion.Extensions.Scenes.csproj", "{700C404D-596B-4F79-9E4A-1B49355059D5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Scenes.Abstractions", "Kyber\Kyber.Extensions.Scenes.Abstractions\Kyber.Extensions.Scenes.Abstractions.csproj", "{59A49B7B-62B2-4343-838E-AE7E883BDB52}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Scenes.Abstractions", "Ion\Ion.Extensions.Scenes.Abstractions\Ion.Extensions.Scenes.Abstractions.csproj", "{59A49B7B-62B2-4343-838E-AE7E883BDB52}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Graphics.Abstractions", "Kyber\Kyber.Extensions.Graphics.Abstractions\Kyber.Extensions.Graphics.Abstractions.csproj", "{BC64E83E-4034-407F-810C-671EC13AD1D7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Graphics.Abstractions", "Ion\Ion.Extensions.Graphics.Abstractions\Ion.Extensions.Graphics.Abstractions.csproj", "{BC64E83E-4034-407F-810C-671EC13AD1D7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Debug", "Kyber\Kyber.Extensions.Debug\Kyber.Extensions.Debug.csproj", "{C6AE892E-ED53-4CF9-B3D4-5F904E6E352D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Debug", "Ion\Ion.Extensions.Debug\Ion.Extensions.Debug.csproj", "{C6AE892E-ED53-4CF9-B3D4-5F904E6E352D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Graphics.Veldrid", "Kyber\Kyber.Extensions.Graphics.Veldrid\Kyber.Extensions.Graphics.Veldrid.csproj", "{B3B07001-6598-48DF-8320-C65870A9E0F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Graphics.Veldrid", "Ion\Ion.Extensions.Graphics.Veldrid\Ion.Extensions.Graphics.Veldrid.csproj", "{B3B07001-6598-48DF-8320-C65870A9E0F5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Core.InternalGenerators", "Kyber\Kyber.Core.InternalGenerators\Kyber.Core.InternalGenerators.csproj", "{DFD31B44-8064-4143-9B38-572729A89071}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Core.InternalGenerators", "Ion\Ion.Core.InternalGenerators\Ion.Core.InternalGenerators.csproj", "{DFD31B44-8064-4143-9B38-572729A89071}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Scenes.InternalGenerators", "Kyber\Kyber.Extensions.Scenes.InternalGenerators\Kyber.Extensions.Scenes.InternalGenerators.csproj", "{0B90C501-3304-40D0-B099-CF89A6DF37E0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Scenes.InternalGenerators", "Ion\Ion.Extensions.Scenes.InternalGenerators\Ion.Extensions.Scenes.InternalGenerators.csproj", "{0B90C501-3304-40D0-B099-CF89A6DF37E0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Debug.Abstractions", "Kyber\Kyber.Extensions.Debug.Abstractions\Kyber.Extensions.Debug.Abstractions.csproj", "{4E7E36EE-B7D7-41FE-9E0F-4FF52A18207A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Debug.Abstractions", "Ion\Ion.Extensions.Debug.Abstractions\Ion.Extensions.Debug.Abstractions.csproj", "{4E7E36EE-B7D7-41FE-9E0F-4FF52A18207A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Coroutines", "Kyber\Kyber.Extensions.Coroutines\Kyber.Extensions.Coroutines.csproj", "{5C41D010-5952-4155-B2C4-B85FA220B62E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Coroutines", "Ion\Ion.Extensions.Coroutines\Ion.Extensions.Coroutines.csproj", "{5C41D010-5952-4155-B2C4-B85FA220B62E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Coroutines.Abstractions", "Kyber\Kyber.Extensions.Coroutines.Abstractions\Kyber.Extensions.Coroutines.Abstractions.csproj", "{270CA94E-3C14-42BE-AEBB-58C236C39E15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Coroutines.Abstractions", "Ion\Ion.Extensions.Coroutines.Abstractions\Ion.Extensions.Coroutines.Abstractions.csproj", "{270CA94E-3C14-42BE-AEBB-58C236C39E15}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Core.Tests", "Kyber\Kyber.Core.Tests\Kyber.Core.Tests.csproj", "{7E6D0EA0-9329-42D7-8B50-F6FB43241E99}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Core.Tests", "Ion\Ion.Core.Tests\Ion.Core.Tests.csproj", "{7E6D0EA0-9329-42D7-8B50-F6FB43241E99}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Scenes.Tests", "Kyber\Kyber.Extensions.Scenes.Tests\Kyber.Extensions.Scenes.Tests.csproj", "{B37F3A4D-9F4A-4CCD-8408-4B1BFF40DE96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Scenes.Tests", "Ion\Ion.Extensions.Scenes.Tests\Ion.Extensions.Scenes.Tests.csproj", "{B37F3A4D-9F4A-4CCD-8408-4B1BFF40DE96}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Graphics.Null", "Kyber\Kyber.Extensions.Graphics.Null\Kyber.Extensions.Graphics.Null.csproj", "{DB97F94C-5366-4591-9AC3-CAF5C60EEA75}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Graphics.Null", "Ion\Ion.Extensions.Graphics.Null\Ion.Extensions.Graphics.Null.csproj", "{DB97F94C-5366-4591-9AC3-CAF5C60EEA75}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Extensions.Coroutines.Generators", "Kyber\Kyber.Extensions.Coroutines.Generators\Kyber.Extensions.Coroutines.Generators.csproj", "{3FF057BB-9D7B-4CA4-A0E4-E5430DBA5C92}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Extensions.Coroutines.Generators", "Ion\Ion.Extensions.Coroutines.Generators\Ion.Extensions.Coroutines.Generators.csproj", "{3FF057BB-9D7B-4CA4-A0E4-E5430DBA5C92}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kyber.Examples.Breakout", "Kyber.Examples\Kyber.Examples.Breakout\Kyber.Examples.Breakout.csproj", "{37A9A838-82CF-45A8-B5C6-28742BBAB223}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ion.Examples.Breakout", "Ion.Examples\Ion.Examples.Breakout\Ion.Examples.Breakout.csproj", "{37A9A838-82CF-45A8-B5C6-28742BBAB223}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Kyber/Kyber.Core.Abstractions.Tests/EventTests.cs b/Ion/Ion.Core.Abstractions.Tests/EventTests.cs similarity index 99% rename from Kyber/Kyber.Core.Abstractions.Tests/EventTests.cs rename to Ion/Ion.Core.Abstractions.Tests/EventTests.cs index ceca679..5b58295 100644 --- a/Kyber/Kyber.Core.Abstractions.Tests/EventTests.cs +++ b/Ion/Ion.Core.Abstractions.Tests/EventTests.cs @@ -1,4 +1,4 @@ -namespace Kyber.Core.Tests; +namespace Ion.Core.Tests; public record struct DatalessEvent(); public record struct DatafullEvent(int A, int B); diff --git a/Kyber/Kyber.Core.Abstractions.Tests/Kyber.Core.Tests.csproj b/Ion/Ion.Core.Abstractions.Tests/Ion.Core.Tests.csproj similarity index 86% rename from Kyber/Kyber.Core.Abstractions.Tests/Kyber.Core.Tests.csproj rename to Ion/Ion.Core.Abstractions.Tests/Ion.Core.Tests.csproj index 182b1ad..dd4e3f1 100644 --- a/Kyber/Kyber.Core.Abstractions.Tests/Kyber.Core.Tests.csproj +++ b/Ion/Ion.Core.Abstractions.Tests/Ion.Core.Tests.csproj @@ -11,7 +11,8 @@ - + + @@ -28,7 +29,8 @@ - + + diff --git a/Ion/Ion.Core.Abstractions.Tests/Usings.cs b/Ion/Ion.Core.Abstractions.Tests/Usings.cs new file mode 100644 index 0000000..1fa5876 --- /dev/null +++ b/Ion/Ion.Core.Abstractions.Tests/Usings.cs @@ -0,0 +1,3 @@ +global using Xunit; + +global using static Ion.Tests.TestConstants; \ No newline at end of file diff --git a/Kyber/Kyber.Core.Abstractions/BinaryExtensions.cs b/Ion/Ion.Core.Abstractions/BinaryExtensions.cs similarity index 100% rename from Kyber/Kyber.Core.Abstractions/BinaryExtensions.cs rename to Ion/Ion.Core.Abstractions/BinaryExtensions.cs diff --git a/Kyber/Kyber.Core.Abstractions/Builder/IKyberApplication.cs b/Ion/Ion.Core.Abstractions/Builder/IIonApplication.cs similarity index 58% rename from Kyber/Kyber.Core.Abstractions/Builder/IKyberApplication.cs rename to Ion/Ion.Core.Abstractions/Builder/IIonApplication.cs index 062afb8..ffc5382 100644 --- a/Kyber/Kyber.Core.Abstractions/Builder/IKyberApplication.cs +++ b/Ion/Ion.Core.Abstractions/Builder/IIonApplication.cs @@ -1,11 +1,11 @@ using Microsoft.Extensions.Configuration; -namespace Kyber; +namespace Ion; /// /// The game application used to build the game loop. /// -public interface IKyberApplication +public interface IIonApplication { /// /// The application's configured . @@ -21,44 +21,44 @@ public interface IKyberApplication /// Adds the specified middleware to the application's Init pipeline. /// /// The game loop middleware function. - /// The instance to chain `Use` calls. - IKyberApplication UseInit(Func middleware); + /// The instance to chain `Use` calls. + IIonApplication UseInit(Func middleware); /// /// Adds the specified middleware to the application's First pipeline. /// /// The game loop middleware function. - /// The instance to chain `Use` calls. - IKyberApplication UseFirst(Func middleware); + /// The instance to chain `Use` calls. + IIonApplication UseFirst(Func middleware); /// /// Adds the specified middleware to the application's FixedUpdate pipeline. /// /// The game loop middleware function. - /// The instance to chain `Use` calls. - IKyberApplication UseFixedUpdate(Func middleware); + /// The instance to chain `Use` calls. + IIonApplication UseFixedUpdate(Func middleware); /// /// Adds the specified middleware to the application's Update pipeline. /// /// The game loop middleware function. - /// The instance to chain `Use` calls. - IKyberApplication UseUpdate(Func middleware); + /// The instance to chain `Use` calls. + IIonApplication UseUpdate(Func middleware); /// /// Adds the specified middleware to the application's Render pipeline. /// /// The game loop middleware function. - /// The instance to chain `Use` calls. - IKyberApplication UseRender(Func middleware); + /// The instance to chain `Use` calls. + IIonApplication UseRender(Func middleware); /// /// Adds the specified middleware to the application's Last pipeline. /// /// The game loop middleware function. - /// The instance to chain `Use` calls. - IKyberApplication UseLast(Func middleware); + /// The instance to chain `Use` calls. + IIonApplication UseLast(Func middleware); /// /// Adds the specified middleware to the application's Destroy pipeline. /// /// The game loop middleware function. - /// The instance to chain `Use` calls. - IKyberApplication UseDestroy(Func middleware); + /// The instance to chain `Use` calls. + IIonApplication UseDestroy(Func middleware); /// /// Builds and runs the game. diff --git a/Kyber/Kyber.Core.Abstractions/Builder/IKyberApplicationBuilder.cs b/Ion/Ion.Core.Abstractions/Builder/IIonApplicationBuilder.cs similarity index 75% rename from Kyber/Kyber.Core.Abstractions/Builder/IKyberApplicationBuilder.cs rename to Ion/Ion.Core.Abstractions/Builder/IIonApplicationBuilder.cs index 168dafd..a1286d6 100644 --- a/Kyber/Kyber.Core.Abstractions/Builder/IKyberApplicationBuilder.cs +++ b/Ion/Ion.Core.Abstractions/Builder/IIonApplicationBuilder.cs @@ -1,9 +1,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Configuration; -namespace Kyber; +namespace Ion; -public interface IKyberApplicationBuilder +public interface IIonApplicationBuilder { ConfigurationManager Configuration { get; } IServiceCollection Services { get; } diff --git a/Kyber/Kyber.Core.Abstractions/Builder/MiddlewarePipelineBuilder.cs b/Ion/Ion.Core.Abstractions/Builder/MiddlewarePipelineBuilder.cs similarity index 98% rename from Kyber/Kyber.Core.Abstractions/Builder/MiddlewarePipelineBuilder.cs rename to Ion/Ion.Core.Abstractions/Builder/MiddlewarePipelineBuilder.cs index ac808a4..4b8bc4c 100644 --- a/Kyber/Kyber.Core.Abstractions/Builder/MiddlewarePipelineBuilder.cs +++ b/Ion/Ion.Core.Abstractions/Builder/MiddlewarePipelineBuilder.cs @@ -1,5 +1,5 @@  -namespace Kyber; +namespace Ion; public interface IMiddlewarePipelineBuilder diff --git a/Kyber/Kyber.Core.Abstractions/Builder/SystemMiddlewareBinder.cs b/Ion/Ion.Core.Abstractions/Builder/SystemMiddlewareBinder.cs similarity index 99% rename from Kyber/Kyber.Core.Abstractions/Builder/SystemMiddlewareBinder.cs rename to Ion/Ion.Core.Abstractions/Builder/SystemMiddlewareBinder.cs index 16c517b..c59087d 100644 --- a/Kyber/Kyber.Core.Abstractions/Builder/SystemMiddlewareBinder.cs +++ b/Ion/Ion.Core.Abstractions/Builder/SystemMiddlewareBinder.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; using System.Reflection; -namespace Kyber; +namespace Ion; public static class SystemMiddlewareBinder { diff --git a/Kyber/Kyber.Core.Abstractions/Builder/UseSystemExtensions.cs b/Ion/Ion.Core.Abstractions/Builder/UseSystemExtensions.cs similarity index 84% rename from Kyber/Kyber.Core.Abstractions/Builder/UseSystemExtensions.cs rename to Ion/Ion.Core.Abstractions/Builder/UseSystemExtensions.cs index 9fc1404..9456165 100644 --- a/Kyber/Kyber.Core.Abstractions/Builder/UseSystemExtensions.cs +++ b/Ion/Ion.Core.Abstractions/Builder/UseSystemExtensions.cs @@ -1,7 +1,7 @@ using System.Reflection; using System.Diagnostics.CodeAnalysis; -namespace Kyber; +namespace Ion; public static class UseSystemExtensions { @@ -15,7 +15,7 @@ public static class UseSystemExtensions /// The instance. /// The arguments to pass to the middleware type instance's constructor. /// The instance. - public static IKyberApplication UseSystem(this IKyberApplication app, Type middlewareType) + public static IIonApplication UseSystem(this IIonApplication app, Type middlewareType) { return UseSystem(app, middlewareType, middlewareType); } @@ -27,12 +27,12 @@ public static IKyberApplication UseSystem(this IKyberApplication app, Type middl /// The instance. /// The arguments to pass to the middleware type instance's constructor. /// The instance. - public static IKyberApplication UseSystem<[DynamicallyAccessedMembers(MiddlewareAccessibility)] TMiddleware>(this IKyberApplication app) + public static IIonApplication UseSystem<[DynamicallyAccessedMembers(MiddlewareAccessibility)] TMiddleware>(this IIonApplication app) { return UseSystem(app, typeof(TMiddleware), typeof(TMiddleware)); } - public static IKyberApplication UseSystem(this IKyberApplication app) + public static IIonApplication UseSystem(this IIonApplication app) { return UseSystem(app, typeof(TService), typeof(TImplementation)); } @@ -44,7 +44,7 @@ public static IKyberApplication UseSystem(this IKyberApplication app, Type middl /// The middleware type. /// The arguments to pass to the middleware type instance's constructor. /// The instance. - public static IKyberApplication UseSystem(this IKyberApplication app, Type serviceType, [DynamicallyAccessedMembers(MiddlewareAccessibility)] Type implementationType) + public static IIonApplication UseSystem(this IIonApplication app, Type serviceType, [DynamicallyAccessedMembers(MiddlewareAccessibility)] Type implementationType) { var methods = implementationType.GetMethods(BindingFlags.Instance | BindingFlags.Public); diff --git a/Kyber/Kyber.Core.Abstractions/Events/IEvent.cs b/Ion/Ion.Core.Abstractions/Events/IEvent.cs similarity index 89% rename from Kyber/Kyber.Core.Abstractions/Events/IEvent.cs rename to Ion/Ion.Core.Abstractions/Events/IEvent.cs index 990b0c5..601d1d3 100644 --- a/Kyber/Kyber.Core.Abstractions/Events/IEvent.cs +++ b/Ion/Ion.Core.Abstractions/Events/IEvent.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IEvent { diff --git a/Kyber/Kyber.Core.Abstractions/Events/IEventEmitter.cs b/Ion/Ion.Core.Abstractions/Events/IEventEmitter.cs similarity index 87% rename from Kyber/Kyber.Core.Abstractions/Events/IEventEmitter.cs rename to Ion/Ion.Core.Abstractions/Events/IEventEmitter.cs index 97317ee..5954f1c 100644 --- a/Kyber/Kyber.Core.Abstractions/Events/IEventEmitter.cs +++ b/Ion/Ion.Core.Abstractions/Events/IEventEmitter.cs @@ -1,5 +1,5 @@  -namespace Kyber; +namespace Ion; public interface IEventEmitter { diff --git a/Kyber/Kyber.Core.Abstractions/Events/IEventListener.cs b/Ion/Ion.Core.Abstractions/Events/IEventListener.cs similarity index 95% rename from Kyber/Kyber.Core.Abstractions/Events/IEventListener.cs rename to Ion/Ion.Core.Abstractions/Events/IEventListener.cs index 1558a68..e7f23f0 100644 --- a/Kyber/Kyber.Core.Abstractions/Events/IEventListener.cs +++ b/Ion/Ion.Core.Abstractions/Events/IEventListener.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace Kyber; +namespace Ion; public interface IEventListener : IEventEmitter, IDisposable { diff --git a/Kyber/Kyber.Core.Abstractions/GameConfig.cs b/Ion/Ion.Core.Abstractions/GameConfig.cs similarity index 51% rename from Kyber/Kyber.Core.Abstractions/GameConfig.cs rename to Ion/Ion.Core.Abstractions/GameConfig.cs index eda0c40..e35fc50 100644 --- a/Kyber/Kyber.Core.Abstractions/GameConfig.cs +++ b/Ion/Ion.Core.Abstractions/GameConfig.cs @@ -1,8 +1,8 @@ -namespace Kyber; +namespace Ion; public class GameConfig { - public string Title { get; set; } = "Kyber"; + public string Title { get; set; } = "Ion"; public int MaxFPS { get; set; } = 300; } diff --git a/Kyber/Kyber.Core.Abstractions/GameEvents.cs b/Ion/Ion.Core.Abstractions/GameEvents.cs similarity index 93% rename from Kyber/Kyber.Core.Abstractions/GameEvents.cs rename to Ion/Ion.Core.Abstractions/GameEvents.cs index e336dd8..90e2170 100644 --- a/Kyber/Kyber.Core.Abstractions/GameEvents.cs +++ b/Ion/Ion.Core.Abstractions/GameEvents.cs @@ -1,5 +1,5 @@  -namespace Kyber; +namespace Ion; public record struct ExitGameEvent; public record struct WindowResizeEvent(uint Width, uint Height); diff --git a/Kyber/Kyber.Core.Abstractions/GameLoopDelegate.cs b/Ion/Ion.Core.Abstractions/GameLoopDelegate.cs similarity index 77% rename from Kyber/Kyber.Core.Abstractions/GameLoopDelegate.cs rename to Ion/Ion.Core.Abstractions/GameLoopDelegate.cs index a0f01b0..7f25acc 100644 --- a/Kyber/Kyber.Core.Abstractions/GameLoopDelegate.cs +++ b/Ion/Ion.Core.Abstractions/GameLoopDelegate.cs @@ -1,4 +1,4 @@  -namespace Kyber; +namespace Ion; public delegate void GameLoopDelegate(GameTime dt); diff --git a/Kyber/Kyber.Core.Abstractions/GameTime.cs b/Ion/Ion.Core.Abstractions/GameTime.cs similarity index 97% rename from Kyber/Kyber.Core.Abstractions/GameTime.cs rename to Ion/Ion.Core.Abstractions/GameTime.cs index 7cbd89d..6351f73 100644 --- a/Kyber/Kyber.Core.Abstractions/GameTime.cs +++ b/Ion/Ion.Core.Abstractions/GameTime.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public class GameTime { diff --git a/Kyber/Kyber.Core_old/Input/IInputState.cs b/Ion/Ion.Core.Abstractions/Input/IInputState.cs similarity index 96% rename from Kyber/Kyber.Core_old/Input/IInputState.cs rename to Ion/Ion.Core.Abstractions/Input/IInputState.cs index 05c73d1..117065e 100644 --- a/Kyber/Kyber.Core_old/Input/IInputState.cs +++ b/Ion/Ion.Core.Abstractions/Input/IInputState.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber; +namespace Ion; public interface IInputState { diff --git a/Kyber/Kyber.Core_old/Input/Key.cs b/Ion/Ion.Core.Abstractions/Input/Key.cs similarity index 99% rename from Kyber/Kyber.Core_old/Input/Key.cs rename to Ion/Ion.Core.Abstractions/Input/Key.cs index 9d9454a..35e6631 100644 --- a/Kyber/Kyber.Core_old/Input/Key.cs +++ b/Ion/Ion.Core.Abstractions/Input/Key.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public enum Key { diff --git a/Kyber/Kyber.Core_old/Input/MouseButton.cs b/Ion/Ion.Core.Abstractions/Input/MouseButton.cs similarity index 90% rename from Kyber/Kyber.Core_old/Input/MouseButton.cs rename to Ion/Ion.Core.Abstractions/Input/MouseButton.cs index 725e1ae..2231bf9 100644 --- a/Kyber/Kyber.Core_old/Input/MouseButton.cs +++ b/Ion/Ion.Core.Abstractions/Input/MouseButton.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public enum MouseButton { diff --git a/Kyber/Kyber.Core.Abstractions/Kyber.Core.Abstractions.csproj b/Ion/Ion.Core.Abstractions/Ion.Core.Abstractions.csproj similarity index 63% rename from Kyber/Kyber.Core.Abstractions/Kyber.Core.Abstractions.csproj rename to Ion/Ion.Core.Abstractions/Ion.Core.Abstractions.csproj index d464fbd..13c6c6b 100644 --- a/Kyber/Kyber.Core.Abstractions/Kyber.Core.Abstractions.csproj +++ b/Ion/Ion.Core.Abstractions/Ion.Core.Abstractions.csproj @@ -7,20 +7,22 @@ True - - - - - - + + + + + + + - + - + + diff --git a/Kyber/Kyber.Core.Abstractions/MathHelper.cs b/Ion/Ion.Core.Abstractions/MathHelper.cs similarity index 99% rename from Kyber/Kyber.Core.Abstractions/MathHelper.cs rename to Ion/Ion.Core.Abstractions/MathHelper.cs index d62a67a..c6771ef 100644 --- a/Kyber/Kyber.Core.Abstractions/MathHelper.cs +++ b/Ion/Ion.Core.Abstractions/MathHelper.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; /// /// Contains commonly used precalculated values and mathematical operations. (Imported from XNA/MonoGame) diff --git a/Kyber/Kyber.Core.Abstractions/MemUtils.cs b/Ion/Ion.Core.Abstractions/MemUtils.cs similarity index 99% rename from Kyber/Kyber.Core.Abstractions/MemUtils.cs rename to Ion/Ion.Core.Abstractions/MemUtils.cs index 2baf4b9..82213ac 100644 --- a/Kyber/Kyber.Core.Abstractions/MemUtils.cs +++ b/Ion/Ion.Core.Abstractions/MemUtils.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; //namespace Ez.Memory -namespace Kyber; +namespace Ion; /// /// A static class with useful methods for memory manipulation operations. diff --git a/Kyber/Kyber.Core.Abstractions/MiddlewareAttributes.cs b/Ion/Ion.Core.Abstractions/MiddlewareAttributes.cs similarity index 97% rename from Kyber/Kyber.Core.Abstractions/MiddlewareAttributes.cs rename to Ion/Ion.Core.Abstractions/MiddlewareAttributes.cs index 8b70db0..c218b83 100644 --- a/Kyber/Kyber.Core.Abstractions/MiddlewareAttributes.cs +++ b/Ion/Ion.Core.Abstractions/MiddlewareAttributes.cs @@ -1,5 +1,5 @@  -namespace Kyber; +namespace Ion; [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] public class InitAttribute : Attribute { } [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] public class FirstAttribute : Attribute { } diff --git a/Kyber/Kyber.Core.Abstractions/Storage/IPersistentStorage.cs b/Ion/Ion.Core.Abstractions/Storage/IPersistentStorage.cs similarity index 91% rename from Kyber/Kyber.Core.Abstractions/Storage/IPersistentStorage.cs rename to Ion/Ion.Core.Abstractions/Storage/IPersistentStorage.cs index abcb441..17870a4 100644 --- a/Kyber/Kyber.Core.Abstractions/Storage/IPersistentStorage.cs +++ b/Ion/Ion.Core.Abstractions/Storage/IPersistentStorage.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IPersistentStorage { diff --git a/Kyber/Kyber.Core.Abstractions/Storage/IPersistentStorageProvider.cs b/Ion/Ion.Core.Abstractions/Storage/IPersistentStorageProvider.cs similarity index 95% rename from Kyber/Kyber.Core.Abstractions/Storage/IPersistentStorageProvider.cs rename to Ion/Ion.Core.Abstractions/Storage/IPersistentStorageProvider.cs index 4a91ca9..866a756 100644 --- a/Kyber/Kyber.Core.Abstractions/Storage/IPersistentStorageProvider.cs +++ b/Ion/Ion.Core.Abstractions/Storage/IPersistentStorageProvider.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IPersistentStorageProvider { diff --git a/Kyber/Kyber.Core.InternalGenerators/Kyber.Core.InternalGenerators.csproj b/Ion/Ion.Core.InternalGenerators/Ion.Core.InternalGenerators.csproj similarity index 100% rename from Kyber/Kyber.Core.InternalGenerators/Kyber.Core.InternalGenerators.csproj rename to Ion/Ion.Core.InternalGenerators/Ion.Core.InternalGenerators.csproj diff --git a/Kyber/Kyber.Core.InternalGenerators/UseDelegateServicesGenerator.cs b/Ion/Ion.Core.InternalGenerators/UseDelegateServicesGenerator.cs similarity index 86% rename from Kyber/Kyber.Core.InternalGenerators/UseDelegateServicesGenerator.cs rename to Ion/Ion.Core.InternalGenerators/UseDelegateServicesGenerator.cs index bd8f379..b98a522 100644 --- a/Kyber/Kyber.Core.InternalGenerators/UseDelegateServicesGenerator.cs +++ b/Ion/Ion.Core.InternalGenerators/UseDelegateServicesGenerator.cs @@ -3,7 +3,7 @@ using SourceGeneratorUtils; -namespace Kyber.Core.InternalGenerators; +namespace Ion.Core.InternalGenerators; [Generator] public class UseDelegateServicesGenerator : IIncrementalGenerator @@ -29,7 +29,7 @@ private static SourceText GetUseDelegateServiceExtensions() var source = new SourceWriter(); source.WriteLine("using Microsoft.Extensions.DependencyInjection;"); source.WriteEmptyLines(1); - source.WriteLine($"namespace Kyber;"); + source.WriteLine($"namespace Ion;"); source.WriteLine($"public static class UseDelegateServiceExtensions"); source.OpenBlock(); @@ -40,7 +40,7 @@ private static SourceText GetUseDelegateServiceExtensions() for (var svcCount = 1; svcCount <= MAX_SERVICES; svcCount++) { - source.WriteLine($"public static IKyberApplication Use{stage}<{_getGenericArgs(svcCount)}>(this IKyberApplication app, Func middleware) {_getGenericConstraints(svcCount)}"); + source.WriteLine($"public static IIonApplication Use{stage}<{_getGenericArgs(svcCount)}>(this IIonApplication app, Func middleware) {_getGenericConstraints(svcCount)}"); source.OpenBlock(); source.WriteLine($"return app.Use{stage}(next =>"); diff --git a/Kyber/Kyber.Core.Tests/BuilderTests.cs b/Ion/Ion.Core.Tests/BuilderTests.cs similarity index 75% rename from Kyber/Kyber.Core.Tests/BuilderTests.cs rename to Ion/Ion.Core.Tests/BuilderTests.cs index 0274766..da2ef9d 100644 --- a/Kyber/Kyber.Core.Tests/BuilderTests.cs +++ b/Ion/Ion.Core.Tests/BuilderTests.cs @@ -1,11 +1,11 @@ -namespace Kyber.Tests +namespace Ion.Tests { public class BuilderTests { [Fact, Trait(CATEGORY, UNIT)] public void CreateDefaultBuilder() { - var builder = KyberApplication.CreateBuilder(); + var builder = IonApplication.CreateBuilder(); Assert.NotNull(builder); var host = builder.Build(); Assert.NotNull(host); diff --git a/Kyber/Kyber.Core.Tests/GameTests.cs b/Ion/Ion.Core.Tests/GameTests.cs similarity index 98% rename from Kyber/Kyber.Core.Tests/GameTests.cs rename to Ion/Ion.Core.Tests/GameTests.cs index a3b33c5..a75ebd3 100644 --- a/Kyber/Kyber.Core.Tests/GameTests.cs +++ b/Ion/Ion.Core.Tests/GameTests.cs @@ -1,5 +1,5 @@  -namespace Kyber.Tests; +namespace Ion.Tests; public class GameTests { diff --git a/Kyber/Kyber.Core.Tests/Kyber.Core.Tests.csproj b/Ion/Ion.Core.Tests/Ion.Core.Tests.csproj similarity index 86% rename from Kyber/Kyber.Core.Tests/Kyber.Core.Tests.csproj rename to Ion/Ion.Core.Tests/Ion.Core.Tests.csproj index 469df5b..6e6165e 100644 --- a/Kyber/Kyber.Core.Tests/Kyber.Core.Tests.csproj +++ b/Ion/Ion.Core.Tests/Ion.Core.Tests.csproj @@ -25,8 +25,9 @@ - - + + + diff --git a/Kyber/Kyber.Core.Tests/TestConstants.cs b/Ion/Ion.Core.Tests/TestConstants.cs similarity index 89% rename from Kyber/Kyber.Core.Tests/TestConstants.cs rename to Ion/Ion.Core.Tests/TestConstants.cs index 82d56a7..f208f1d 100644 --- a/Kyber/Kyber.Core.Tests/TestConstants.cs +++ b/Ion/Ion.Core.Tests/TestConstants.cs @@ -1,4 +1,4 @@ -namespace Kyber.Tests; +namespace Ion.Tests; internal static class TestConstants { diff --git a/Kyber/Kyber.Core.Tests/TestUtils.cs b/Ion/Ion.Core.Tests/TestUtils.cs similarity index 88% rename from Kyber/Kyber.Core.Tests/TestUtils.cs rename to Ion/Ion.Core.Tests/TestUtils.cs index 728e3b2..2299c9c 100644 --- a/Kyber/Kyber.Core.Tests/TestUtils.cs +++ b/Ion/Ion.Core.Tests/TestUtils.cs @@ -1,11 +1,11 @@  -namespace Kyber.Tests; +namespace Ion.Tests; internal static class TestUtils { - public static IDisposable SetupWithSystems(out IServiceProvider services, out KyberApplication game, params Type[] systems) - { - var builder = KyberApplication.CreateBuilder(); + public static IDisposable SetupWithSystems(out IServiceProvider services, out IonApplication game, params Type[] systems) + { + var builder = IonApplication.CreateBuilder(); foreach (var system in systems) builder.Services.AddSingleton(system); diff --git a/Kyber/Kyber.Core.Tests/Usings.cs b/Ion/Ion.Core.Tests/Usings.cs similarity index 51% rename from Kyber/Kyber.Core.Tests/Usings.cs rename to Ion/Ion.Core.Tests/Usings.cs index 1ef6ec3..48c9197 100644 --- a/Kyber/Kyber.Core.Tests/Usings.cs +++ b/Ion/Ion.Core.Tests/Usings.cs @@ -3,5 +3,5 @@ global using Xunit; global using Moq; -global using static Kyber.Tests.TestUtils; -global using static Kyber.Tests.TestConstants; \ No newline at end of file +global using static Ion.Tests.TestUtils; +global using static Ion.Tests.TestConstants; \ No newline at end of file diff --git a/Kyber/Kyber.Core.Tests/rgbt_2x2.png b/Ion/Ion.Core.Tests/rgbt_2x2.png similarity index 100% rename from Kyber/Kyber.Core.Tests/rgbt_2x2.png rename to Ion/Ion.Core.Tests/rgbt_2x2.png diff --git a/Ion/Ion.Core/Builder/BuilderExtensions.cs b/Ion/Ion.Core/Builder/BuilderExtensions.cs new file mode 100644 index 0000000..6f4ad9c --- /dev/null +++ b/Ion/Ion.Core/Builder/BuilderExtensions.cs @@ -0,0 +1,14 @@ +namespace Ion; + +public static class BuilderExtensions +{ + /// + /// Adds the EventSystem to the application's middleware pipeline. + /// + /// The instance. + /// The instance. + public static IIonApplication UseEvents(this IIonApplication app) + { + return app.UseSystem(); + } +} diff --git a/Kyber/Kyber.Core/Builder/KyberApplication.cs b/Ion/Ion.Core/Builder/IonApplication.cs similarity index 71% rename from Kyber/Kyber.Core/Builder/KyberApplication.cs rename to Ion/Ion.Core/Builder/IonApplication.cs index cc033e0..203dfbb 100644 --- a/Kyber/Kyber.Core/Builder/KyberApplication.cs +++ b/Ion/Ion.Core/Builder/IonApplication.cs @@ -2,11 +2,11 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Kyber.Core; +using Ion.Core; -namespace Kyber; +namespace Ion; -public class KyberApplication : IKyberApplication, IDisposable +public class IonApplication : IIonApplication, IDisposable { private readonly IHost _host; @@ -28,59 +28,59 @@ public class KyberApplication : IKyberApplication, IDisposable /// public IConfiguration Configuration => _host.Services.GetRequiredService(); - internal KyberApplication(IHost host) + internal IonApplication(IHost host) { _host = host; } - public static KyberApplicationBuilder CreateBuilder(string[] args) + public static IonApplicationBuilder CreateBuilder(string[] args) { - return new KyberApplicationBuilder(args); + return new IonApplicationBuilder(args); } - public static KyberApplicationBuilder CreateBuilder() + public static IonApplicationBuilder CreateBuilder() { return CreateBuilder(Array.Empty()); } - public IKyberApplication UseInit(Func middleware) + public IIonApplication UseInit(Func middleware) { _init.Use(middleware); return this; } - public IKyberApplication UseFirst(Func middleware) + public IIonApplication UseFirst(Func middleware) { _first.Use(middleware); return this; } - public IKyberApplication UseFixedUpdate(Func middleware) + public IIonApplication UseFixedUpdate(Func middleware) { _fixedUpdate.Use(middleware); return this; } - public IKyberApplication UseUpdate(Func middleware) + public IIonApplication UseUpdate(Func middleware) { _update.Use(middleware); return this; } - public IKyberApplication UseRender(Func middleware) + public IIonApplication UseRender(Func middleware) { _render.Use(middleware); return this; } - public IKyberApplication UseLast(Func middleware) + public IIonApplication UseLast(Func middleware) { _last.Use(middleware); return this; } - public IKyberApplication UseDestroy(Func middleware) + public IIonApplication UseDestroy(Func middleware) { _destroy.Use(middleware); return this; diff --git a/Kyber/Kyber.Core/Builder/KyberApplicationBuilder.cs b/Ion/Ion.Core/Builder/IonApplicationBuilder.cs similarity index 73% rename from Kyber/Kyber.Core/Builder/KyberApplicationBuilder.cs rename to Ion/Ion.Core/Builder/IonApplicationBuilder.cs index edc4fc2..6bdd33a 100644 --- a/Kyber/Kyber.Core/Builder/KyberApplicationBuilder.cs +++ b/Ion/Ion.Core/Builder/IonApplicationBuilder.cs @@ -1,20 +1,20 @@ -using Kyber.Debug; -using Kyber.Extensions.Debug; +using Ion.Debug; +using Ion.Extensions.Debug; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace Kyber; +namespace Ion; -public class KyberApplicationBuilder : IKyberApplicationBuilder +public class IonApplicationBuilder : IIonApplicationBuilder { private HostApplicationBuilder _hostBuilder; public ConfigurationManager Configuration => _hostBuilder.Configuration; public IServiceCollection Services => _hostBuilder.Services; - internal KyberApplicationBuilder(string[] args) + internal IonApplicationBuilder(string[] args) { _hostBuilder = Host.CreateApplicationBuilder(args); @@ -29,8 +29,8 @@ internal KyberApplicationBuilder(string[] args) }) .AddDebug(); }); - - Services.Configure(Configuration.GetSection("Kyber")); + + Services.Configure(Configuration.GetSection("Ion")); Services.Add(ServiceDescriptor.Transient(typeof(ITraceTimer<>), typeof(NullTraceTimer<>))); Services.AddSingleton(); @@ -38,10 +38,10 @@ internal KyberApplicationBuilder(string[] args) Services.AddSingleton(); } - public KyberApplication Build() + public IonApplication Build() { var host = _hostBuilder.Build(); - var game = new KyberApplication(host); + var game = new IonApplication(host); return game; } diff --git a/Kyber/Kyber.Core/Debug/NullTraceTimer.cs b/Ion/Ion.Core/Debug/NullTraceTimer.cs similarity index 83% rename from Kyber/Kyber.Core/Debug/NullTraceTimer.cs rename to Ion/Ion.Core/Debug/NullTraceTimer.cs index bc8590e..b3c712c 100644 --- a/Kyber/Kyber.Core/Debug/NullTraceTimer.cs +++ b/Ion/Ion.Core/Debug/NullTraceTimer.cs @@ -1,6 +1,6 @@ -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber.Debug; +namespace Ion.Debug; internal class NullTraceTimer : ITraceTimer { diff --git a/Kyber/Kyber.Core/Events/Event.cs b/Ion/Ion.Core/Events/Event.cs similarity index 93% rename from Kyber/Kyber.Core/Events/Event.cs rename to Ion/Ion.Core/Events/Event.cs index 16341d0..a53e30a 100644 --- a/Kyber/Kyber.Core/Events/Event.cs +++ b/Ion/Ion.Core/Events/Event.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; internal record struct Event(uint Id, int EventType, T Data, bool Handled) : IEvent where T : unmanaged { diff --git a/Kyber/Kyber.Core/Events/EventEmitter.cs b/Ion/Ion.Core/Events/EventEmitter.cs similarity index 99% rename from Kyber/Kyber.Core/Events/EventEmitter.cs rename to Ion/Ion.Core/Events/EventEmitter.cs index e850b28..17d3fcf 100644 --- a/Kyber/Kyber.Core/Events/EventEmitter.cs +++ b/Ion/Ion.Core/Events/EventEmitter.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -namespace Kyber; +namespace Ion; public class EventEmitter : IEventEmitter { diff --git a/Kyber/Kyber.Core/Events/EventListener.cs b/Ion/Ion.Core/Events/EventListener.cs similarity index 99% rename from Kyber/Kyber.Core/Events/EventListener.cs rename to Ion/Ion.Core/Events/EventListener.cs index b8c2edb..a4891fa 100644 --- a/Kyber/Kyber.Core/Events/EventListener.cs +++ b/Ion/Ion.Core/Events/EventListener.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -namespace Kyber; +namespace Ion; public class EventListener : IEventListener { diff --git a/Kyber/Kyber.Core/Events/EventSystem.cs b/Ion/Ion.Core/Events/EventSystem.cs similarity index 89% rename from Kyber/Kyber.Core/Events/EventSystem.cs rename to Ion/Ion.Core/Events/EventSystem.cs index cc9b15a..baf58b4 100644 --- a/Kyber/Kyber.Core/Events/EventSystem.cs +++ b/Ion/Ion.Core/Events/EventSystem.cs @@ -1,6 +1,6 @@ -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber; +namespace Ion; internal class EventSystem { diff --git a/Kyber/Kyber.Core/GameLoop.cs b/Ion/Ion.Core/GameLoop.cs similarity index 98% rename from Kyber/Kyber.Core/GameLoop.cs rename to Ion/Ion.Core/GameLoop.cs index 4d3a498..f29f5f6 100644 --- a/Kyber/Kyber.Core/GameLoop.cs +++ b/Ion/Ion.Core/GameLoop.cs @@ -1,11 +1,11 @@ using System.Diagnostics; -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -namespace Kyber.Core; +namespace Ion.Core; /// /// Top-level class representing the runnable game. diff --git a/Kyber/Kyber.Core/HotReloadHandler.cs b/Ion/Ion.Core/HotReloadHandler.cs similarity index 84% rename from Kyber/Kyber.Core/HotReloadHandler.cs rename to Ion/Ion.Core/HotReloadHandler.cs index 1a39b9e..ea22c9e 100644 --- a/Kyber/Kyber.Core/HotReloadHandler.cs +++ b/Ion/Ion.Core/HotReloadHandler.cs @@ -1,12 +1,12 @@  #if DEBUG -[assembly: System.Reflection.Metadata.MetadataUpdateHandlerAttribute(typeof(Kyber.HotReloadService))] +[assembly: System.Reflection.Metadata.MetadataUpdateHandlerAttribute(typeof(Ion.HotReloadService))] -namespace Kyber; +namespace Ion; internal static class HotReloadService { - public static KyberApplication? Application { get; set; } + public static IonApplication? Application { get; set; } #pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context. public static event Action? UpdateApplicationEvent; diff --git a/Kyber/Kyber.Core/Kyber.Core.csproj b/Ion/Ion.Core/Ion.Core.csproj similarity index 79% rename from Kyber/Kyber.Core/Kyber.Core.csproj rename to Ion/Ion.Core/Ion.Core.csproj index 6bd5512..0f88d27 100644 --- a/Kyber/Kyber.Core/Kyber.Core.csproj +++ b/Ion/Ion.Core/Ion.Core.csproj @@ -8,7 +8,7 @@ enable True Debug;Release;DebugGenerators - Kyber +Ion @@ -30,7 +30,8 @@ - - - + + + + diff --git a/Kyber/Kyber.Core/Storage/PersistentStorage.cs b/Ion/Ion.Core/Storage/PersistentStorage.cs similarity index 98% rename from Kyber/Kyber.Core/Storage/PersistentStorage.cs rename to Ion/Ion.Core/Storage/PersistentStorage.cs index e862be8..dfd8aec 100644 --- a/Kyber/Kyber.Core/Storage/PersistentStorage.cs +++ b/Ion/Ion.Core/Storage/PersistentStorage.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Options; -namespace Kyber; +namespace Ion; internal class PersistentStorage : IPersistentStorage { diff --git a/Kyber/Kyber.Core/Storage/PersistentStorageProvider.cs b/Ion/Ion.Core/Storage/PersistentStorageProvider.cs similarity index 98% rename from Kyber/Kyber.Core/Storage/PersistentStorageProvider.cs rename to Ion/Ion.Core/Storage/PersistentStorageProvider.cs index a5e4675..84a3755 100644 --- a/Kyber/Kyber.Core/Storage/PersistentStorageProvider.cs +++ b/Ion/Ion.Core/Storage/PersistentStorageProvider.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; internal class PersistentStorageProvider : IPersistentStorageProvider { diff --git a/Kyber/Kyber.Core/Utils/RingBuffer.cs b/Ion/Ion.Core/Utils/RingBuffer.cs similarity index 98% rename from Kyber/Kyber.Core/Utils/RingBuffer.cs rename to Ion/Ion.Core/Utils/RingBuffer.cs index 5ab444c..2ee5618 100644 --- a/Kyber/Kyber.Core/Utils/RingBuffer.cs +++ b/Ion/Ion.Core/Utils/RingBuffer.cs @@ -1,5 +1,5 @@  -namespace Kyber; +namespace Ion; public class RingBuffer { diff --git a/Kyber/Kyber.Core_old/Events/Event.cs b/Ion/Ion.Core_old/Events/Event.cs similarity index 94% rename from Kyber/Kyber.Core_old/Events/Event.cs rename to Ion/Ion.Core_old/Events/Event.cs index 1ea0456..d55c0c2 100644 --- a/Kyber/Kyber.Core_old/Events/Event.cs +++ b/Ion/Ion.Core_old/Events/Event.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IEvent { diff --git a/Kyber/Kyber.Core_old/Events/EventEmitter.cs b/Ion/Ion.Core_old/Events/EventEmitter.cs similarity index 98% rename from Kyber/Kyber.Core_old/Events/EventEmitter.cs rename to Ion/Ion.Core_old/Events/EventEmitter.cs index 1d4eb0e..731cb42 100644 --- a/Kyber/Kyber.Core_old/Events/EventEmitter.cs +++ b/Ion/Ion.Core_old/Events/EventEmitter.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IEventEmitter { diff --git a/Kyber/Kyber.Core_old/Events/EventListener.cs b/Ion/Ion.Core_old/Events/EventListener.cs similarity index 98% rename from Kyber/Kyber.Core_old/Events/EventListener.cs rename to Ion/Ion.Core_old/Events/EventListener.cs index 338d2a9..2f8b37c 100644 --- a/Kyber/Kyber.Core_old/Events/EventListener.cs +++ b/Ion/Ion.Core_old/Events/EventListener.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IEventListener { diff --git a/Kyber/Kyber.Core_old/GameTime.cs b/Ion/Ion.Core_old/GameTime.cs similarity index 98% rename from Kyber/Kyber.Core_old/GameTime.cs rename to Ion/Ion.Core_old/GameTime.cs index 553bd30..2727150 100644 --- a/Kyber/Kyber.Core_old/GameTime.cs +++ b/Ion/Ion.Core_old/GameTime.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public class GameTime { diff --git a/Kyber/Kyber.Core_old/Graphics/GraphicsOutput.cs b/Ion/Ion.Core_old/Graphics/GraphicsOutput.cs similarity index 94% rename from Kyber/Kyber.Core_old/Graphics/GraphicsOutput.cs rename to Ion/Ion.Core_old/Graphics/GraphicsOutput.cs index b359109..a4d510a 100644 --- a/Kyber/Kyber.Core_old/Graphics/GraphicsOutput.cs +++ b/Ion/Ion.Core_old/Graphics/GraphicsOutput.cs @@ -1,4 +1,4 @@ -namespace Kyber.Graphics; +namespace Ion.Graphics; public enum GraphicsOutput: byte { diff --git a/Kyber/Kyber.Core_old/Graphics/IGraphicsContext.cs b/Ion/Ion.Core_old/Graphics/IGraphicsContext.cs similarity index 94% rename from Kyber/Kyber.Core_old/Graphics/IGraphicsContext.cs rename to Ion/Ion.Core_old/Graphics/IGraphicsContext.cs index 8b08943..436cba7 100644 --- a/Kyber/Kyber.Core_old/Graphics/IGraphicsContext.cs +++ b/Ion/Ion.Core_old/Graphics/IGraphicsContext.cs @@ -2,7 +2,7 @@ using Veldrid; -namespace Kyber.Graphics; +namespace Ion.Graphics; public interface IGraphicsContext { diff --git a/Kyber/Kyber.Core_old/IWindow.cs b/Ion/Ion.Core_old/IWindow.cs similarity index 97% rename from Kyber/Kyber.Core_old/IWindow.cs rename to Ion/Ion.Core_old/IWindow.cs index b55224a..c3409c4 100644 --- a/Kyber/Kyber.Core_old/IWindow.cs +++ b/Ion/Ion.Core_old/IWindow.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber; +namespace Ion; public record struct WindowResizeEvent(uint Width, uint Height); public record struct WindowClosedEvent; diff --git a/Kyber/Kyber.Core.Abstractions/Input/IInputState.cs b/Ion/Ion.Core_old/Input/IInputState.cs similarity index 96% rename from Kyber/Kyber.Core.Abstractions/Input/IInputState.cs rename to Ion/Ion.Core_old/Input/IInputState.cs index 05c73d1..117065e 100644 --- a/Kyber/Kyber.Core.Abstractions/Input/IInputState.cs +++ b/Ion/Ion.Core_old/Input/IInputState.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber; +namespace Ion; public interface IInputState { diff --git a/Kyber/Kyber.Core.Abstractions/Input/Key.cs b/Ion/Ion.Core_old/Input/Key.cs similarity index 99% rename from Kyber/Kyber.Core.Abstractions/Input/Key.cs rename to Ion/Ion.Core_old/Input/Key.cs index 9d9454a..35e6631 100644 --- a/Kyber/Kyber.Core.Abstractions/Input/Key.cs +++ b/Ion/Ion.Core_old/Input/Key.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public enum Key { diff --git a/Kyber/Kyber.Core.Abstractions/Input/MouseButton.cs b/Ion/Ion.Core_old/Input/MouseButton.cs similarity index 90% rename from Kyber/Kyber.Core.Abstractions/Input/MouseButton.cs rename to Ion/Ion.Core_old/Input/MouseButton.cs index 725e1ae..2231bf9 100644 --- a/Kyber/Kyber.Core.Abstractions/Input/MouseButton.cs +++ b/Ion/Ion.Core_old/Input/MouseButton.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public enum MouseButton { diff --git a/Kyber/Kyber.Core_old/Kyber.Core.csproj b/Ion/Ion.Core_old/Ion.Core.csproj similarity index 68% rename from Kyber/Kyber.Core_old/Kyber.Core.csproj rename to Ion/Ion.Core_old/Ion.Core.csproj index 5ff4acf..ff3f15c 100644 --- a/Kyber/Kyber.Core_old/Kyber.Core.csproj +++ b/Ion/Ion.Core_old/Ion.Core.csproj @@ -6,7 +6,7 @@ latest enable enable - Kyber +Ion Debug;Release;DebugGenerators @@ -17,14 +17,15 @@ - - + + + - - + + diff --git a/Ion/Ion.Core_old/IonException.cs b/Ion/Ion.Core_old/IonException.cs new file mode 100644 index 0000000..df53ba5 --- /dev/null +++ b/Ion/Ion.Core_old/IonException.cs @@ -0,0 +1,17 @@ +namespace Ion; + +public class IonException : Exception +{ + /// + /// Constructs a new IonException with the given message. + /// + /// The exception message. + public IonException(string message) : base(message) { } + + /// + /// Constructs a new IonException with the given message and inner exception. + /// + /// The exception message. + /// The inner exception. + public IonException(string message, Exception innerException) : base(message, innerException) { } +} diff --git a/Kyber/Kyber.Core_old/Scenes/ISceneBuilder.cs b/Ion/Ion.Core_old/Scenes/ISceneBuilder.cs similarity index 70% rename from Kyber/Kyber.Core_old/Scenes/ISceneBuilder.cs rename to Ion/Ion.Core_old/Scenes/ISceneBuilder.cs index 84fdbfc..fd1b466 100644 --- a/Kyber/Kyber.Core_old/Scenes/ISceneBuilder.cs +++ b/Ion/Ion.Core_old/Scenes/ISceneBuilder.cs @@ -1,4 +1,4 @@ -namespace Kyber.Hosting.Scenes; +namespace Ion.Hosting.Scenes; public interface ISceneBuilder { diff --git a/Kyber/Kyber.Core_old/Scenes/ISceneConfiguration.cs b/Ion/Ion.Core_old/Scenes/ISceneConfiguration.cs similarity index 70% rename from Kyber/Kyber.Core_old/Scenes/ISceneConfiguration.cs rename to Ion/Ion.Core_old/Scenes/ISceneConfiguration.cs index 925622e..156679f 100644 --- a/Kyber/Kyber.Core_old/Scenes/ISceneConfiguration.cs +++ b/Ion/Ion.Core_old/Scenes/ISceneConfiguration.cs @@ -1,4 +1,4 @@ -namespace Kyber.Hosting.Scenes; +namespace Ion.Hosting.Scenes; public interface ISceneConfiguration { diff --git a/Kyber/Kyber.Core_old/Scenes/ISceneManager.cs b/Ion/Ion.Core_old/Scenes/ISceneManager.cs similarity index 84% rename from Kyber/Kyber.Core_old/Scenes/ISceneManager.cs rename to Ion/Ion.Core_old/Scenes/ISceneManager.cs index 874946b..62d6fdc 100644 --- a/Kyber/Kyber.Core_old/Scenes/ISceneManager.cs +++ b/Ion/Ion.Core_old/Scenes/ISceneManager.cs @@ -1,6 +1,6 @@ -using Kyber.Hosting.Scenes; +using Ion.Hosting.Scenes; -namespace Kyber.Scenes; +namespace Ion.Scenes; public interface ISceneManager { diff --git a/Kyber/Kyber.Core_old/Storage/IPersistentStorage.cs b/Ion/Ion.Core_old/Storage/IPersistentStorage.cs similarity index 88% rename from Kyber/Kyber.Core_old/Storage/IPersistentStorage.cs rename to Ion/Ion.Core_old/Storage/IPersistentStorage.cs index 62390bd..f9878f8 100644 --- a/Kyber/Kyber.Core_old/Storage/IPersistentStorage.cs +++ b/Ion/Ion.Core_old/Storage/IPersistentStorage.cs @@ -1,4 +1,4 @@ -namespace Kyber.Storage; +namespace Ion.Storage; public interface IPersistentStorage { diff --git a/Kyber/Kyber.Core_old/Storage/IPersistentStorageProvider.cs b/Ion/Ion.Core_old/Storage/IPersistentStorageProvider.cs similarity index 94% rename from Kyber/Kyber.Core_old/Storage/IPersistentStorageProvider.cs rename to Ion/Ion.Core_old/Storage/IPersistentStorageProvider.cs index 8e16bd3..1591e65 100644 --- a/Kyber/Kyber.Core_old/Storage/IPersistentStorageProvider.cs +++ b/Ion/Ion.Core_old/Storage/IPersistentStorageProvider.cs @@ -1,4 +1,4 @@ -namespace Kyber.Storage; +namespace Ion.Storage; public interface IPersistentStorageProvider { diff --git a/Kyber/Kyber.Core_old/Systems/ISystem.cs b/Ion/Ion.Core_old/Systems/ISystem.cs similarity index 98% rename from Kyber/Kyber.Core_old/Systems/ISystem.cs rename to Ion/Ion.Core_old/Systems/ISystem.cs index 991ff2d..bdb3e32 100644 --- a/Kyber/Kyber.Core_old/Systems/ISystem.cs +++ b/Ion/Ion.Core_old/Systems/ISystem.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IBaseSystem { diff --git a/Kyber/Kyber.Core_old/Systems/SystemGroup.cs b/Ion/Ion.Core_old/Systems/SystemGroup.cs similarity index 99% rename from Kyber/Kyber.Core_old/Systems/SystemGroup.cs rename to Ion/Ion.Core_old/Systems/SystemGroup.cs index a71fc1b..d51952b 100644 --- a/Kyber/Kyber.Core_old/Systems/SystemGroup.cs +++ b/Ion/Ion.Core_old/Systems/SystemGroup.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public sealed class SystemGroup : ISystem { diff --git a/Kyber/Kyber.Core_old/Systems/SystemGroupBuilder.cs b/Ion/Ion.Core_old/Systems/SystemGroupBuilder.cs similarity index 97% rename from Kyber/Kyber.Core_old/Systems/SystemGroupBuilder.cs rename to Ion/Ion.Core_old/Systems/SystemGroupBuilder.cs index f5a463d..25a51ec 100644 --- a/Kyber/Kyber.Core_old/Systems/SystemGroupBuilder.cs +++ b/Ion/Ion.Core_old/Systems/SystemGroupBuilder.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; internal class SystemGroupBuilder { diff --git a/Kyber/Kyber.Core_old/Utils/MicroTimer.cs b/Ion/Ion.Core_old/Utils/MicroTimer.cs similarity index 99% rename from Kyber/Kyber.Core_old/Utils/MicroTimer.cs rename to Ion/Ion.Core_old/Utils/MicroTimer.cs index e218dca..1a8ec4f 100644 --- a/Kyber/Kyber.Core_old/Utils/MicroTimer.cs +++ b/Ion/Ion.Core_old/Utils/MicroTimer.cs @@ -2,7 +2,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace Kyber.Utils; +namespace Ion.Utils; public record struct MicroTiming(int Id, double Start, double Stop, int ThreadId) { diff --git a/Kyber/Kyber.Extensions.Coroutines.Abstractions/ICoroutineRunner.cs b/Ion/Ion.Extensions.Coroutines.Abstractions/ICoroutineRunner.cs similarity index 98% rename from Kyber/Kyber.Extensions.Coroutines.Abstractions/ICoroutineRunner.cs rename to Ion/Ion.Extensions.Coroutines.Abstractions/ICoroutineRunner.cs index fb2527c..11d89d7 100644 --- a/Kyber/Kyber.Extensions.Coroutines.Abstractions/ICoroutineRunner.cs +++ b/Ion/Ion.Extensions.Coroutines.Abstractions/ICoroutineRunner.cs @@ -1,6 +1,6 @@ using System.Collections; -namespace Kyber +namespace Ion { public interface ICoroutineRunner { diff --git a/Kyber/Kyber.Extensions.Coroutines.Abstractions/IWait.cs b/Ion/Ion.Extensions.Coroutines.Abstractions/IWait.cs similarity index 84% rename from Kyber/Kyber.Extensions.Coroutines.Abstractions/IWait.cs rename to Ion/Ion.Extensions.Coroutines.Abstractions/IWait.cs index 5579142..81f768d 100644 --- a/Kyber/Kyber.Extensions.Coroutines.Abstractions/IWait.cs +++ b/Ion/Ion.Extensions.Coroutines.Abstractions/IWait.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IWait { diff --git a/Kyber/Kyber.Extensions.Coroutines.Abstractions/Kyber.Extensions.Coroutines.Abstractions.csproj b/Ion/Ion.Extensions.Coroutines.Abstractions/Ion.Extensions.Coroutines.Abstractions.csproj similarity index 76% rename from Kyber/Kyber.Extensions.Coroutines.Abstractions/Kyber.Extensions.Coroutines.Abstractions.csproj rename to Ion/Ion.Extensions.Coroutines.Abstractions/Ion.Extensions.Coroutines.Abstractions.csproj index 04b012f..41fcc27 100644 --- a/Kyber/Kyber.Extensions.Coroutines.Abstractions/Kyber.Extensions.Coroutines.Abstractions.csproj +++ b/Ion/Ion.Extensions.Coroutines.Abstractions/Ion.Extensions.Coroutines.Abstractions.csproj @@ -7,7 +7,8 @@ - + + diff --git a/Kyber/Kyber.Extensions.Coroutines.Abstractions/Wait.cs b/Ion/Ion.Extensions.Coroutines.Abstractions/Wait.cs similarity index 97% rename from Kyber/Kyber.Extensions.Coroutines.Abstractions/Wait.cs rename to Ion/Ion.Extensions.Coroutines.Abstractions/Wait.cs index 972deae..d91cf91 100644 --- a/Kyber/Kyber.Extensions.Coroutines.Abstractions/Wait.cs +++ b/Ion/Ion.Extensions.Coroutines.Abstractions/Wait.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public static class Wait { diff --git a/Kyber/Kyber.Extensions.Coroutines.Generators/CoroutinesGenerator.cs b/Ion/Ion.Extensions.Coroutines.Generators/CoroutinesGenerator.cs similarity index 90% rename from Kyber/Kyber.Extensions.Coroutines.Generators/CoroutinesGenerator.cs rename to Ion/Ion.Extensions.Coroutines.Generators/CoroutinesGenerator.cs index 72f240e..795d329 100644 --- a/Kyber/Kyber.Extensions.Coroutines.Generators/CoroutinesGenerator.cs +++ b/Ion/Ion.Extensions.Coroutines.Generators/CoroutinesGenerator.cs @@ -3,7 +3,7 @@ using SourceGeneratorUtils; -namespace Kyber.Extensions.Coroutines.Generators; +namespace Ion.Extensions.Coroutines.Generators; [Generator] public class CoroutinesGenerator : IIncrementalGenerator @@ -24,7 +24,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context) private static SourceText GetCoroutineAttribute() { return SourceText.From(@" -namespace Kyber.Extensions.Coroutines; +namespace Ion.Extensions.Coroutines; [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] public class CoroutineAttribute : Attribute diff --git a/Kyber/Kyber.Extensions.Coroutines.Generators/Kyber.Extensions.Coroutines.Generators.csproj b/Ion/Ion.Extensions.Coroutines.Generators/Ion.Extensions.Coroutines.Generators.csproj similarity index 100% rename from Kyber/Kyber.Extensions.Coroutines.Generators/Kyber.Extensions.Coroutines.Generators.csproj rename to Ion/Ion.Extensions.Coroutines.Generators/Ion.Extensions.Coroutines.Generators.csproj diff --git a/Kyber/Kyber.Extensions.Coroutines/BuilderExtensions.cs b/Ion/Ion.Extensions.Coroutines/BuilderExtensions.cs similarity index 86% rename from Kyber/Kyber.Extensions.Coroutines/BuilderExtensions.cs rename to Ion/Ion.Extensions.Coroutines/BuilderExtensions.cs index ce6c28e..180456e 100644 --- a/Kyber/Kyber.Extensions.Coroutines/BuilderExtensions.cs +++ b/Ion/Ion.Extensions.Coroutines/BuilderExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -namespace Kyber.Extensions.Coroutines; +namespace Ion.Extensions.Coroutines; public static class BuilderExtensions { diff --git a/Kyber/Kyber.Extensions.Coroutines/CoroutineRunner.cs b/Ion/Ion.Extensions.Coroutines/CoroutineRunner.cs similarity index 99% rename from Kyber/Kyber.Extensions.Coroutines/CoroutineRunner.cs rename to Ion/Ion.Extensions.Coroutines/CoroutineRunner.cs index 3331784..02e805b 100644 --- a/Kyber/Kyber.Extensions.Coroutines/CoroutineRunner.cs +++ b/Ion/Ion.Extensions.Coroutines/CoroutineRunner.cs @@ -2,7 +2,7 @@ using System.Collections; -namespace Kyber; +namespace Ion; public class CoroutineRunner : ICoroutineRunner { diff --git a/Kyber/Kyber.Extensions.Coroutines/Kyber.Extensions.Coroutines.csproj b/Ion/Ion.Extensions.Coroutines/Ion.Extensions.Coroutines.csproj similarity index 51% rename from Kyber/Kyber.Extensions.Coroutines/Kyber.Extensions.Coroutines.csproj rename to Ion/Ion.Extensions.Coroutines/Ion.Extensions.Coroutines.csproj index 92b6ed8..0c65238 100644 --- a/Kyber/Kyber.Extensions.Coroutines/Kyber.Extensions.Coroutines.csproj +++ b/Ion/Ion.Extensions.Coroutines/Ion.Extensions.Coroutines.csproj @@ -7,8 +7,9 @@ - - + + + diff --git a/Kyber/Kyber.Extensions.Debug.Abstractions/Kyber.Extensions.Debug.Abstractions.csproj b/Ion/Ion.Extensions.Debug.Abstractions/Ion.Extensions.Debug.Abstractions.csproj similarity index 100% rename from Kyber/Kyber.Extensions.Debug.Abstractions/Kyber.Extensions.Debug.Abstractions.csproj rename to Ion/Ion.Extensions.Debug.Abstractions/Ion.Extensions.Debug.Abstractions.csproj diff --git a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceManager.cs b/Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceManager.cs similarity index 77% rename from Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceManager.cs rename to Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceManager.cs index 7071f17..2186d90 100644 --- a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceManager.cs +++ b/Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceManager.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; public interface ITraceManager { bool IsEnabled { get; set; } diff --git a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceTimer.cs b/Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceTimer.cs similarity index 77% rename from Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceTimer.cs rename to Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceTimer.cs index 9738ca2..86c8df8 100644 --- a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceTimer.cs +++ b/Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceTimer.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; public interface ITraceTimer diff --git a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceTimerInstance.cs b/Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceTimerInstance.cs similarity index 68% rename from Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceTimerInstance.cs rename to Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceTimerInstance.cs index 40b1e33..a9e763b 100644 --- a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/ITraceTimerInstance.cs +++ b/Ion/Ion.Extensions.Debug.Abstractions/Trace/ITraceTimerInstance.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; public interface ITraceTimerInstance { diff --git a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/NullTimerInstance.cs b/Ion/Ion.Extensions.Debug.Abstractions/Trace/NullTimerInstance.cs similarity index 88% rename from Kyber/Kyber.Extensions.Debug.Abstractions/Trace/NullTimerInstance.cs rename to Ion/Ion.Extensions.Debug.Abstractions/Trace/NullTimerInstance.cs index 534d1fe..48fb9a5 100644 --- a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/NullTimerInstance.cs +++ b/Ion/Ion.Extensions.Debug.Abstractions/Trace/NullTimerInstance.cs @@ -1,6 +1,6 @@ using System.Runtime.CompilerServices; -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; public struct NullTimerInstance : ITraceTimerInstance { diff --git a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/TraceTiming.cs b/Ion/Ion.Extensions.Debug.Abstractions/Trace/TraceTiming.cs similarity index 79% rename from Kyber/Kyber.Extensions.Debug.Abstractions/Trace/TraceTiming.cs rename to Ion/Ion.Extensions.Debug.Abstractions/Trace/TraceTiming.cs index 2f2be23..29280e8 100644 --- a/Kyber/Kyber.Extensions.Debug.Abstractions/Trace/TraceTiming.cs +++ b/Ion/Ion.Extensions.Debug.Abstractions/Trace/TraceTiming.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; public record struct TraceTiming(int Id, string Name, double Start, double Stop, int ThreadId) { diff --git a/Kyber/Kyber.Extensions.Debug/BuilderExtensions.cs b/Ion/Ion.Extensions.Debug/BuilderExtensions.cs similarity index 79% rename from Kyber/Kyber.Extensions.Debug/BuilderExtensions.cs rename to Ion/Ion.Extensions.Debug/BuilderExtensions.cs index 9a62b2b..fb35afa 100644 --- a/Kyber/Kyber.Extensions.Debug/BuilderExtensions.cs +++ b/Ion/Ion.Extensions.Debug/BuilderExtensions.cs @@ -1,13 +1,13 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Configuration; -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; public static class BuilderExtensions { public static IServiceCollection AddDebugUtils(this IServiceCollection services, IConfiguration config, Action? configureOptions = null) { - return AddDebugUtils(services, config.GetSection("Kyber").GetSection("Debug"), configureOptions); + return AddDebugUtils(services, config.GetSection("Ion").GetSection("Debug"), configureOptions); } public static IServiceCollection AddDebugUtils(this IServiceCollection services, IConfigurationSection config, Action? configureOptions = null) @@ -23,7 +23,7 @@ public static IServiceCollection AddDebugUtils(this IServiceCollection services, return services; } - public static IKyberApplication UseDebugUtils(this IKyberApplication app) + public static IIonApplication UseDebugUtils(this IIonApplication app) { return app.UseSystem(); } diff --git a/Kyber/Kyber.Extensions.Debug/DebugConfig.cs b/Ion/Ion.Extensions.Debug/DebugConfig.cs similarity index 86% rename from Kyber/Kyber.Extensions.Debug/DebugConfig.cs rename to Ion/Ion.Extensions.Debug/DebugConfig.cs index 3e370c1..44acf71 100644 --- a/Kyber/Kyber.Extensions.Debug/DebugConfig.cs +++ b/Ion/Ion.Extensions.Debug/DebugConfig.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public class DebugConfig { diff --git a/Kyber/Kyber.Extensions.Debug/Kyber.Extensions.Debug.csproj b/Ion/Ion.Extensions.Debug/Ion.Extensions.Debug.csproj similarity index 78% rename from Kyber/Kyber.Extensions.Debug/Kyber.Extensions.Debug.csproj rename to Ion/Ion.Extensions.Debug/Ion.Extensions.Debug.csproj index 070dbb1..7570420 100644 --- a/Kyber/Kyber.Extensions.Debug/Kyber.Extensions.Debug.csproj +++ b/Ion/Ion.Extensions.Debug/Ion.Extensions.Debug.csproj @@ -15,8 +15,9 @@ - - + + + diff --git a/Kyber/Kyber.Extensions.Debug/Systems/TraceTimerSystem.cs b/Ion/Ion.Extensions.Debug/Systems/TraceTimerSystem.cs similarity index 97% rename from Kyber/Kyber.Extensions.Debug/Systems/TraceTimerSystem.cs rename to Ion/Ion.Extensions.Debug/Systems/TraceTimerSystem.cs index 66a2c40..f1799b3 100644 --- a/Kyber/Kyber.Extensions.Debug/Systems/TraceTimerSystem.cs +++ b/Ion/Ion.Extensions.Debug/Systems/TraceTimerSystem.cs @@ -1,7 +1,7 @@  using Microsoft.Extensions.Options; -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; public class TraceTimerSystem { diff --git a/Kyber/Kyber.Extensions.Debug/Trace/TraceManager.cs b/Ion/Ion.Extensions.Debug/Trace/TraceManager.cs similarity index 98% rename from Kyber/Kyber.Extensions.Debug/Trace/TraceManager.cs rename to Ion/Ion.Extensions.Debug/Trace/TraceManager.cs index ca64368..8bf8067 100644 --- a/Kyber/Kyber.Extensions.Debug/Trace/TraceManager.cs +++ b/Ion/Ion.Extensions.Debug/Trace/TraceManager.cs @@ -6,7 +6,7 @@ using Microsoft.Extensions.Options; using Microsoft.Extensions.Logging; -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; internal class TraceManager : ITraceManager { diff --git a/Kyber/Kyber.Extensions.Debug/Trace/TraceTimer.cs b/Ion/Ion.Extensions.Debug/Trace/TraceTimer.cs similarity index 94% rename from Kyber/Kyber.Extensions.Debug/Trace/TraceTimer.cs rename to Ion/Ion.Extensions.Debug/Trace/TraceTimer.cs index 8a5f4c0..3f6d2cc 100644 --- a/Kyber/Kyber.Extensions.Debug/Trace/TraceTimer.cs +++ b/Ion/Ion.Extensions.Debug/Trace/TraceTimer.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; internal class TraceTimer : ITraceTimer diff --git a/Kyber/Kyber.Extensions.Debug/Trace/TraceTimerInstance.cs b/Ion/Ion.Extensions.Debug/Trace/TraceTimerInstance.cs similarity index 96% rename from Kyber/Kyber.Extensions.Debug/Trace/TraceTimerInstance.cs rename to Ion/Ion.Extensions.Debug/Trace/TraceTimerInstance.cs index 96497b0..e35f019 100644 --- a/Kyber/Kyber.Extensions.Debug/Trace/TraceTimerInstance.cs +++ b/Ion/Ion.Extensions.Debug/Trace/TraceTimerInstance.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Debug; +namespace Ion.Extensions.Debug; internal struct TraceTimerInstance : ITraceTimerInstance { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/2D/ISpriteBatch.cs b/Ion/Ion.Extensions.Graphics.Abstractions/2D/ISpriteBatch.cs similarity index 96% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/2D/ISpriteBatch.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/2D/ISpriteBatch.cs index 6eae8f0..60ca996 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/2D/ISpriteBatch.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/2D/ISpriteBatch.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface ISpriteBatch { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/2D/SpriteEffect.cs b/Ion/Ion.Extensions.Graphics.Abstractions/2D/SpriteEffect.cs similarity index 88% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/2D/SpriteEffect.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/2D/SpriteEffect.cs index ade7997..b890b22 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/2D/SpriteEffect.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/2D/SpriteEffect.cs @@ -1,5 +1,5 @@  -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; [Flags] public enum SpriteEffect diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetBatch.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetBatch.cs similarity index 98% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetBatch.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetBatch.cs index 83a239e..489a220 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetBatch.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetBatch.cs @@ -1,6 +1,6 @@ using System.Collections.Immutable; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public enum AssetStatus { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetManager.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetManager.cs similarity index 97% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetManager.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetManager.cs index d214883..94424e2 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetManager.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetManager.cs @@ -1,7 +1,7 @@ using System.Collections.Immutable; using Microsoft.Extensions.Logging; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface IAssetManager { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetService.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetService.cs similarity index 96% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetService.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetService.cs index 2430ff1..29cba7d 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/AssetService.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/AssetService.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface IAssetService { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/IAsset.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/IAsset.cs similarity index 69% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/IAsset.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Assets/IAsset.cs index d967e8e..5a4acbd 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/IAsset.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/IAsset.cs @@ -1,5 +1,5 @@  -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface IAsset : IDisposable { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/IAssetLoader.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/IAssetLoader.cs similarity index 75% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/IAssetLoader.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Assets/IAssetLoader.cs index 6df635a..c08ea48 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/IAssetLoader.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/IAssetLoader.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface IAssetLoader { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/ITexture2D.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/ITexture2D.cs similarity index 71% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/ITexture2D.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Assets/ITexture2D.cs index 67914ae..f741286 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Assets/ITexture2D.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Assets/ITexture2D.cs @@ -1,7 +1,7 @@  using System.Numerics; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface ITexture2D : IAsset { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Color.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Color.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Color.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Color.cs index b3f3eb3..bca9717 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Color.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Color.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.Serialization; -namespace Kyber; +namespace Ion; /// /// An RGBA color value backed by a Vector4 (16 bytes). diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/GraphicsConfig.cs b/Ion/Ion.Extensions.Graphics.Abstractions/GraphicsConfig.cs similarity index 96% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/GraphicsConfig.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/GraphicsConfig.cs index c8fa40a..4862348 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/GraphicsConfig.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/GraphicsConfig.cs @@ -1,7 +1,7 @@  -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/IWindow.cs b/Ion/Ion.Extensions.Graphics.Abstractions/IWindow.cs similarity index 92% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/IWindow.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/IWindow.cs index 364cb21..e3caf35 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/IWindow.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/IWindow.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface IWindow { diff --git a/Ion/Ion.Extensions.Graphics.Abstractions/Ion.Extensions.Graphics.Abstractions.csproj b/Ion/Ion.Extensions.Graphics.Abstractions/Ion.Extensions.Graphics.Abstractions.csproj new file mode 100644 index 0000000..a896b02 --- /dev/null +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Ion.Extensions.Graphics.Abstractions.csproj @@ -0,0 +1,24 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + + + + + + diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Point.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Point.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Point.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Point.cs index 9a7215f..98620ad 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Point.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Point.cs @@ -2,7 +2,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -namespace Kyber; +namespace Ion; /// /// Describes a 2D-point. diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Rectangle.cs b/Ion/Ion.Extensions.Graphics.Abstractions/Rectangle.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/Rectangle.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/Rectangle.cs index ab56575..ac2d627 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Rectangle.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/Rectangle.cs @@ -1,7 +1,7 @@ using System.Numerics; using System.Diagnostics; -namespace Kyber; +namespace Ion; [DebuggerDisplay("{DebugDisplayString,nq}")] public struct Rectangle : IEquatable diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/RectangleF.cs b/Ion/Ion.Extensions.Graphics.Abstractions/RectangleF.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/RectangleF.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/RectangleF.cs index f9d8a97..d784e28 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/RectangleF.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/RectangleF.cs @@ -1,7 +1,7 @@ using System.Numerics; using System.Diagnostics; -namespace Kyber; +namespace Ion; [DebuggerDisplay("{DebugDisplayString,nq}")] public struct RectangleF : IEquatable diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/WindowConfig.cs b/Ion/Ion.Extensions.Graphics.Abstractions/WindowConfig.cs similarity index 90% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/WindowConfig.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/WindowConfig.cs index 992c769..cab9430 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/WindowConfig.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/WindowConfig.cs @@ -1,5 +1,5 @@  -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public class WindowConfig { diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/WindowState.cs b/Ion/Ion.Extensions.Graphics.Abstractions/WindowState.cs similarity index 72% rename from Kyber/Kyber.Extensions.Graphics.Abstractions/WindowState.cs rename to Ion/Ion.Extensions.Graphics.Abstractions/WindowState.cs index 6552703..e62816a 100644 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/WindowState.cs +++ b/Ion/Ion.Extensions.Graphics.Abstractions/WindowState.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public enum WindowState { diff --git a/Kyber/Kyber.Extensions.Graphics.Null/2D/SpriteBatch.cs b/Ion/Ion.Extensions.Graphics.Null/2D/SpriteBatch.cs similarity index 97% rename from Kyber/Kyber.Extensions.Graphics.Null/2D/SpriteBatch.cs rename to Ion/Ion.Extensions.Graphics.Null/2D/SpriteBatch.cs index 0b003e6..c6e73b1 100644 --- a/Kyber/Kyber.Extensions.Graphics.Null/2D/SpriteBatch.cs +++ b/Ion/Ion.Extensions.Graphics.Null/2D/SpriteBatch.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; internal class SpriteBatch : ISpriteBatch, IDisposable { diff --git a/Kyber/Kyber.Extensions.Graphics.Null/BuilderExtensions.cs b/Ion/Ion.Extensions.Graphics.Null/BuilderExtensions.cs similarity index 80% rename from Kyber/Kyber.Extensions.Graphics.Null/BuilderExtensions.cs rename to Ion/Ion.Extensions.Graphics.Null/BuilderExtensions.cs index 0c45b51..e4bcc31 100644 --- a/Kyber/Kyber.Extensions.Graphics.Null/BuilderExtensions.cs +++ b/Ion/Ion.Extensions.Graphics.Null/BuilderExtensions.cs @@ -1,13 +1,13 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Configuration; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public static class BuilderExtensions { public static IServiceCollection AddNullGraphics(this IServiceCollection services, IConfiguration config, Action? configureOptions = null) { - return AddNullGraphics(services, config.GetSection("Kyber").GetSection("Graphics"), configureOptions); + return AddNullGraphics(services, config.GetSection("Ion").GetSection("Graphics"), configureOptions); } public static IServiceCollection AddNullGraphics(this IServiceCollection services, IConfigurationSection config, Action? configureOptions = null) @@ -31,7 +31,7 @@ public static IServiceCollection AddNullGraphics(this IServiceCollection service return services; } - public static IKyberApplication UseNullGraphics(this IKyberApplication app) + public static IIonApplication UseNullGraphics(this IIonApplication app) { return app; } diff --git a/Kyber/Kyber.Extensions.Graphics.Null/Input/InputState.cs b/Ion/Ion.Extensions.Graphics.Null/Input/InputState.cs similarity index 97% rename from Kyber/Kyber.Extensions.Graphics.Null/Input/InputState.cs rename to Ion/Ion.Extensions.Graphics.Null/Input/InputState.cs index fcd9280..a5d0db4 100644 --- a/Kyber/Kyber.Extensions.Graphics.Null/Input/InputState.cs +++ b/Ion/Ion.Extensions.Graphics.Null/Input/InputState.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber; +namespace Ion; internal class InputState : IInputState { diff --git a/Kyber/Kyber.Extensions.Graphics.Null/Kyber.Extensions.Graphics.Null.csproj b/Ion/Ion.Extensions.Graphics.Null/Ion.Extensions.Graphics.Null.csproj similarity index 78% rename from Kyber/Kyber.Extensions.Graphics.Null/Kyber.Extensions.Graphics.Null.csproj rename to Ion/Ion.Extensions.Graphics.Null/Ion.Extensions.Graphics.Null.csproj index 0dcf2f9..5db273a 100644 --- a/Kyber/Kyber.Extensions.Graphics.Null/Kyber.Extensions.Graphics.Null.csproj +++ b/Ion/Ion.Extensions.Graphics.Null/Ion.Extensions.Graphics.Null.csproj @@ -12,7 +12,8 @@ - + + diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/2D/SpriteBatch.cs b/Ion/Ion.Extensions.Graphics.Veldrid/2D/SpriteBatch.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/2D/SpriteBatch.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/2D/SpriteBatch.cs index b72049f..82ad53a 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/2D/SpriteBatch.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/2D/SpriteBatch.cs @@ -2,10 +2,10 @@ using Microsoft.Extensions.Logging; using Veldrid; using Veldrid.SPIRV; -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; using System.Diagnostics; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; internal class SpriteBatch : ISpriteBatch, IDisposable { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/2D/SpriteBatchManager.cs b/Ion/Ion.Extensions.Graphics.Veldrid/2D/SpriteBatchManager.cs similarity index 98% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/2D/SpriteBatchManager.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/2D/SpriteBatchManager.cs index 15c6bf1..5d3bec1 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/2D/SpriteBatchManager.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/2D/SpriteBatchManager.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; internal class SpriteBatchManager { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/Loaders/Texture2DLoader.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/Loaders/Texture2DLoader.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/Loaders/Texture2DLoader.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Assets/Loaders/Texture2DLoader.cs index d95f47a..524c5b3 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/Loaders/Texture2DLoader.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/Loaders/Texture2DLoader.cs @@ -7,7 +7,7 @@ using VeldridLib = Veldrid; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; internal class Texture2DLoader : IAssetLoader { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/ProcessedModel.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/ProcessedModel.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/ProcessedModel.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Assets/ProcessedModel.cs index c957b36..9ce919c 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/ProcessedModel.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/ProcessedModel.cs @@ -1,7 +1,7 @@ using System.Numerics; using Veldrid; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; internal class ProcessedModel { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/ProcessedTexture.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/ProcessedTexture.cs similarity index 94% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/ProcessedTexture.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Assets/ProcessedTexture.cs index 9d01472..22b5247 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/ProcessedTexture.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/ProcessedTexture.cs @@ -1,6 +1,6 @@ using Veldrid; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; internal class ProcessedTexture { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/Texture.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/Texture.cs similarity index 96% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/Texture.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Assets/Texture.cs index 21deaba..cdf3174 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Assets/Texture.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Assets/Texture.cs @@ -2,7 +2,7 @@ using VeldridLib = Veldrid; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public abstract class Texture : ITexture2D { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/BuilderExtensions.cs b/Ion/Ion.Extensions.Graphics.Veldrid/BuilderExtensions.cs similarity index 85% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/BuilderExtensions.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/BuilderExtensions.cs index b246e23..430664e 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/BuilderExtensions.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/BuilderExtensions.cs @@ -1,13 +1,13 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Configuration; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public static class BuilderExtensions { public static IServiceCollection AddVeldridGraphics(this IServiceCollection services, IConfiguration config, Action? configureOptions = null) { - return AddVeldridGraphics(services, config.GetSection("Kyber").GetSection("Graphics"), configureOptions); + return AddVeldridGraphics(services, config.GetSection("Ion").GetSection("Graphics"), configureOptions); } public static IServiceCollection AddVeldridGraphics(this IServiceCollection services, IConfigurationSection config, Action? configureOptions = null) @@ -37,7 +37,7 @@ public static IServiceCollection AddVeldridGraphics(this IServiceCollection serv return services; } - public static IKyberApplication UseVeldridGraphics(this IKyberApplication app) + public static IIonApplication UseVeldridGraphics(this IIonApplication app) { return app .UseSystem() diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/GraphicsContext.cs b/Ion/Ion.Extensions.Graphics.Veldrid/GraphicsContext.cs similarity index 98% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/GraphicsContext.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/GraphicsContext.cs index e720a00..b64062f 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/GraphicsContext.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/GraphicsContext.cs @@ -3,9 +3,9 @@ using Microsoft.Extensions.Options; using Veldrid; -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public interface IGraphicsContext { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Input/InputState.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Input/InputState.cs similarity index 98% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Input/InputState.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Input/InputState.cs index b50a70a..0716b3b 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Input/InputState.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Input/InputState.cs @@ -1,7 +1,7 @@ using System.Numerics; -using Kyber.Extensions.Graphics; +using Ion.Extensions.Graphics; -namespace Kyber; +namespace Ion; // TODO: Create a similar implementation that does not process the snapshot before hand (just lookup the list each time). internal class InputState : IInputState diff --git a/Kyber/Kyber_old/Input/KeyEvent.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Input/KeyEvent.cs similarity index 96% rename from Kyber/Kyber_old/Input/KeyEvent.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Input/KeyEvent.cs index a68b073..93ec17a 100644 --- a/Kyber/Kyber_old/Input/KeyEvent.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Input/KeyEvent.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public partial struct KeyEvent { public Key Key; diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Input/MouseEvent.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Input/MouseEvent.cs similarity index 94% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Input/MouseEvent.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Input/MouseEvent.cs index c37af59..1cd86b2 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Input/MouseEvent.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Input/MouseEvent.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public struct MouseEvent { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Kyber.Extensions.Graphics.Veldrid.csproj b/Ion/Ion.Extensions.Graphics.Veldrid/Ion.Extensions.Graphics.Veldrid.csproj similarity index 69% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Kyber.Extensions.Graphics.Veldrid.csproj rename to Ion/Ion.Extensions.Graphics.Veldrid/Ion.Extensions.Graphics.Veldrid.csproj index 39001f1..ac73c16 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Kyber.Extensions.Graphics.Veldrid.csproj +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Ion.Extensions.Graphics.Veldrid.csproj @@ -19,10 +19,11 @@ - - - - + + + + + diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/GraphicsSystem.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/GraphicsSystem.cs similarity index 91% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/GraphicsSystem.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Systems/GraphicsSystem.cs index b7780c0..4316ff4 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/GraphicsSystem.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/GraphicsSystem.cs @@ -1,7 +1,7 @@  -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public class GraphicsSystem { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/InputSystem.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/InputSystem.cs similarity index 85% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/InputSystem.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Systems/InputSystem.cs index f12b458..de980d6 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/InputSystem.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/InputSystem.cs @@ -1,7 +1,7 @@  -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public class InputSystem { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/SpriteBatchSystem.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/SpriteBatchSystem.cs similarity index 90% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/SpriteBatchSystem.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Systems/SpriteBatchSystem.cs index f88077e..7e62475 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/SpriteBatchSystem.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/SpriteBatchSystem.cs @@ -1,6 +1,6 @@ -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public class SpriteBatchSystem { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/WindowSystem.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/WindowSystem.cs similarity index 92% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/WindowSystem.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Systems/WindowSystem.cs index 61c1f33..d5fd82d 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Systems/WindowSystem.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Systems/WindowSystem.cs @@ -1,7 +1,7 @@  -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; public class WindowSystem { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Window.cs b/Ion/Ion.Extensions.Graphics.Veldrid/Window.cs similarity index 99% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Window.cs rename to Ion/Ion.Extensions.Graphics.Veldrid/Window.cs index c219cfb..cf9a6c1 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Window.cs +++ b/Ion/Ion.Extensions.Graphics.Veldrid/Window.cs @@ -5,7 +5,7 @@ using VeldridLib = Veldrid; using Veldrid.Sdl2; -namespace Kyber.Extensions.Graphics; +namespace Ion.Extensions.Graphics; internal class Window : IWindow { diff --git a/Kyber/Kyber.Extensions.Scenes.Abstractions/ISceneBuilder.cs b/Ion/Ion.Extensions.Scenes.Abstractions/ISceneBuilder.cs similarity index 95% rename from Kyber/Kyber.Extensions.Scenes.Abstractions/ISceneBuilder.cs rename to Ion/Ion.Extensions.Scenes.Abstractions/ISceneBuilder.cs index e86d2c2..388d683 100644 --- a/Kyber/Kyber.Extensions.Scenes.Abstractions/ISceneBuilder.cs +++ b/Ion/Ion.Extensions.Scenes.Abstractions/ISceneBuilder.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Configuration; -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; public interface ISceneBuilder { diff --git a/Ion/Ion.Extensions.Scenes.Abstractions/Ion.Extensions.Scenes.Abstractions.csproj b/Ion/Ion.Extensions.Scenes.Abstractions/Ion.Extensions.Scenes.Abstractions.csproj new file mode 100644 index 0000000..108ba1f --- /dev/null +++ b/Ion/Ion.Extensions.Scenes.Abstractions/Ion.Extensions.Scenes.Abstractions.csproj @@ -0,0 +1,20 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + + diff --git a/Kyber/Kyber.Extensions.Scenes.Abstractions/Scene.cs b/Ion/Ion.Extensions.Scenes.Abstractions/Scene.cs similarity index 93% rename from Kyber/Kyber.Extensions.Scenes.Abstractions/Scene.cs rename to Ion/Ion.Extensions.Scenes.Abstractions/Scene.cs index 7c0e17b..6578dbb 100644 --- a/Kyber/Kyber.Extensions.Scenes.Abstractions/Scene.cs +++ b/Ion/Ion.Extensions.Scenes.Abstractions/Scene.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; public class Scene { diff --git a/Kyber/Kyber.Extensions.Scenes.Abstractions/SceneEvents.cs b/Ion/Ion.Extensions.Scenes.Abstractions/SceneEvents.cs similarity index 59% rename from Kyber/Kyber.Extensions.Scenes.Abstractions/SceneEvents.cs rename to Ion/Ion.Extensions.Scenes.Abstractions/SceneEvents.cs index 978b426..f020d24 100644 --- a/Kyber/Kyber.Extensions.Scenes.Abstractions/SceneEvents.cs +++ b/Ion/Ion.Extensions.Scenes.Abstractions/SceneEvents.cs @@ -1,3 +1,3 @@ -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; public record struct ChangeSceneEvent(int NextScene); diff --git a/Kyber/Kyber.Extensions.Scenes.Abstractions/UseSystemExtensions.cs b/Ion/Ion.Extensions.Scenes.Abstractions/UseSystemExtensions.cs similarity index 98% rename from Kyber/Kyber.Extensions.Scenes.Abstractions/UseSystemExtensions.cs rename to Ion/Ion.Extensions.Scenes.Abstractions/UseSystemExtensions.cs index 0645279..af63a3b 100644 --- a/Kyber/Kyber.Extensions.Scenes.Abstractions/UseSystemExtensions.cs +++ b/Ion/Ion.Extensions.Scenes.Abstractions/UseSystemExtensions.cs @@ -1,7 +1,7 @@ using System.Reflection; using System.Diagnostics.CodeAnalysis; -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; public static class UseSystemExtensions { diff --git a/Kyber/Kyber.Extensions.Scenes.InternalGenerators/Kyber.Extensions.Scenes.InternalGenerators.csproj b/Ion/Ion.Extensions.Scenes.InternalGenerators/Ion.Extensions.Scenes.InternalGenerators.csproj similarity index 100% rename from Kyber/Kyber.Extensions.Scenes.InternalGenerators/Kyber.Extensions.Scenes.InternalGenerators.csproj rename to Ion/Ion.Extensions.Scenes.InternalGenerators/Ion.Extensions.Scenes.InternalGenerators.csproj diff --git a/Kyber/Kyber.Extensions.Scenes.InternalGenerators/UseDelegateServicesSceneGenerator.cs b/Ion/Ion.Extensions.Scenes.InternalGenerators/UseDelegateServicesSceneGenerator.cs similarity index 95% rename from Kyber/Kyber.Extensions.Scenes.InternalGenerators/UseDelegateServicesSceneGenerator.cs rename to Ion/Ion.Extensions.Scenes.InternalGenerators/UseDelegateServicesSceneGenerator.cs index e3ed258..6b95da8 100644 --- a/Kyber/Kyber.Extensions.Scenes.InternalGenerators/UseDelegateServicesSceneGenerator.cs +++ b/Ion/Ion.Extensions.Scenes.InternalGenerators/UseDelegateServicesSceneGenerator.cs @@ -3,7 +3,7 @@ using SourceGeneratorUtils; -namespace Kyber.Extensions.Scenes.InternalGenerators; +namespace Ion.Extensions.Scenes.InternalGenerators; [Generator] public class UseDelegateServicesSceneGenerator : IIncrementalGenerator @@ -29,7 +29,7 @@ private static SourceText GetUseDelegateServiceExtensions() var source = new SourceWriter(); source.WriteLine("using Microsoft.Extensions.DependencyInjection;"); source.WriteEmptyLines(1); - source.WriteLine($"namespace Kyber.Extensions.Scenes;"); + source.WriteLine($"namespace Ion.Extensions.Scenes;"); source.WriteLine($"public static class UseDelegateServiceSceneExtensions"); source.OpenBlock(); diff --git a/Kyber/Kyber.Extensions.Scenes.Tests/Kyber.Extensions.Scenes.Tests.csproj b/Ion/Ion.Extensions.Scenes.Tests/Ion.Extensions.Scenes.Tests.csproj similarity index 71% rename from Kyber/Kyber.Extensions.Scenes.Tests/Kyber.Extensions.Scenes.Tests.csproj rename to Ion/Ion.Extensions.Scenes.Tests/Ion.Extensions.Scenes.Tests.csproj index af08f89..bc76d32 100644 --- a/Kyber/Kyber.Extensions.Scenes.Tests/Kyber.Extensions.Scenes.Tests.csproj +++ b/Ion/Ion.Extensions.Scenes.Tests/Ion.Extensions.Scenes.Tests.csproj @@ -9,7 +9,8 @@ - + + @@ -26,9 +27,10 @@ - - - + + + + diff --git a/Kyber/Kyber.Extensions.Scenes.Tests/SceneTests.cs b/Ion/Ion.Extensions.Scenes.Tests/SceneTests.cs similarity index 89% rename from Kyber/Kyber.Extensions.Scenes.Tests/SceneTests.cs rename to Ion/Ion.Extensions.Scenes.Tests/SceneTests.cs index 9c777ca..a4591f7 100644 --- a/Kyber/Kyber.Extensions.Scenes.Tests/SceneTests.cs +++ b/Ion/Ion.Extensions.Scenes.Tests/SceneTests.cs @@ -1,10 +1,10 @@ -using Kyber.Extensions.Scenes; +using Ion.Extensions.Scenes; using Microsoft.Extensions.DependencyInjection; -using static Kyber.Tests.TestConstants; +using static Ion.Tests.TestConstants; -namespace Kyber.Tests; +namespace Ion.Tests; public class SceneTests { diff --git a/Kyber/Kyber.Extensions.Scenes.Tests/TestUtils.cs b/Ion/Ion.Extensions.Scenes.Tests/TestUtils.cs similarity index 88% rename from Kyber/Kyber.Extensions.Scenes.Tests/TestUtils.cs rename to Ion/Ion.Extensions.Scenes.Tests/TestUtils.cs index f28387c..ea23af3 100644 --- a/Kyber/Kyber.Extensions.Scenes.Tests/TestUtils.cs +++ b/Ion/Ion.Extensions.Scenes.Tests/TestUtils.cs @@ -1,12 +1,12 @@ -using Kyber.Extensions.Scenes; +using Ion.Extensions.Scenes; -namespace Kyber.Tests; +namespace Ion.Tests; internal static class TestUtils { - public static IDisposable SetupWithScenes(int sceneCount, out IServiceProvider services, out KyberApplication game) + public static IDisposable SetupWithScenes(int sceneCount, out IServiceProvider services, out IonApplication game) { - var builder = KyberApplication.CreateBuilder(); + var builder = IonApplication.CreateBuilder(); builder.Services.AddScenes(); game = builder.Build(); diff --git a/Kyber/Kyber.Extensions.Scenes.Tests/Usings.cs b/Ion/Ion.Extensions.Scenes.Tests/Usings.cs similarity index 100% rename from Kyber/Kyber.Extensions.Scenes.Tests/Usings.cs rename to Ion/Ion.Extensions.Scenes.Tests/Usings.cs diff --git a/Kyber/Kyber.Extensions.Scenes/BuilderExtensions.cs b/Ion/Ion.Extensions.Scenes/BuilderExtensions.cs similarity index 82% rename from Kyber/Kyber.Extensions.Scenes/BuilderExtensions.cs rename to Ion/Ion.Extensions.Scenes/BuilderExtensions.cs index b003b85..e99185e 100644 --- a/Kyber/Kyber.Extensions.Scenes/BuilderExtensions.cs +++ b/Ion/Ion.Extensions.Scenes/BuilderExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; public static class BuilderExtensions { @@ -13,7 +13,7 @@ public static IServiceCollection AddScenes(this IServiceCollection services) .AddSingleton(); } - public static IKyberApplication UseScene(this IKyberApplication app, int sceneId, Action configure) + public static IIonApplication UseScene(this IIonApplication app, int sceneId, Action configure) { var sceneManager = app.Services.GetRequiredService(); sceneManager.Register(sceneId, (config, services) => diff --git a/Kyber/Kyber.Extensions.Scenes/CurrentScene.cs b/Ion/Ion.Extensions.Scenes/CurrentScene.cs similarity index 92% rename from Kyber/Kyber.Extensions.Scenes/CurrentScene.cs rename to Ion/Ion.Extensions.Scenes/CurrentScene.cs index 63d06f2..b2fb7f4 100644 --- a/Kyber/Kyber.Extensions.Scenes/CurrentScene.cs +++ b/Ion/Ion.Extensions.Scenes/CurrentScene.cs @@ -1,4 +1,4 @@ -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; public interface ICurrentScene { diff --git a/Kyber/Kyber.Extensions.Scenes/Kyber.Extensions.Scenes.csproj b/Ion/Ion.Extensions.Scenes/Ion.Extensions.Scenes.csproj similarity index 52% rename from Kyber/Kyber.Extensions.Scenes/Kyber.Extensions.Scenes.csproj rename to Ion/Ion.Extensions.Scenes/Ion.Extensions.Scenes.csproj index 3a23b09..520cd0f 100644 --- a/Kyber/Kyber.Extensions.Scenes/Kyber.Extensions.Scenes.csproj +++ b/Ion/Ion.Extensions.Scenes/Ion.Extensions.Scenes.csproj @@ -11,9 +11,10 @@ - - - + + + + diff --git a/Kyber/Kyber.Extensions.Scenes/SceneBuilder.cs b/Ion/Ion.Extensions.Scenes/SceneBuilder.cs similarity index 98% rename from Kyber/Kyber.Extensions.Scenes/SceneBuilder.cs rename to Ion/Ion.Extensions.Scenes/SceneBuilder.cs index 7b3c088..ae851a2 100644 --- a/Kyber/Kyber.Extensions.Scenes/SceneBuilder.cs +++ b/Ion/Ion.Extensions.Scenes/SceneBuilder.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Configuration; -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; internal class SceneBuilder : ISceneBuilder { diff --git a/Kyber/Kyber.Extensions.Scenes/Systems/SceneSystem.cs b/Ion/Ion.Extensions.Scenes/Systems/SceneSystem.cs similarity index 98% rename from Kyber/Kyber.Extensions.Scenes/Systems/SceneSystem.cs rename to Ion/Ion.Extensions.Scenes/Systems/SceneSystem.cs index deb462b..ca28018 100644 --- a/Kyber/Kyber.Extensions.Scenes/Systems/SceneSystem.cs +++ b/Ion/Ion.Extensions.Scenes/Systems/SceneSystem.cs @@ -2,9 +2,9 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Configuration; -using Kyber.Extensions.Debug; +using Ion.Extensions.Debug; -namespace Kyber.Extensions.Scenes; +namespace Ion.Extensions.Scenes; internal delegate Scene SceneBuilderFactory(IConfiguration config, IServiceProvider services); diff --git a/Kyber/Kyber.Generators/GameGenerator.cs b/Ion/Ion.Generators/GameGenerator.cs similarity index 92% rename from Kyber/Kyber.Generators/GameGenerator.cs rename to Ion/Ion.Generators/GameGenerator.cs index 6f52bd2..4596375 100644 --- a/Kyber/Kyber.Generators/GameGenerator.cs +++ b/Ion/Ion.Generators/GameGenerator.cs @@ -7,7 +7,7 @@ using System.Text; using System.Text.RegularExpressions; -namespace Kyber.Generators; +namespace Ion.Generators; [Generator] public class GameGenerator : IIncrementalGenerator @@ -25,7 +25,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context) Debug.WriteLine($"{nameof(GameGenerator)}.CreateAttributes"); // Add the marker attribute to the compilation - context.RegisterPostInitializationOutput(ctx => ctx.AddSource("KyberAttributes.g.cs", SourceText.From(SourceGenerationHelper.Attributes, Encoding.UTF8))); + context.RegisterPostInitializationOutput(ctx => ctx.AddSource("IonAttributes.g.cs", SourceText.From(SourceGenerationHelper.Attributes, Encoding.UTF8))); Debug.WriteLine($"{nameof(GameGenerator)}.GetClasses"); // Do a simple filter for classes @@ -64,7 +64,7 @@ static bool IsSyntaxTargetForGeneration(SyntaxNode node) INamedTypeSymbol attributeContainingTypeSymbol = attributeSymbol.ContainingType; - if (attributeContainingTypeSymbol.ContainingNamespace.Name == "Kyber" && attributeContainingTypeSymbol.Name == "SystemAttribute") return classDeclarationSyntax; + if (attributeContainingTypeSymbol.ContainingNamespace.Name == "Ion" && attributeContainingTypeSymbol.Name == "SystemAttribute") return classDeclarationSyntax; } } @@ -93,7 +93,7 @@ static List GetTypesToGenerate(Compilation compilation, IEnumerable< // Create a list to hold our output var scenesToGenerate = new List(); // Get the semantic representation of our marker attribute - INamedTypeSymbol? systemAttribute = compilation.GetTypeByMetadataName("Kyber.SystemAttribute`1"); + INamedTypeSymbol? systemAttribute = compilation.GetTypeByMetadataName("Ion.SystemAttribute`1"); if (systemAttribute == null) return scenesToGenerate; @@ -109,11 +109,11 @@ static List GetTypesToGenerate(Compilation compilation, IEnumerable< var systemSymbols = sceneClassSymbol.GetAttributes() .Select(a => a.AttributeClass?.ToString() ?? string.Empty) - .Where(ac => ac?.StartsWith("Kyber.SystemAttribute<") ?? false) + .Where(ac => ac?.StartsWith("Ion.SystemAttribute<") ?? false) .Select(ac => { // TODO: Move the getting of the generic type out into a helper method. - var systemTypeName = Regex.Match(ac, @"^Kyber\.SystemAttribute<(.*)>$").Groups[1].Value; + var systemTypeName = Regex.Match(ac, @"^Ion\.SystemAttribute<(.*)>$").Groups[1].Value; if (systemTypeName is null) return null; return compilation.GetTypeByMetadataName(systemTypeName); }).ToArray() ?? new INamedTypeSymbol[0]; @@ -137,7 +137,7 @@ static List GetTypesToGenerate(Compilation compilation, IEnumerable< if (member is IMethodSymbol method) { var methodAttributes = method.GetAttributes(); - if (!methodAttributes.Any(a => a.AttributeClass?.ContainingNamespace.Name == "Kyber")) continue; + if (!methodAttributes.Any(a => a.AttributeClass?.ContainingNamespace.Name == "Ion")) continue; // TODO: Check for UpdateDependsOnAttribute and DrawDependsOnAttribute. if (methodAttributes.Any(a => a.AttributeClass?.Name == "UpdateAttribute")) updateCalls.Add(new LifecycleMethodCall(systemClass, method.Name, int.MaxValue)); if (methodAttributes.Any(a => a.AttributeClass?.Name == "DrawAttribute")) drawCalls.Add(new LifecycleMethodCall(systemClass, method.Name, int.MaxValue)); diff --git a/Kyber/Kyber.Generators/Kyber.Generators.csproj b/Ion/Ion.Generators/Ion.Generators.csproj similarity index 100% rename from Kyber/Kyber.Generators/Kyber.Generators.csproj rename to Ion/Ion.Generators/Ion.Generators.csproj diff --git a/Kyber/Kyber.Generators/Properties/launchSettings.json b/Ion/Ion.Generators/Properties/launchSettings.json similarity index 69% rename from Kyber/Kyber.Generators/Properties/launchSettings.json rename to Ion/Ion.Generators/Properties/launchSettings.json index c5c2672..cb91eeb 100644 --- a/Kyber/Kyber.Generators/Properties/launchSettings.json +++ b/Ion/Ion.Generators/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "Kyber.Generators": { + "Ion.Generators": { "commandName": "Project" } } diff --git a/Kyber/Kyber.Generators/SceneClass.cs b/Ion/Ion.Generators/SceneClass.cs similarity index 95% rename from Kyber/Kyber.Generators/SceneClass.cs rename to Ion/Ion.Generators/SceneClass.cs index 18a3a21..4ae5b45 100644 --- a/Kyber/Kyber.Generators/SceneClass.cs +++ b/Ion/Ion.Generators/SceneClass.cs @@ -1,4 +1,4 @@ -namespace Kyber.Generators; +namespace Ion.Generators; internal record struct BaseClass(string Namespace, string ClassName) { diff --git a/Kyber/Kyber.Generators/SourceGeneratorHelper.cs b/Ion/Ion.Generators/SourceGeneratorHelper.cs similarity index 97% rename from Kyber/Kyber.Generators/SourceGeneratorHelper.cs rename to Ion/Ion.Generators/SourceGeneratorHelper.cs index 7cd510c..a9ab418 100644 --- a/Kyber/Kyber.Generators/SourceGeneratorHelper.cs +++ b/Ion/Ion.Generators/SourceGeneratorHelper.cs @@ -1,11 +1,11 @@ using Microsoft.CodeAnalysis.Text; using SourceGeneratorUtils; -namespace Kyber.Generators; +namespace Ion.Generators; internal static class SourceGenerationHelper { - public const string Attributes = @$"namespace Kyber; + public const string Attributes = @$"namespace Ion; [System.AttributeUsage(System.AttributeTargets.Class, AllowMultiple = true)] public class SceneAttribute : System.Attribute {{ }} diff --git a/Ion/Ion/BuilderExtensions.cs b/Ion/Ion/BuilderExtensions.cs new file mode 100644 index 0000000..0c1bc2b --- /dev/null +++ b/Ion/Ion/BuilderExtensions.cs @@ -0,0 +1,29 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +using Ion.Extensions.Debug; +using Ion.Extensions.Graphics; +using Ion.Extensions.Scenes; +using Ion.Extensions.Coroutines; + +namespace Ion; + +public static class BuilderExtensions +{ + public static IServiceCollection AddIon(this IServiceCollection services, IConfiguration config, Action? configureOptions = null) + { + return services + .AddDebugUtils(config) + .AddVeldridGraphics(config, configureOptions) + .AddScenes() + .AddCoroutines(); + } + + public static IIonApplication UseIon(this IIonApplication app) + { + return app + .UseDebugUtils() + .UseEvents() + .UseVeldridGraphics(); + } +} diff --git a/Ion/Ion/Ion.csproj b/Ion/Ion/Ion.csproj new file mode 100644 index 0000000..5f6da29 --- /dev/null +++ b/Ion/Ion/Ion.csproj @@ -0,0 +1,23 @@ + + + + net7.0 + enable + enable + + + + + + + + + + + + + + + + + diff --git a/Kyber/Kyber_old/Assets/AssetManager.cs b/Ion/Ion_old/Assets/AssetManager.cs similarity index 96% rename from Kyber/Kyber_old/Assets/AssetManager.cs rename to Ion/Ion_old/Assets/AssetManager.cs index ffe0742..e348492 100644 --- a/Kyber/Kyber_old/Assets/AssetManager.cs +++ b/Ion/Ion_old/Assets/AssetManager.cs @@ -1,10 +1,10 @@ using Microsoft.Extensions.DependencyInjection; -using Kyber.Graphics; -using Kyber.Storage; +using Ion.Graphics; +using Ion.Storage; -namespace Kyber.Assets; +namespace Ion.Assets; public interface IAssetManager { diff --git a/Kyber/Kyber_old/Assets/AssetService.cs b/Ion/Ion_old/Assets/AssetService.cs similarity index 99% rename from Kyber/Kyber_old/Assets/AssetService.cs rename to Ion/Ion_old/Assets/AssetService.cs index a789347..ae00183 100644 --- a/Kyber/Kyber_old/Assets/AssetService.cs +++ b/Ion/Ion_old/Assets/AssetService.cs @@ -1,6 +1,6 @@ using System.Collections.Immutable; -namespace Kyber.Assets; +namespace Ion.Assets; public interface IAssetService { diff --git a/Kyber/Kyber_old/Assets/BinaryExtensions.cs b/Ion/Ion_old/Assets/BinaryExtensions.cs similarity index 98% rename from Kyber/Kyber_old/Assets/BinaryExtensions.cs rename to Ion/Ion_old/Assets/BinaryExtensions.cs index 235d943..a70a0bf 100644 --- a/Kyber/Kyber_old/Assets/BinaryExtensions.cs +++ b/Ion/Ion_old/Assets/BinaryExtensions.cs @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace Kyber.Assets; +namespace Ion.Assets; internal static class BinaryExtensions { diff --git a/Kyber/Kyber_old/Assets/Loaders/Texture2DLoader.cs b/Ion/Ion_old/Assets/Loaders/Texture2DLoader.cs similarity index 97% rename from Kyber/Kyber_old/Assets/Loaders/Texture2DLoader.cs rename to Ion/Ion_old/Assets/Loaders/Texture2DLoader.cs index 498dd9e..21f506a 100644 --- a/Kyber/Kyber_old/Assets/Loaders/Texture2DLoader.cs +++ b/Ion/Ion_old/Assets/Loaders/Texture2DLoader.cs @@ -7,7 +7,7 @@ using SixLabors.ImageSharp.Processing; using Veldrid; -namespace Kyber.Assets; +namespace Ion.Assets; public interface IAssetLoader { @@ -28,7 +28,7 @@ public unsafe Texture2D Load(Stream stream, string name, Veldrid.GraphicsDevice foreach (var mipmap in mipmaps) { long mipSize = mipmap.Width * mipmap.Height * sizeof(Rgba32); - if (!mipmap.TryGetSinglePixelSpan(out Span pixelSpan)) throw new KyberException("Unable to get image pixelspan."); + if (!mipmap.TryGetSinglePixelSpan(out Span pixelSpan)) throw new IonException("Unable to get image pixelspan."); fixed (void* pixelPtr = &MemoryMarshal.GetReference(pixelSpan)) { Buffer.MemoryCopy(pixelPtr, allTexDataPtr + offset, mipSize, mipSize); diff --git a/Kyber/Kyber_old/Assets/ProcessedModel.cs b/Ion/Ion_old/Assets/ProcessedModel.cs similarity index 99% rename from Kyber/Kyber_old/Assets/ProcessedModel.cs rename to Ion/Ion_old/Assets/ProcessedModel.cs index c424ef6..dfdc5fb 100644 --- a/Kyber/Kyber_old/Assets/ProcessedModel.cs +++ b/Ion/Ion_old/Assets/ProcessedModel.cs @@ -1,6 +1,6 @@ using Veldrid; -namespace Kyber.Assets; +namespace Ion.Assets; internal class ProcessedModel { diff --git a/Kyber/Kyber_old/Assets/ProcessedTexture.cs b/Ion/Ion_old/Assets/ProcessedTexture.cs similarity index 96% rename from Kyber/Kyber_old/Assets/ProcessedTexture.cs rename to Ion/Ion_old/Assets/ProcessedTexture.cs index 286e530..80bc9ef 100644 --- a/Kyber/Kyber_old/Assets/ProcessedTexture.cs +++ b/Ion/Ion_old/Assets/ProcessedTexture.cs @@ -2,7 +2,7 @@ using VeldridTexture = Veldrid.Texture; -namespace Kyber.Assets; +namespace Ion.Assets; internal class ProcessedTexture { diff --git a/Kyber/Kyber_old/Assets/Texture.cs b/Ion/Ion_old/Assets/Texture.cs similarity index 98% rename from Kyber/Kyber_old/Assets/Texture.cs rename to Ion/Ion_old/Assets/Texture.cs index 6ee0cd4..45d76fd 100644 --- a/Kyber/Kyber_old/Assets/Texture.cs +++ b/Ion/Ion_old/Assets/Texture.cs @@ -1,7 +1,7 @@ using VeldridTexture = Veldrid.Texture; -namespace Kyber.Assets; +namespace Ion.Assets; public interface IAsset : IDisposable { diff --git a/Kyber/Kyber_old/Builder/GameApplication.cs b/Ion/Ion_old/Builder/GameApplication.cs similarity index 99% rename from Kyber/Kyber_old/Builder/GameApplication.cs rename to Ion/Ion_old/Builder/GameApplication.cs index 559b12c..6d98825 100644 --- a/Kyber/Kyber_old/Builder/GameApplication.cs +++ b/Ion/Ion_old/Builder/GameApplication.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace Kyber.Builder; +namespace Ion.Builder; public class GameApplication : IDisposable { diff --git a/Kyber/Kyber_old/Builder/GameApplicationBuilder.cs b/Ion/Ion_old/Builder/GameApplicationBuilder.cs similarity index 97% rename from Kyber/Kyber_old/Builder/GameApplicationBuilder.cs rename to Ion/Ion_old/Builder/GameApplicationBuilder.cs index e6c0ad7..7d33176 100644 --- a/Kyber/Kyber_old/Builder/GameApplicationBuilder.cs +++ b/Ion/Ion_old/Builder/GameApplicationBuilder.cs @@ -6,7 +6,7 @@ using System.Reflection; -namespace Kyber.Builder; +namespace Ion.Builder; public class GameApplicationBuilder { diff --git a/Kyber/Kyber_old/Builder/GameLoopBuilder.cs b/Ion/Ion_old/Builder/GameLoopBuilder.cs similarity index 97% rename from Kyber/Kyber_old/Builder/GameLoopBuilder.cs rename to Ion/Ion_old/Builder/GameLoopBuilder.cs index 400d628..67c5c08 100644 --- a/Kyber/Kyber_old/Builder/GameLoopBuilder.cs +++ b/Ion/Ion_old/Builder/GameLoopBuilder.cs @@ -1,4 +1,4 @@ -namespace Kyber.Builder; +namespace Ion.Builder; public delegate void GameLoopDelegate(GameTime dt); diff --git a/Kyber/Kyber_old/Builder/ServiceCollectionExtensions.cs b/Ion/Ion_old/Builder/ServiceCollectionExtensions.cs similarity index 93% rename from Kyber/Kyber_old/Builder/ServiceCollectionExtensions.cs rename to Ion/Ion_old/Builder/ServiceCollectionExtensions.cs index e427998..06a58f4 100644 --- a/Kyber/Kyber_old/Builder/ServiceCollectionExtensions.cs +++ b/Ion/Ion_old/Builder/ServiceCollectionExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -namespace Kyber.Builder; +namespace Ion.Builder; public static class ServiceCollectionExtensions { diff --git a/Kyber/Kyber_old/Builder/UseMiddlewareExtensions.cs b/Ion/Ion_old/Builder/UseMiddlewareExtensions.cs similarity index 99% rename from Kyber/Kyber_old/Builder/UseMiddlewareExtensions.cs rename to Ion/Ion_old/Builder/UseMiddlewareExtensions.cs index 1e96dec..ccb5072 100644 --- a/Kyber/Kyber_old/Builder/UseMiddlewareExtensions.cs +++ b/Ion/Ion_old/Builder/UseMiddlewareExtensions.cs @@ -2,7 +2,7 @@ using System.Reflection; -namespace Kyber.Builder; +namespace Ion.Builder; [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] public class UpdateAttribute : Attribute { } diff --git a/Kyber/Kyber_old/Color.cs b/Ion/Ion_old/Color.cs similarity index 99% rename from Kyber/Kyber_old/Color.cs rename to Ion/Ion_old/Color.cs index e62e540..ef85756 100644 --- a/Kyber/Kyber_old/Color.cs +++ b/Ion/Ion_old/Color.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Kyber; +namespace Ion; /// /// An RGBA color value backed by a Vector4 (16 bytes). diff --git a/Kyber/Kyber_old/GameConfig.cs b/Ion/Ion_old/GameConfig.cs similarity index 94% rename from Kyber/Kyber_old/GameConfig.cs rename to Ion/Ion_old/GameConfig.cs index 56875a1..d4eee20 100644 --- a/Kyber/Kyber_old/GameConfig.cs +++ b/Ion/Ion_old/GameConfig.cs @@ -1,6 +1,6 @@ using Veldrid; -using Kyber.Graphics; -namespace Kyber; +using Ion.Graphics; +namespace Ion; public interface IGameConfig { @@ -30,7 +30,7 @@ public interface IGameConfig internal class GameConfig : IGameConfig { - public string Title { get; set; } = "Kyber"; + public string Title { get; set; } = "Ion"; public int? WindowHeight { get; set; } = 1080; diff --git a/Kyber/Kyber_old/GameLoop.cs b/Ion/Ion_old/GameLoop.cs similarity index 97% rename from Kyber/Kyber_old/GameLoop.cs rename to Ion/Ion_old/GameLoop.cs index b301bb2..bd865d8 100644 --- a/Kyber/Kyber_old/GameLoop.cs +++ b/Ion/Ion_old/GameLoop.cs @@ -1,10 +1,10 @@ -using Kyber.Builder; -using Kyber.Graphics; -using Kyber.Utils; +using Ion.Builder; +using Ion.Graphics; +using Ion.Utils; using System.Diagnostics; -namespace Kyber; +namespace Ion; public record struct GameExitEvent(); diff --git a/Kyber/Kyber_old/Graphics/2D/Components.cs b/Ion/Ion_old/Graphics/2D/Components.cs similarity index 96% rename from Kyber/Kyber_old/Graphics/2D/Components.cs rename to Ion/Ion_old/Graphics/2D/Components.cs index 11219cb..5a4bca7 100644 --- a/Kyber/Kyber_old/Graphics/2D/Components.cs +++ b/Ion/Ion_old/Graphics/2D/Components.cs @@ -1,4 +1,4 @@ -namespace Kyber.Graphics; +namespace Ion.Graphics; public struct Position2dComponent { diff --git a/Kyber/Kyber_old/Graphics/2D/SpriteBatch.cs b/Ion/Ion_old/Graphics/2D/SpriteBatch.cs similarity index 99% rename from Kyber/Kyber_old/Graphics/2D/SpriteBatch.cs rename to Ion/Ion_old/Graphics/2D/SpriteBatch.cs index ded18c5..d21e4a8 100644 --- a/Kyber/Kyber_old/Graphics/2D/SpriteBatch.cs +++ b/Ion/Ion_old/Graphics/2D/SpriteBatch.cs @@ -1,10 +1,10 @@ using Veldrid; using Veldrid.SPIRV; -using Kyber.Assets; -using Kyber.Utils; +using Ion.Assets; +using Ion.Utils; -namespace Kyber.Graphics; +namespace Ion.Graphics; [Flags] public enum SpriteEffect diff --git a/Kyber/Kyber_old/Graphics/2D/SpriteBatchManager.cs b/Ion/Ion_old/Graphics/2D/SpriteBatchManager.cs similarity index 99% rename from Kyber/Kyber_old/Graphics/2D/SpriteBatchManager.cs rename to Ion/Ion_old/Graphics/2D/SpriteBatchManager.cs index 7da6168..9c4e4b9 100644 --- a/Kyber/Kyber_old/Graphics/2D/SpriteBatchManager.cs +++ b/Ion/Ion_old/Graphics/2D/SpriteBatchManager.cs @@ -1,4 +1,4 @@ -namespace Kyber.Graphics; +namespace Ion.Graphics; internal class SpriteBatchManager { diff --git a/Kyber/Kyber_old/Graphics/GraphicsContext.cs b/Ion/Ion_old/Graphics/GraphicsContext.cs similarity index 97% rename from Kyber/Kyber_old/Graphics/GraphicsContext.cs rename to Ion/Ion_old/Graphics/GraphicsContext.cs index 0568dda..a425b8e 100644 --- a/Kyber/Kyber_old/Graphics/GraphicsContext.cs +++ b/Ion/Ion_old/Graphics/GraphicsContext.cs @@ -1,8 +1,8 @@ -using Kyber.Utils; +using Ion.Utils; using Veldrid; -namespace Kyber.Graphics; +namespace Ion.Graphics; internal class GraphicsContext : IGraphicsContext, IDisposable { @@ -40,7 +40,7 @@ public void Initialize() if (!GraphicsDevice.IsBackendSupported(_config.PreferredBackend)) { - throw new KyberException($"Unsupported backend! ({_config.PreferredBackend}"); + throw new IonException($"Unsupported backend! ({_config.PreferredBackend}"); } GraphicsDevice = Veldrid.StartupUtilities.VeldridStartup.CreateGraphicsDevice(_window.Sdl2Window, new GraphicsDeviceOptions() diff --git a/Kyber/Kyber_old/Graphics/Shared/Components.cs b/Ion/Ion_old/Graphics/Shared/Components.cs similarity index 78% rename from Kyber/Kyber_old/Graphics/Shared/Components.cs rename to Ion/Ion_old/Graphics/Shared/Components.cs index 855b215..3aeed26 100644 --- a/Kyber/Kyber_old/Graphics/Shared/Components.cs +++ b/Ion/Ion_old/Graphics/Shared/Components.cs @@ -1,6 +1,6 @@ -using Kyber.Assets; +using Ion.Assets; -namespace Kyber.Graphics; +namespace Ion.Graphics; public record struct TextureComponent(int TextureId) diff --git a/Ion/Ion_old/Hosting/HostBuilderExtensions.cs b/Ion/Ion_old/Hosting/HostBuilderExtensions.cs new file mode 100644 index 0000000..5687914 --- /dev/null +++ b/Ion/Ion_old/Hosting/HostBuilderExtensions.cs @@ -0,0 +1,46 @@ +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.DependencyInjection; + +using Ion.Builder; + +namespace Ion.Hosting; + +public static class IonHostBuilderExtensions +{ + /// + /// Configures the services for Ion. + /// + /// The host builder instance. + /// Callback to configure the basic options for the game. + /// The host builder instance. + public static IHostBuilder ConfigureIon(this IHostBuilder hostBuilder, Action configure) + { + return hostBuilder.ConfigureServices((hostContext, services) => + { + //services.AddSingleton(); + //services.AddSingleton(); + //services.AddTransient(); + //services.AddSingleton(); + + //services.AddSingleton(); + //services.AddSingleton(); + //services.AddScoped(); + //services.AddSingleton(); + + //services.AddSingleton(); + + + + + //services.AddScoped(svcs => World.Create()); + + //var gameBuilder = new GameApplication(services); + //configure(gameBuilder); + + //services.AddSingleton(gameBuilder.Config); + //services.AddSingleton(services => gameBuilder.Build(services)); + + //services.AddHostedService(); + }); + } +} \ No newline at end of file diff --git a/Kyber/Kyber_old/Input/InputState.cs b/Ion/Ion_old/Input/InputState.cs similarity index 99% rename from Kyber/Kyber_old/Input/InputState.cs rename to Ion/Ion_old/Input/InputState.cs index 5e89d8d..a3119c9 100644 --- a/Kyber/Kyber_old/Input/InputState.cs +++ b/Ion/Ion_old/Input/InputState.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; internal class InputState : IInputState { diff --git a/Kyber/Kyber.Extensions.Graphics.Veldrid/Input/KeyEvent.cs b/Ion/Ion_old/Input/KeyEvent.cs similarity index 96% rename from Kyber/Kyber.Extensions.Graphics.Veldrid/Input/KeyEvent.cs rename to Ion/Ion_old/Input/KeyEvent.cs index a68b073..93ec17a 100644 --- a/Kyber/Kyber.Extensions.Graphics.Veldrid/Input/KeyEvent.cs +++ b/Ion/Ion_old/Input/KeyEvent.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public partial struct KeyEvent { public Key Key; diff --git a/Kyber/Kyber_old/Input/MouseEvent.cs b/Ion/Ion_old/Input/MouseEvent.cs similarity index 94% rename from Kyber/Kyber_old/Input/MouseEvent.cs rename to Ion/Ion_old/Input/MouseEvent.cs index c37af59..1cd86b2 100644 --- a/Kyber/Kyber_old/Input/MouseEvent.cs +++ b/Ion/Ion_old/Input/MouseEvent.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public struct MouseEvent { diff --git a/Kyber/Kyber_old/Kyber.csproj b/Ion/Ion_old/Ion.csproj similarity index 92% rename from Kyber/Kyber_old/Kyber.csproj rename to Ion/Ion_old/Ion.csproj index e949e99..149cddc 100644 --- a/Kyber/Kyber_old/Kyber.csproj +++ b/Ion/Ion_old/Ion.csproj @@ -20,7 +20,8 @@ - + + @@ -42,7 +43,8 @@ - + + - + diff --git a/Kyber/Kyber_old/MathHelper.cs b/Ion/Ion_old/MathHelper.cs similarity index 99% rename from Kyber/Kyber_old/MathHelper.cs rename to Ion/Ion_old/MathHelper.cs index d62a67a..c6771ef 100644 --- a/Kyber/Kyber_old/MathHelper.cs +++ b/Ion/Ion_old/MathHelper.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; /// /// Contains commonly used precalculated values and mathematical operations. (Imported from XNA/MonoGame) diff --git a/Kyber/Kyber_old/MemUtils.cs b/Ion/Ion_old/MemUtils.cs similarity index 99% rename from Kyber/Kyber_old/MemUtils.cs rename to Ion/Ion_old/MemUtils.cs index 2baf4b9..82213ac 100644 --- a/Kyber/Kyber_old/MemUtils.cs +++ b/Ion/Ion_old/MemUtils.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; //namespace Ez.Memory -namespace Kyber; +namespace Ion; /// /// A static class with useful methods for memory manipulation operations. diff --git a/Kyber/Kyber_old/Metrics.cs b/Ion/Ion_old/Metrics.cs similarity index 98% rename from Kyber/Kyber_old/Metrics.cs rename to Ion/Ion_old/Metrics.cs index 893ea86..004894b 100644 --- a/Kyber/Kyber_old/Metrics.cs +++ b/Ion/Ion_old/Metrics.cs @@ -1,4 +1,4 @@ -namespace Kyber; +namespace Ion; public interface IMetrics { diff --git a/Kyber/Kyber_old/Point.cs b/Ion/Ion_old/Point.cs similarity index 99% rename from Kyber/Kyber_old/Point.cs rename to Ion/Ion_old/Point.cs index dfc6a7a..25c9573 100644 --- a/Kyber/Kyber_old/Point.cs +++ b/Ion/Ion_old/Point.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -namespace Kyber; +namespace Ion; /// /// Describes a 2D-point. diff --git a/Kyber/Kyber_old/Rectangle.cs b/Ion/Ion_old/Rectangle.cs similarity index 99% rename from Kyber/Kyber_old/Rectangle.cs rename to Ion/Ion_old/Rectangle.cs index e87e055..899e494 100644 --- a/Kyber/Kyber_old/Rectangle.cs +++ b/Ion/Ion_old/Rectangle.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace Kyber; +namespace Ion; [DebuggerDisplay("{DebugDisplayString,nq}")] public struct Rectangle : IEquatable diff --git a/Kyber/Kyber_old/RectangleF.cs b/Ion/Ion_old/RectangleF.cs similarity index 99% rename from Kyber/Kyber_old/RectangleF.cs rename to Ion/Ion_old/RectangleF.cs index a47f36c..05f6719 100644 --- a/Kyber/Kyber_old/RectangleF.cs +++ b/Ion/Ion_old/RectangleF.cs @@ -1,6 +1,6 @@ using System.Diagnostics; -namespace Kyber; +namespace Ion; [DebuggerDisplay("{DebugDisplayString,nq}")] public struct RectangleF : IEquatable diff --git a/Kyber/Kyber_old/Scenes/CurrentScene.cs b/Ion/Ion_old/Scenes/CurrentScene.cs similarity index 94% rename from Kyber/Kyber_old/Scenes/CurrentScene.cs rename to Ion/Ion_old/Scenes/CurrentScene.cs index da94b92..1e6d746 100644 --- a/Kyber/Kyber_old/Scenes/CurrentScene.cs +++ b/Ion/Ion_old/Scenes/CurrentScene.cs @@ -1,4 +1,4 @@ -namespace Kyber.Scenes; +namespace Ion.Scenes; public interface ICurrentScene { diff --git a/Kyber/Kyber_old/Scenes/IGameBuilderExtensions.cs b/Ion/Ion_old/Scenes/IGameBuilderExtensions.cs similarity index 96% rename from Kyber/Kyber_old/Scenes/IGameBuilderExtensions.cs rename to Ion/Ion_old/Scenes/IGameBuilderExtensions.cs index bf7f7c3..301acdc 100644 --- a/Kyber/Kyber_old/Scenes/IGameBuilderExtensions.cs +++ b/Ion/Ion_old/Scenes/IGameBuilderExtensions.cs @@ -1,10 +1,10 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Kyber.Scenes; -using Kyber.Builder; +using Ion.Scenes; +using Ion.Builder; -namespace Kyber.Hosting.Scenes; +namespace Ion.Hosting.Scenes; public static class IGameBuilderExtensions { diff --git a/Kyber/Kyber_old/Scenes/Scene.cs b/Ion/Ion_old/Scenes/Scene.cs similarity index 96% rename from Kyber/Kyber_old/Scenes/Scene.cs rename to Ion/Ion_old/Scenes/Scene.cs index 659797e..57818fb 100644 --- a/Kyber/Kyber_old/Scenes/Scene.cs +++ b/Ion/Ion_old/Scenes/Scene.cs @@ -1,4 +1,4 @@ -namespace Kyber.Scenes; +namespace Ion.Scenes; public sealed class Scene : IInitializeSystem, IUpdateSystem, IFixedUpdateSystem, IRenderSystem, IDestroySystem { diff --git a/Kyber/Kyber_old/Scenes/SceneBuilder.cs b/Ion/Ion_old/Scenes/SceneBuilder.cs similarity index 93% rename from Kyber/Kyber_old/Scenes/SceneBuilder.cs rename to Ion/Ion_old/Scenes/SceneBuilder.cs index bad6215..0139a59 100644 --- a/Kyber/Kyber_old/Scenes/SceneBuilder.cs +++ b/Ion/Ion_old/Scenes/SceneBuilder.cs @@ -1,9 +1,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Kyber.Scenes; +using Ion.Scenes; -namespace Kyber.Hosting.Scenes; +namespace Ion.Hosting.Scenes; internal class SceneBuilder : ISceneBuilder { diff --git a/Kyber/Kyber_old/Scenes/SceneManager.cs b/Ion/Ion_old/Scenes/SceneManager.cs similarity index 98% rename from Kyber/Kyber_old/Scenes/SceneManager.cs rename to Ion/Ion_old/Scenes/SceneManager.cs index 5f495c3..b67db78 100644 --- a/Kyber/Kyber_old/Scenes/SceneManager.cs +++ b/Ion/Ion_old/Scenes/SceneManager.cs @@ -1,9 +1,9 @@ using Microsoft.Extensions.DependencyInjection; -using Kyber.Hosting.Scenes; -using Kyber.Scenes; -using Kyber.Scenes.Transitions; +using Ion.Hosting.Scenes; +using Ion.Scenes; +using Ion.Scenes.Transitions; -namespace Kyber; +namespace Ion; public sealed class SceneManager : IInitializeSystem, IUpdateSystem, IFixedUpdateSystem, IRenderSystem, IDestroySystem, IDisposable, ISceneManager { diff --git a/Kyber/Kyber_old/Scenes/Transitions/FadeTransition.cs b/Ion/Ion_old/Scenes/Transitions/FadeTransition.cs similarity index 98% rename from Kyber/Kyber_old/Scenes/Transitions/FadeTransition.cs rename to Ion/Ion_old/Scenes/Transitions/FadeTransition.cs index 17fcf79..155884a 100644 --- a/Kyber/Kyber_old/Scenes/Transitions/FadeTransition.cs +++ b/Ion/Ion_old/Scenes/Transitions/FadeTransition.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Kyber.Scenes.Transitions; +namespace Ion.Scenes.Transitions; /// /// A standard fade-to-black transition. diff --git a/Kyber/Kyber_old/Scenes/Transitions/Transition.cs b/Ion/Ion_old/Scenes/Transitions/Transition.cs similarity index 98% rename from Kyber/Kyber_old/Scenes/Transitions/Transition.cs rename to Ion/Ion_old/Scenes/Transitions/Transition.cs index 200c83d..c4f22b9 100644 --- a/Kyber/Kyber_old/Scenes/Transitions/Transition.cs +++ b/Ion/Ion_old/Scenes/Transitions/Transition.cs @@ -1,4 +1,4 @@ -namespace Kyber.Scenes.Transitions; +namespace Ion.Scenes.Transitions; /// /// A basic enum to indicate the transition direction. diff --git a/Kyber/Kyber_old/Storage/PersistentStorage.cs b/Ion/Ion_old/Storage/PersistentStorage.cs similarity index 97% rename from Kyber/Kyber_old/Storage/PersistentStorage.cs rename to Ion/Ion_old/Storage/PersistentStorage.cs index 802b8cf..a58bb15 100644 --- a/Kyber/Kyber_old/Storage/PersistentStorage.cs +++ b/Ion/Ion_old/Storage/PersistentStorage.cs @@ -1,4 +1,4 @@ -namespace Kyber.Storage; +namespace Ion.Storage; internal class PersistentStorage : IPersistentStorage { diff --git a/Kyber/Kyber_old/Storage/PersistentStorageProvider.cs b/Ion/Ion_old/Storage/PersistentStorageProvider.cs similarity index 98% rename from Kyber/Kyber_old/Storage/PersistentStorageProvider.cs rename to Ion/Ion_old/Storage/PersistentStorageProvider.cs index 40d17ae..e8f1981 100644 --- a/Kyber/Kyber_old/Storage/PersistentStorageProvider.cs +++ b/Ion/Ion_old/Storage/PersistentStorageProvider.cs @@ -1,4 +1,4 @@ -namespace Kyber.Storage; +namespace Ion.Storage; internal class PersistentStorageProvider : IPersistentStorageProvider { diff --git a/Kyber/Kyber_old/Window.cs b/Ion/Ion_old/Window.cs similarity index 98% rename from Kyber/Kyber_old/Window.cs rename to Ion/Ion_old/Window.cs index 58cf28f..f14b4f6 100644 --- a/Kyber/Kyber_old/Window.cs +++ b/Ion/Ion_old/Window.cs @@ -1,9 +1,9 @@ using Veldrid; using Veldrid.Sdl2; -using Kyber.Graphics; +using Ion.Graphics; -namespace Kyber; +namespace Ion; internal class Window : IWindow { @@ -129,8 +129,8 @@ public Window(IGameConfig config, ILogger logger, IEventEmitter eventEmi WindowWidth = _config.WindowWidth ?? 960, WindowHeight = _config.WindowHeight ?? 540, WindowInitialState = _config.WindowState, - WindowTitle = _title = _config.Title ?? "Kyber" - }; + WindowTitle = _title = _config.Title ?? "Ion" + }; } public void Initialize() diff --git a/Kyber.Examples/Kyber.Examples.Generators/Kyber.Examples.Generators.csproj b/Kyber.Examples/Kyber.Examples.Generators/Kyber.Examples.Generators.csproj deleted file mode 100644 index 2298e9f..0000000 --- a/Kyber.Examples/Kyber.Examples.Generators/Kyber.Examples.Generators.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - Exe - net7.0 - enable - enable - preview - true - $(BaseIntermediateOutputPath)Generated - true - Debug;Release;DebugGenerators - - - - - - - - diff --git a/Kyber/Kyber.Core.Abstractions.Tests/Usings.cs b/Kyber/Kyber.Core.Abstractions.Tests/Usings.cs deleted file mode 100644 index 2ad40b5..0000000 --- a/Kyber/Kyber.Core.Abstractions.Tests/Usings.cs +++ /dev/null @@ -1,3 +0,0 @@ -global using Xunit; - -global using static Kyber.Tests.TestConstants; \ No newline at end of file diff --git a/Kyber/Kyber.Core/Builder/BuilderExtensions.cs b/Kyber/Kyber.Core/Builder/BuilderExtensions.cs deleted file mode 100644 index a6cead9..0000000 --- a/Kyber/Kyber.Core/Builder/BuilderExtensions.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Kyber; - -public static class BuilderExtensions -{ - /// - /// Adds the EventSystem to the application's middleware pipeline. - /// - /// The instance. - /// The instance. - public static IKyberApplication UseEvents(this IKyberApplication app) - { - return app.UseSystem(); - } -} diff --git a/Kyber/Kyber.Core_old/KyberException.cs b/Kyber/Kyber.Core_old/KyberException.cs deleted file mode 100644 index 934a56b..0000000 --- a/Kyber/Kyber.Core_old/KyberException.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace Kyber; - -public class KyberException : Exception { - /// - /// Constructs a new KyberException with the given message. - /// - /// The exception message. - public KyberException(string message) : base(message) { } - - /// - /// Constructs a new KyberException with the given message and inner exception. - /// - /// The exception message. - /// The inner exception. - public KyberException(string message, Exception innerException) : base(message, innerException) { } -} diff --git a/Kyber/Kyber.Extensions.Graphics.Abstractions/Kyber.Extensions.Graphics.Abstractions.csproj b/Kyber/Kyber.Extensions.Graphics.Abstractions/Kyber.Extensions.Graphics.Abstractions.csproj deleted file mode 100644 index 5938a38..0000000 --- a/Kyber/Kyber.Extensions.Graphics.Abstractions/Kyber.Extensions.Graphics.Abstractions.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - net7.0 - enable - enable - - - - - - - - - - - - - - - - diff --git a/Kyber/Kyber.Extensions.Scenes.Abstractions/Kyber.Extensions.Scenes.Abstractions.csproj b/Kyber/Kyber.Extensions.Scenes.Abstractions/Kyber.Extensions.Scenes.Abstractions.csproj deleted file mode 100644 index 0921941..0000000 --- a/Kyber/Kyber.Extensions.Scenes.Abstractions/Kyber.Extensions.Scenes.Abstractions.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net7.0 - enable - enable - - - - - - - - - - - - diff --git a/Kyber/Kyber/BuilderExtensions.cs b/Kyber/Kyber/BuilderExtensions.cs deleted file mode 100644 index 253754b..0000000 --- a/Kyber/Kyber/BuilderExtensions.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -using Kyber.Extensions.Debug; -using Kyber.Extensions.Graphics; -using Kyber.Extensions.Scenes; -using Kyber.Extensions.Coroutines; - -namespace Kyber; - -public static class BuilderExtensions -{ - public static IServiceCollection AddKyber(this IServiceCollection services, IConfiguration config, Action? configureOptions = null) - { - return services - .AddDebugUtils(config) - .AddVeldridGraphics(config, configureOptions) - .AddScenes() - .AddCoroutines(); - } - - public static IKyberApplication UseKyber(this IKyberApplication app) - { - return app - .UseDebugUtils() - .UseEvents() - .UseVeldridGraphics(); - } -} diff --git a/Kyber/Kyber/Kyber.csproj b/Kyber/Kyber/Kyber.csproj deleted file mode 100644 index c24085b..0000000 --- a/Kyber/Kyber/Kyber.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - net7.0 - enable - enable - - - - - - - - - - - - - - - - diff --git a/Kyber/Kyber_old/Hosting/HostBuilderExtensions.cs b/Kyber/Kyber_old/Hosting/HostBuilderExtensions.cs deleted file mode 100644 index 7182752..0000000 --- a/Kyber/Kyber_old/Hosting/HostBuilderExtensions.cs +++ /dev/null @@ -1,46 +0,0 @@ -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.DependencyInjection; - -using Kyber.Builder; - -namespace Kyber.Hosting; - -public static class KyberHostBuilderExtensions -{ - /// - /// Configures the services for Kyber. - /// - /// The host builder instance. - /// Callback to configure the basic options for the game. - /// The host builder instance. - public static IHostBuilder ConfigureKyber(this IHostBuilder hostBuilder, Action configure) - { - return hostBuilder.ConfigureServices((hostContext, services) => - { - //services.AddSingleton(); - //services.AddSingleton(); - //services.AddTransient(); - //services.AddSingleton(); - - //services.AddSingleton(); - //services.AddSingleton(); - //services.AddScoped(); - //services.AddSingleton(); - - //services.AddSingleton(); - - - - - //services.AddScoped(svcs => World.Create()); - - //var gameBuilder = new GameApplication(services); - //configure(gameBuilder); - - //services.AddSingleton(gameBuilder.Config); - //services.AddSingleton(services => gameBuilder.Build(services)); - - //services.AddHostedService(); - }); - } -} \ No newline at end of file diff --git a/LICENSE b/LICENSE index 44c44fa..e1a33ca 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Jim Buck +Copyright (c) 2024 Jim Buck Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index cc0d2a4..a06943b 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,39 @@ -# Kyber -A modern, modular, middleware-based game engine for C#. +# Ion Engine +A small, positively-charged, middleware-based game engine for C#. -- **Modern:** Built using modern C# features and design patterns, Kyber setup closely resembles ASP.NET Core setup. -- **Modular:** Kyber is a collection of modules that build on the `Kyber.Core` module. You can use as many or as few modules as you want. +- **Modern:** Built using modern C# features and design patterns, Ion setup closely resembles ASP.NET Core setup. +- **Modular:** Ion is a collection of modules that build on the `Ion.Core` module. You can use as many or as few modules as you want. - **Middleware:** Using middleware, you can easily add functionality to the engine without having to modify the engine itself. This allows for easy extensibility and customization. ---- ## Modules -### Kyber.Core +### Ion.Core A simple, modern code-first game engine inspired by Monogame and Bevy with an API like ASP.NET Core. This core module contains the core engine and all of the core features: - Application builder - Game loop - Events - Storage -### Kyber.Extensions.Scenes +### Ion.Extensions.Scenes Adds support for scenes that each have thier own scope for dependency injection! -### Kyber.Extensions.Coroutines +### Ion.Extensions.Coroutines Adds support for coroutines, allowing for async code to be run in a synchronous manner. -### Kyber.Extensions.Debug +### Ion.Extensions.Debug Adds support for debug utils such as a trace profiler and debug renderer. -### Kyber.Extensions.Graphics.Veldrid +### Ion.Extensions.Graphics.Veldrid Adds window, input, and graphics support using the Veldrid API. Includes a built-in sprite batch for easy 2D rendering. ---- ## Planned Modules - - **Kyber.Extensions.UI** - - **Kyber.Extensions.Networking** - - **Kyber.Extensions.Physics** + - **Ion.Extensions.UI** + - **Ion.Extensions.Networking** + - **Ion.Extensions.Physics** - Multi-platform support ## Built Using @@ -53,4 +53,4 @@ WIP ---- ## License -Kyber is [MIT licensed](./LICENSE). +Ion Engine is [MIT licensed](./LICENSE). diff --git a/coverage.runsettings b/coverage.runsettings index b4849b6..c76a8c7 100644 --- a/coverage.runsettings +++ b/coverage.runsettings @@ -5,8 +5,8 @@ cobertura - [Kyber]*,[Kyber.*]* - [*]WrapperValueObject;[*]AutoGeneratedProgram;[Kyber.Examples.*]* +[Ion]*,[Ion.*]* +[*]WrapperValueObject;[*]AutoGeneratedProgram;[Ion.Examples.*]* Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute false diff --git a/package.json b/package.json index 3725d9a..d2581bb 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "kyber", + "name": "ion-engine", "version": "0.0.0", - "description": "Tasks for the Kyber solution.", + "description": "Tasks for the Ion solution.", "scripts": { - "open-trace": "npx perfetto-trace-viewer .\\Kyber.Examples\\Kyber.Examples.SpriteRenderer\\bin\\Release\\net6.0\\trace.json" + "open-trace": "npx perfetto-trace-viewer .\\Ion.Examples\\Ion.Examples.SpriteRenderer\\bin\\Release\\net6.0\\trace.json" }, "license": "ISC" , "-vs-binding":{"ProjectOpened":["open-trace"]}