diff --git a/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 b/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 index cf1aed5..5a113d9 100644 Binary files a/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 and b/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Firebird2D/FileContentIndex/2a7d3a25-2a0b-4413-bea8-93bd330e65a8.vsidx b/.vs/Firebird2D/FileContentIndex/2a7d3a25-2a0b-4413-bea8-93bd330e65a8.vsidx deleted file mode 100644 index 57b85ea..0000000 Binary files a/.vs/Firebird2D/FileContentIndex/2a7d3a25-2a0b-4413-bea8-93bd330e65a8.vsidx and /dev/null differ diff --git a/.vs/Firebird2D/FileContentIndex/b6616c4d-55c4-43e9-8112-8e89a42ad6a1.vsidx b/.vs/Firebird2D/FileContentIndex/b6616c4d-55c4-43e9-8112-8e89a42ad6a1.vsidx deleted file mode 100644 index e9bacb2..0000000 Binary files a/.vs/Firebird2D/FileContentIndex/b6616c4d-55c4-43e9-8112-8e89a42ad6a1.vsidx and /dev/null differ diff --git a/.vs/Firebird2D/FileContentIndex/b6e73397-5055-47b3-bdf6-b50d7d5bebe1.vsidx b/.vs/Firebird2D/FileContentIndex/b6e73397-5055-47b3-bdf6-b50d7d5bebe1.vsidx deleted file mode 100644 index 8ea2ba2..0000000 Binary files a/.vs/Firebird2D/FileContentIndex/b6e73397-5055-47b3-bdf6-b50d7d5bebe1.vsidx and /dev/null differ diff --git a/.vs/Firebird2D/FileContentIndex/cb4175b0-1412-46b2-9cfe-044f20aa07ca.vsidx b/.vs/Firebird2D/FileContentIndex/cb4175b0-1412-46b2-9cfe-044f20aa07ca.vsidx deleted file mode 100644 index 4076b39..0000000 Binary files a/.vs/Firebird2D/FileContentIndex/cb4175b0-1412-46b2-9cfe-044f20aa07ca.vsidx and /dev/null differ diff --git a/.vs/Firebird2D/FileContentIndex/f37dd64a-7e74-4c25-b956-52d48cec43c4.vsidx b/.vs/Firebird2D/FileContentIndex/f37dd64a-7e74-4c25-b956-52d48cec43c4.vsidx deleted file mode 100644 index c548e78..0000000 Binary files a/.vs/Firebird2D/FileContentIndex/f37dd64a-7e74-4c25-b956-52d48cec43c4.vsidx and /dev/null differ diff --git a/.vs/Firebird2D/v17/.futdcache.v2 b/.vs/Firebird2D/v17/.futdcache.v2 index a286d90..58a806a 100644 Binary files a/.vs/Firebird2D/v17/.futdcache.v2 and b/.vs/Firebird2D/v17/.futdcache.v2 differ diff --git a/.vs/Firebird2D/v17/.suo b/.vs/Firebird2D/v17/.suo index a76990b..2afb6cf 100644 Binary files a/.vs/Firebird2D/v17/.suo and b/.vs/Firebird2D/v17/.suo differ diff --git a/.vs/Firebird2D/v17/DocumentLayout.json b/.vs/Firebird2D/v17/DocumentLayout.json index 2a8dce4..cd54b67 100644 --- a/.vs/Firebird2D/v17/DocumentLayout.json +++ b/.vs/Firebird2D/v17/DocumentLayout.json @@ -1,12 +1,221 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\", - "Documents": [], + "WorkspaceRootPath": "G:\\Coding\\Firebird2D\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\game.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\game.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{38CCA723-C113-4E44-B074-F9B709B0EEB4}|Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj|g:\\coding\\firebird2d\\firebird2d.keymapper\\keymapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{38CCA723-C113-4E44-B074-F9B709B0EEB4}|Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj|solutionrelative:firebird2d.keymapper\\keymapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\firebirdevent.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\firebirdevent.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\core\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\core\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\core\\inputmapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\core\\inputmapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|g:\\coding\\firebird2d\\firebird2d.logger\\firebird2d.logger.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|solutionrelative:firebird2d.logger\\firebird2d.logger.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\eventbus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\eventbus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\i_pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\i_pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{8B04689D-A8E2-494B-922E-06F5EF313297}|Documentation{8B04689D-A8E2-494B-922E-06F5EF313297}|G:\\Coding\\Firebird2D\\ClassDiagram.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}", + "RelativeMoniker": "D:0:0:{8B04689D-A8E2-494B-922E-06F5EF313297}|Documentation{8B04689D-A8E2-494B-922E-06F5EF313297}|solutionrelative:ClassDiagram.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}" + }, + { + "AbsoluteMoniker": "D:0:0:{AF025062-8AED-4E0B-91A4-CD4245F9DB46}|Firebird2D.Requirement\\Firebird2D.Requirement.csproj|g:\\coding\\firebird2d\\firebird2d.requirement\\require.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{AF025062-8AED-4E0B-91A4-CD4245F9DB46}|Firebird2D.Requirement\\Firebird2D.Requirement.csproj|solutionrelative:firebird2d.requirement\\require.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|g:\\coding\\firebird2d\\firebird2d.logger\\gamelogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|solutionrelative:firebird2d.logger\\gamelogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], "DocumentGroupContainers": [ { "Orientation": 0, "VerticalTabListWidth": 256, - "DocumentGroups": [] + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 8, + "Children": [ + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "Firebird2D.Logger", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "RelativeDocumentMoniker": "Firebird2D.Logger\\Firebird2D.Logger.csproj", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "RelativeToolTip": "Firebird2D.Logger\\Firebird2D.Logger.csproj", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2025-04-18T19:04:18.723Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "InputMapper.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D\\Core\\InputMapper.cs", + "RelativeDocumentMoniker": "Firebird2D\\Core\\InputMapper.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D\\Core\\InputMapper.cs", + "RelativeToolTip": "Firebird2D\\Core\\InputMapper.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAuwAsAAAAUAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-18T07:43:42.972Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "MainWindow.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D\\Core\\MainWindow.cs", + "RelativeDocumentMoniker": "Firebird2D\\Core\\MainWindow.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D\\Core\\MainWindow.cs", + "RelativeToolTip": "Firebird2D\\Core\\MainWindow.cs", + "ViewState": "AQIAAAwAAAAAAAAAAAAAAFUAAAAwAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-18T07:43:27.389Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "KeyMapper.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\KeyMapper.cs", + "RelativeDocumentMoniker": "Firebird2D.KeyMapper\\KeyMapper.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\KeyMapper.cs", + "RelativeToolTip": "Firebird2D.KeyMapper\\KeyMapper.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAUAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-18T07:43:14.35Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "I_Pipeline.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\I_Pipeline.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\I_Pipeline.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\I_Pipeline.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\I_Pipeline.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABEAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T20:10:17.86Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "Pipeline.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Pipeline.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\Pipeline.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Pipeline.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\Pipeline.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABsAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T19:45:23.048Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "FirebirdEvent.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\FirebirdEvent.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\FirebirdEvent.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\FirebirdEvent.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\FirebirdEvent.cs", + "ViewState": "AQIAAH8BAAAAAAAAAAAAwK4BAAAVAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T19:42:10.988Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "EventBus.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventBus.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\EventBus.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventBus.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\EventBus.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAACMAAAAJAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T19:40:01.999Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Game.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D\\Game.cs", + "RelativeDocumentMoniker": "Firebird2D\\Game.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D\\Game.cs", + "RelativeToolTip": "Firebird2D\\Game.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAB0AAAAwAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-18T07:15:00.042Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "ClassDiagram.md", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\ClassDiagram.md", + "RelativeDocumentMoniker": "ClassDiagram.md", + "ToolTip": "G:\\Coding\\Firebird2D\\ClassDiagram.md", + "RelativeToolTip": "ClassDiagram.md", + "ViewState": "AQIAAAAAAAAAAAAAAAAAACcAAAAFAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|", + "WhenOpened": "2025-04-17T17:57:06.258Z" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "Require.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Require.cs", + "RelativeDocumentMoniker": "Firebird2D.Requirement\\Require.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Require.cs", + "RelativeToolTip": "Firebird2D.Requirement\\Require.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T17:56:35.49Z" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "GameLogger.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\GameLogger.cs", + "RelativeDocumentMoniker": "Firebird2D.Logger\\GameLogger.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\GameLogger.cs", + "RelativeToolTip": "Firebird2D.Logger\\GameLogger.cs", + "ViewState": "AQIAAAMAAAAAAAAAAIBJwAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T17:56:23.324Z" + } + ] + } + ] } ] } \ No newline at end of file diff --git a/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin b/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin index cec818a..d541659 100644 Binary files a/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin and b/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin differ diff --git a/.vs/ProjectEvaluation/firebird2d.projects.v8.bin b/.vs/ProjectEvaluation/firebird2d.projects.v8.bin index 78e82f1..21be967 100644 Binary files a/.vs/ProjectEvaluation/firebird2d.projects.v8.bin and b/.vs/ProjectEvaluation/firebird2d.projects.v8.bin differ diff --git a/.vs/ProjectEvaluation/firebird2d.strings.v8.bin b/.vs/ProjectEvaluation/firebird2d.strings.v8.bin index f0f8aea..3a4d4ec 100644 Binary files a/.vs/ProjectEvaluation/firebird2d.strings.v8.bin and b/.vs/ProjectEvaluation/firebird2d.strings.v8.bin differ diff --git a/Firebird2D.EventPipelines/EventBus.cs b/Firebird2D.EventPipelines/EventBus.cs new file mode 100644 index 0000000..b97210e --- /dev/null +++ b/Firebird2D.EventPipelines/EventBus.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Firebird2D.EventPipelines +{ + public class EventBus + { + private Dictionary pipelines = new(); + + private Dictionary>> pendingHooks = new(); + + public void OnPipelineExists(Action callback, FirebirdEvent type) + { + if (callback == null) throw new ArgumentNullException(nameof(callback)); + + if (!pendingHooks.TryGetValue(type, out var hookList)) + { + hookList = new(); + pendingHooks[type] = hookList; + } + + hookList.Add(callback); + } + + public I_Pipeline GetOrBuildPipeline(FirebirdEvent type, Type argsType, object master) + { + if (pipelines.TryGetValue(type, out var pipeline)) return pipeline; + + var genericPipelineType = typeof(Pipeline<>).MakeGenericType(argsType); + var pipelineInstance = (I_Pipeline)Activator.CreateInstance(genericPipelineType, master)!; + pipelines[type] = pipelineInstance; + return pipelineInstance; + } + + public I_Pipeline? GetPipeline(FirebirdEvent type, Type argsType) + { + if (!pipelines.TryGetValue(type, out var pipeline)) return null; + return pipeline; + } + + public void DestroyPipeline(FirebirdEvent type, object master) + { + if (!pipelines.ContainsKey(type)) return; + if (!pipelines[type].PipelineMaster.Equals(master)) throw new InvalidDataException("Only the pipeline master is allowed to delete this pipeline."); + pipelines.Remove(type); + } + } +} diff --git a/Firebird2D.EventPipelines/Firebird2D.EventPipelines.csproj b/Firebird2D.EventPipelines/Firebird2D.EventPipelines.csproj new file mode 100644 index 0000000..1a5b4a4 --- /dev/null +++ b/Firebird2D.EventPipelines/Firebird2D.EventPipelines.csproj @@ -0,0 +1,17 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + diff --git a/Firebird2D.EventPipelines/FirebirdEvent.cs b/Firebird2D.EventPipelines/FirebirdEvent.cs new file mode 100644 index 0000000..538d41d --- /dev/null +++ b/Firebird2D.EventPipelines/FirebirdEvent.cs @@ -0,0 +1,441 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Firebird2D.EventPipelines +{ + public enum FirebirdEvent + { + A = 0, + // + // Zusammenfassung: + // The B key + B = 1, + // + // Zusammenfassung: + // The C key + C = 2, + // + // Zusammenfassung: + // The D key + D = 3, + // + // Zusammenfassung: + // The E key + E = 4, + // + // Zusammenfassung: + // The F key + F = 5, + // + // Zusammenfassung: + // The G key + G = 6, + // + // Zusammenfassung: + // The H key + H = 7, + // + // Zusammenfassung: + // The I key + I = 8, + // + // Zusammenfassung: + // The J key + J = 9, + // + // Zusammenfassung: + // The K key + K = 10, + // + // Zusammenfassung: + // The L key + L = 11, + // + // Zusammenfassung: + // The M key + M = 12, + // + // Zusammenfassung: + // The N key + N = 13, + // + // Zusammenfassung: + // The O key + O = 14, + // + // Zusammenfassung: + // The P key + P = 15, + // + // Zusammenfassung: + // The Q key + Q = 16, + // + // Zusammenfassung: + // The R key + R = 17, + // + // Zusammenfassung: + // The S key + S = 18, + // + // Zusammenfassung: + // The T key + T = 19, + // + // Zusammenfassung: + // The U key + U = 20, + // + // Zusammenfassung: + // The V key + V = 21, + // + // Zusammenfassung: + // The W key + W = 22, + // + // Zusammenfassung: + // The X key + X = 23, + // + // Zusammenfassung: + // The Y key + Y = 24, + // + // Zusammenfassung: + // The Z key + Z = 25, + // + // Zusammenfassung: + // The 0 key + Num0 = 26, + // + // Zusammenfassung: + // The 1 key + Num1 = 27, + // + // Zusammenfassung: + // The 2 key + Num2 = 28, + // + // Zusammenfassung: + // The 3 key + Num3 = 29, + // + // Zusammenfassung: + // The 4 key + Num4 = 30, + // + // Zusammenfassung: + // The 5 key + Num5 = 31, + // + // Zusammenfassung: + // The 6 key + Num6 = 32, + // + // Zusammenfassung: + // The 7 key + Num7 = 33, + // + // Zusammenfassung: + // The 8 key + Num8 = 34, + // + // Zusammenfassung: + // The 9 key + Num9 = 35, + // + // Zusammenfassung: + // The Escape key + Escape = 36, + // + // Zusammenfassung: + // The left Control key + LControl = 37, + // + // Zusammenfassung: + // The left Shift key + LShift = 38, + // + // Zusammenfassung: + // The left Alt key + LAlt = 39, + // + // Zusammenfassung: + // The left OS specific key: window (Windows and Linux), apple (macOS), ... + LSystem = 40, + // + // Zusammenfassung: + // The right Control key + RControl = 41, + // + // Zusammenfassung: + // The right Shift key + RShift = 42, + // + // Zusammenfassung: + // The right Alt key + RAlt = 43, + // + // Zusammenfassung: + // The right OS specific key: window (Windows and Linux), apple (macOS), ... + RSystem = 44, + // + // Zusammenfassung: + // The Menu key + Menu = 45, + // + // Zusammenfassung: + // The [ key + LBracket = 46, + // + // Zusammenfassung: + // The ] key + RBracket = 47, + // + // Zusammenfassung: + // The ; key + Semicolon = 48, + // + // Zusammenfassung: + // The , key + Comma = 49, + // + // Zusammenfassung: + // The . key + Period = 50, + // + // Zusammenfassung: + // The ' key + Apostrophe = 51, + // + // Zusammenfassung: + // The / key + Slash = 52, + // + // Zusammenfassung: + // The \ key + Backslash = 53, + // + // Zusammenfassung: + // The ~ key + Grave = 54, + // + // Zusammenfassung: + // The = key + Equal = 55, + // + // Zusammenfassung: + // The - key + Hyphen = 56, + // + // Zusammenfassung: + // The Space key + Space = 57, + // + // Zusammenfassung: + // The Return key + Enter = 58, + // + // Zusammenfassung: + // The Backspace key + Backspace = 59, + // + // Zusammenfassung: + // The Tabulation key + Tab = 60, + // + // Zusammenfassung: + // The Page up key + PageUp = 61, + // + // Zusammenfassung: + // The Page down key + PageDown = 62, + // + // Zusammenfassung: + // The End key + End = 63, + // + // Zusammenfassung: + // The Home key + Home = 64, + // + // Zusammenfassung: + // The Insert key + Insert = 65, + // + // Zusammenfassung: + // The Delete key + Delete = 66, + // + // Zusammenfassung: + // The + key + Add = 67, + // + // Zusammenfassung: + // The - key + Subtract = 68, + // + // Zusammenfassung: + // The * key + Multiply = 69, + // + // Zusammenfassung: + // The / key + Divide = 70, + // + // Zusammenfassung: + // Left arrow + Left = 71, + // + // Zusammenfassung: + // Right arrow + Right = 72, + // + // Zusammenfassung: + // Up arrow + Up = 73, + // + // Zusammenfassung: + // Down arrow + Down = 74, + // + // Zusammenfassung: + // The numpad 0 key + Numpad0 = 75, + // + // Zusammenfassung: + // The numpad 1 key + Numpad1 = 76, + // + // Zusammenfassung: + // The numpad 2 key + Numpad2 = 77, + // + // Zusammenfassung: + // The numpad 3 key + Numpad3 = 78, + // + // Zusammenfassung: + // The numpad 4 key + Numpad4 = 79, + // + // Zusammenfassung: + // The numpad 5 key + Numpad5 = 80, + // + // Zusammenfassung: + // The numpad 6 key + Numpad6 = 81, + // + // Zusammenfassung: + // The numpad 7 key + Numpad7 = 82, + // + // Zusammenfassung: + // The numpad 8 key + Numpad8 = 83, + // + // Zusammenfassung: + // The numpad 9 key + Numpad9 = 84, + // + // Zusammenfassung: + // The F1 key + F1 = 85, + // + // Zusammenfassung: + // The F2 key + F2 = 86, + // + // Zusammenfassung: + // The F3 key + F3 = 87, + // + // Zusammenfassung: + // The F4 key + F4 = 88, + // + // Zusammenfassung: + // The F5 key + F5 = 89, + // + // Zusammenfassung: + // The F6 key + F6 = 90, + // + // Zusammenfassung: + // The F7 key + F7 = 91, + // + // Zusammenfassung: + // The F8 key + F8 = 92, + // + // Zusammenfassung: + // The F9 key + F9 = 93, + // + // Zusammenfassung: + // The F10 key + F10 = 94, + // + // Zusammenfassung: + // The F11 key + F11 = 95, + // + // Zusammenfassung: + // The F12 key + F12 = 96, + // + // Zusammenfassung: + // The F13 key + F13 = 97, + // + // Zusammenfassung: + // The F14 key + F14 = 98, + // + // Zusammenfassung: + // The F15 key + F15 = 99, + // + // Zusammenfassung: + // The Pause key + Pause = 100, + + MouseLeft = 101, + // + // Zusammenfassung: + // The right mouse button + MouseRight = 102, + // + // Zusammenfassung: + // The middle (wheel) mouse button + MouseMiddle = 103, + // + // Zusammenfassung: + // The first extra mouse button + MouseXButton1 = 104, + // + // Zusammenfassung: + // The second extra mouse button + MouseXButton2 = 105, + JoystickButton, + JoystickMove, + Tick, + Startup, + ModulesLoading, + SceneLoading, + FullyLoaded, + SceneLoaded, + MouseWheel, + MouseMove + } +} diff --git a/Firebird2D.EventPipelines/I_Pipeline.cs b/Firebird2D.EventPipelines/I_Pipeline.cs new file mode 100644 index 0000000..3fda8b0 --- /dev/null +++ b/Firebird2D.EventPipelines/I_Pipeline.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Firebird2D.EventPipelines +{ + public interface I_Pipeline + { + object PipelineMaster { get; } + bool IsEventEmpty { get; } + void Subscribe(Delegate handler); + void Unsubscribe(Delegate handler); + + } +} diff --git a/Firebird2D.EventPipelines/Pipeline.cs b/Firebird2D.EventPipelines/Pipeline.cs new file mode 100644 index 0000000..244dd46 --- /dev/null +++ b/Firebird2D.EventPipelines/Pipeline.cs @@ -0,0 +1,44 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Mail; +using System.Text; +using System.Threading.Tasks; + +namespace Firebird2D.EventPipelines +{ + public class Pipeline : I_Pipeline where T : EventArgs + { + public object PipelineMaster { get; } + + private event EventHandler? OnEvent; + + public Pipeline(object pipelineMaster) + { + PipelineMaster = pipelineMaster; + } + + public bool IsEventEmpty { get { return OnEvent != null; } } + + public void Subscribe(Delegate handler) + { + OnEvent += (EventHandler)handler; + } + + public void Unsubscribe(Delegate handler) + { + OnEvent -= (EventHandler)handler; + } + + public void SendEvent(object sender, T args) + { + if (sender == null || args == null) throw new ArgumentNullException(nameof(sender)); + if (args is not T) throw new ArgumentException($"Invalid EventArgs type. Expected {typeof(T)}"); + if (sender.Equals(PipelineMaster)) throw new InvalidDataException("Only the pipeline master is allowed to send events through this pipeline."); + + OnEvent?.Invoke(sender, args); + + } + } +} diff --git a/Firebird2D.KeyMapper/Firebird2D.KeyMapping.csproj b/Firebird2D.KeyMapper/Firebird2D.KeyMapping.csproj new file mode 100644 index 0000000..ae81bf0 --- /dev/null +++ b/Firebird2D.KeyMapper/Firebird2D.KeyMapping.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/Firebird2D.KeyMapper/KeyMapper.cs b/Firebird2D.KeyMapper/KeyMapper.cs new file mode 100644 index 0000000..b9d9c84 --- /dev/null +++ b/Firebird2D.KeyMapper/KeyMapper.cs @@ -0,0 +1,161 @@ +using Firebird2D.EventPipelines; +using SFML.System; +using SFML.Window; +using System.Runtime.CompilerServices; +using System.Text.Json; + + +namespace Firebird2D.KeyMapping +{ + public class KeyMapper + { + private EventBus eventBus; + + private Dictionary inputEvents = []; + + private Dictionary eventTypes = []; + + private Dictionary inputMapping = []; + + private Dictionary cachedPipelines = []; + + public KeyMapper(EventBus eventBus) + { + if (eventBus == null) throw new NullReferenceException(nameof(eventBus)); + this.eventBus = eventBus; + } + + public void RegisterEvent(string EventName, EventHandler handler, FirebirdEvent eventNumber) where T : EventArgs + { + if (inputEvents.ContainsKey(EventName)) throw new ArgumentException($"Event {EventName} exist Already."); + inputEvents.Add(EventName, handler); + + eventTypes.Add(EventName, typeof(T)); + + Map(EventName, eventNumber); + } + + public void Map(string EventName, FirebirdEvent eventNumber) + { + if (inputMapping.ContainsKey(EventName)) + { + RemoveMapping(EventName); + inputMapping[EventName] = eventNumber; + AjustPipeline(EventName, eventNumber); + } + else + { + inputMapping.Add(EventName, eventNumber); + AjustPipeline(EventName, eventNumber); + } + } + + private void RemoveMapping(string EventName) + { + if (!inputMapping.TryGetValue(EventName, out var firebirdEvent)) return; + if (!eventTypes.TryGetValue(EventName, out var type)) return; + + I_Pipeline? pipeline = eventBus.GetPipeline(firebirdEvent, type); + + if (pipeline != null) + { + pipeline.Unsubscribe(inputEvents[EventName]); + if (pipeline.IsEventEmpty) + { + eventBus.DestroyPipeline(firebirdEvent, this); + cachedPipelines.Remove(firebirdEvent); + } + } + inputMapping.Remove(EventName); + } + + private void AjustPipeline(string EventName, FirebirdEvent eventNumber) + { + if (!eventTypes.TryGetValue(EventName, out var type)) return; + + I_Pipeline pipeline = eventBus.GetOrBuildPipeline(eventNumber, type, this); + pipeline.Subscribe(inputEvents[EventName]); + } + + public void SaveMapping(string Path) + { + string json = JsonSerializer.Serialize(inputMapping); + File.WriteAllText(Path, json); + } + + public void LoadMapping(string Path) + { + string json = File.ReadAllText(Path); + Dictionary? keyValuePairs = JsonSerializer.Deserialize>(json); + if (keyValuePairs == null) throw new FileLoadException("Unable to deserialize Inputmapping"); + + cachedPipelines.Clear(); + + foreach (var kvp in inputMapping) + { + RemoveMapping(kvp.Key); + } + + inputMapping = keyValuePairs; + + foreach (var kvp in inputMapping) + { + if (inputEvents.ContainsKey(kvp.Key)) + { + AjustPipeline(kvp.Key, kvp.Value); + } + } + } + + public void InvalidatePipelineCache(FirebirdEvent fbEvent) + { + cachedPipelines.Remove(fbEvent); + } + + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private Pipeline? GetOrCachePipeline(FirebirdEvent fbEvent) where T : EventArgs + { + if (cachedPipelines.TryGetValue(fbEvent, out var pipelineObj) && pipelineObj is Pipeline cached) + return cached; + + var pipeline = eventBus?.GetPipeline(fbEvent, typeof(T)) as Pipeline; + + if (pipeline != null) + cachedPipelines[fbEvent] = pipeline; + + return pipeline; + } + + + public void HandleKeyboardInput(KeyEvent key) + { + var pipeline = GetOrCachePipeline((FirebirdEvent)key.Code); + pipeline?.SendEvent(this, new KeyEventArgs(key)); + } + + public void HandleMouseInput(MouseButtonEvent button) + { + var pipeline = GetOrCachePipeline((FirebirdEvent)(button.Button + 101)); + pipeline?.SendEvent(this, new MouseButtonEventArgs(button)); + } + + public void HandleJoystickButtonInput(JoystickButtonEvent joystickButton) + { + var pipeline = GetOrCachePipeline(FirebirdEvent.JoystickButton); + pipeline?.SendEvent(this, new JoystickButtonEventArgs(joystickButton)); + } + + public void HandleMouseMovement(MouseMoveEvent mouseMove) + { + var pipeline = GetOrCachePipeline(FirebirdEvent.MouseMove); + pipeline?.SendEvent(this, new MouseMoveEventArgs(mouseMove)); + } + + public void HandleJoytickMove(JoystickMoveEvent joystickMove) + { + var pipeline = GetOrCachePipeline(FirebirdEvent.JoystickMove); + pipeline?.SendEvent(this, new JoystickMoveEventArgs(joystickMove)); + } + } +} diff --git a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs index 951f669..1692793 100644 --- a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs +++ b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D.Logger")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D.Logger")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D.Logger")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache index ba86a2f..b52536c 100644 --- a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache +++ b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache @@ -1 +1 @@ -32e3d814a80a310d5a0cc6d3cec91f5ef8b52ebe1ee92cb41b060cf5867c209a +affe20a17e8e88d1b9a30dd26c0c5847166b5692d8b48ab665b103d74ddc8438 diff --git a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.GeneratedMSBuildEditorConfig.editorconfig b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.GeneratedMSBuildEditorConfig.editorconfig index c2679ac..1d006de 100644 --- a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.GeneratedMSBuildEditorConfig.editorconfig +++ b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Firebird2D.Logger -build_property.ProjectDir = C:\Users\wayan\source\repos\SFML_Test\Firebird2D.Logger\ +build_property.ProjectDir = G:\Coding\Firebird2D\Firebird2D.Logger\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.assets.cache b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.assets.cache index 053f7b0..6f23c91 100644 Binary files a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.assets.cache and b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.assets.cache differ diff --git a/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json b/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json index 5f1b1ab..1ce3d90 100644 --- a/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json +++ b/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": {} + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": {} }, "projects": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "projectName": "Firebird2D.Logger", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Firebird2D.Logger/obj/project.assets.json b/Firebird2D.Logger/obj/project.assets.json index 34fcf99..0d852b0 100644 --- a/Firebird2D.Logger/obj/project.assets.json +++ b/Firebird2D.Logger/obj/project.assets.json @@ -14,11 +14,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "projectName": "Firebird2D.Logger", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Firebird2D.Logger/obj/project.nuget.cache b/Firebird2D.Logger/obj/project.nuget.cache index 4ac0d29..c784785 100644 --- a/Firebird2D.Logger/obj/project.nuget.cache +++ b/Firebird2D.Logger/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "hY5F3ZOEgq0=", + "dgSpecHash": "tcqAw3429hg=", "success": true, - "projectFilePath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectFilePath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs index 7953928..ff3bece 100644 --- a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs +++ b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D.Requirement")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D.Requirement")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D.Requirement")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache index 40e4eb1..8545fac 100644 --- a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache +++ b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache @@ -1 +1 @@ -9d689c9bd40c3fc337f8dd13ca7e45729bb294555949f3a62a17041f952e8653 +e39a5a8fa70529a2443df64310c68b2a15058d3b8161dad3c45da459c8bf1c38 diff --git a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.GeneratedMSBuildEditorConfig.editorconfig b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.GeneratedMSBuildEditorConfig.editorconfig index b56bf93..f439775 100644 --- a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.GeneratedMSBuildEditorConfig.editorconfig +++ b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Firebird2D.Requirement -build_property.ProjectDir = C:\Users\wayan\source\repos\SFML_Test\Firebird2D.Requirement\ +build_property.ProjectDir = G:\Coding\Firebird2D\Firebird2D.Requirement\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache index 7e50c5a..85afab9 100644 Binary files a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache and b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache differ diff --git a/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json b/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json index ab34de0..ecf7b85 100644 --- a/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json +++ b/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": {} + "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": {} }, "projects": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "projectName": "Firebird2D.Logger", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -71,14 +71,14 @@ } } }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "projectName": "Firebird2D.Requirement", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -102,8 +102,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj" } } } diff --git a/Firebird2D.Requirement/obj/project.assets.json b/Firebird2D.Requirement/obj/project.assets.json index c4f75d5..59992ea 100644 --- a/Firebird2D.Requirement/obj/project.assets.json +++ b/Firebird2D.Requirement/obj/project.assets.json @@ -33,11 +33,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "projectName": "Firebird2D.Requirement", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -61,8 +61,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj" } } } diff --git a/Firebird2D.Requirement/obj/project.nuget.cache b/Firebird2D.Requirement/obj/project.nuget.cache index b627b00..9693734 100644 --- a/Firebird2D.Requirement/obj/project.nuget.cache +++ b/Firebird2D.Requirement/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "HpwrRtPzXm8=", + "dgSpecHash": "Cnwm1cp4iIM=", "success": true, - "projectFilePath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", + "projectFilePath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs index 75f14d3..5bce199 100644 --- a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs +++ b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D.SFMLExtensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D.SFMLExtensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D.SFMLExtensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache index 16d9333..ccb5cd9 100644 --- a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache +++ b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -b0cfbdeb581dd84b837d01c67326fd0d91e22d0b785b6f432a1f367680a4d1b5 +cc9869897aeaa6a5dfabc87ead78ab52b0a4f6484df7ba1391f0a03cd3a7749c diff --git a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.GeneratedMSBuildEditorConfig.editorconfig b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.GeneratedMSBuildEditorConfig.editorconfig index f8dbd58..7d3779d 100644 --- a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.GeneratedMSBuildEditorConfig.editorconfig +++ b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Firebird2D.SFMLExtensions -build_property.ProjectDir = C:\Users\wayan\source\repos\SFML_Test\Firebird2D.SFMLExtensions\ +build_property.ProjectDir = G:\Coding\Firebird2D\Firebird2D.SFMLExtensions\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.assets.cache b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.assets.cache index 7a029ee..2e7bcf1 100644 Binary files a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.assets.cache and b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.assets.cache differ diff --git a/Firebird2D.SFMLExtensions/obj/Firebird2D.SFMLExtensions.csproj.nuget.dgspec.json b/Firebird2D.SFMLExtensions/obj/Firebird2D.SFMLExtensions.csproj.nuget.dgspec.json index 8e7aee1..bf5015f 100644 --- a/Firebird2D.SFMLExtensions/obj/Firebird2D.SFMLExtensions.csproj.nuget.dgspec.json +++ b/Firebird2D.SFMLExtensions/obj/Firebird2D.SFMLExtensions.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": {} + "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": {} }, "projects": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", "projectName": "Firebird2D.SFMLExtensions", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Firebird2D.SFMLExtensions/obj/project.assets.json b/Firebird2D.SFMLExtensions/obj/project.assets.json index 9177956..b4caf59 100644 --- a/Firebird2D.SFMLExtensions/obj/project.assets.json +++ b/Firebird2D.SFMLExtensions/obj/project.assets.json @@ -1081,11 +1081,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", "projectName": "Firebird2D.SFMLExtensions", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Firebird2D.SFMLExtensions/obj/project.nuget.cache b/Firebird2D.SFMLExtensions/obj/project.nuget.cache index 5c478c1..dea6dc3 100644 --- a/Firebird2D.SFMLExtensions/obj/project.nuget.cache +++ b/Firebird2D.SFMLExtensions/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "uGVcjkrdvPM=", + "dgSpecHash": "IPYFqKuYbQ8=", "success": true, - "projectFilePath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", + "projectFilePath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", "expectedPackageFiles": [ "C:\\Users\\wayan\\.nuget\\packages\\csfml\\2.6.1\\csfml.2.6.1.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\sfml.audio\\2.6.0\\sfml.audio.2.6.0.nupkg.sha512", diff --git a/Firebird2D.sln b/Firebird2D.sln index e1c3944..e119f4f 100644 --- a/Firebird2D.sln +++ b/Firebird2D.sln @@ -16,6 +16,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat ClassDiagram.md = ClassDiagram.md EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firebird2D.EventPipelines", "Firebird2D.EventPipelines\Firebird2D.EventPipelines.csproj", "{FB2B6835-02BF-4AE7-B85F-290472787ED3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebird2D.KeyMapping", "Firebird2D.KeyMapper\Firebird2D.KeyMapping.csproj", "{38CCA723-C113-4E44-B074-F9B709B0EEB4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -38,6 +42,14 @@ Global {106D6D21-E153-476B-AE52-4B2C899F6928}.Debug|Any CPU.Build.0 = Debug|Any CPU {106D6D21-E153-476B-AE52-4B2C899F6928}.Release|Any CPU.ActiveCfg = Release|Any CPU {106D6D21-E153-476B-AE52-4B2C899F6928}.Release|Any CPU.Build.0 = Release|Any CPU + {FB2B6835-02BF-4AE7-B85F-290472787ED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB2B6835-02BF-4AE7-B85F-290472787ED3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB2B6835-02BF-4AE7-B85F-290472787ED3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB2B6835-02BF-4AE7-B85F-290472787ED3}.Release|Any CPU.Build.0 = Release|Any CPU + {38CCA723-C113-4E44-B074-F9B709B0EEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {38CCA723-C113-4E44-B074-F9B709B0EEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {38CCA723-C113-4E44-B074-F9B709B0EEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {38CCA723-C113-4E44-B074-F9B709B0EEB4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Firebird2D/Firebird2D.csproj b/Firebird2D/Firebird2D.csproj index 06f9d1c..093819f 100644 --- a/Firebird2D/Firebird2D.csproj +++ b/Firebird2D/Firebird2D.csproj @@ -8,13 +8,15 @@ - + - + + + diff --git a/Firebird2D/Game.cs b/Firebird2D/Game.cs new file mode 100644 index 0000000..55b7fdd --- /dev/null +++ b/Firebird2D/Game.cs @@ -0,0 +1,50 @@ +using SFML.Graphics; +using SFML.Window; +using SFML.System; +using Microsoft.Extensions.Configuration; +using System.Text; +using Firebird2D.Core; +using Firebird2D.Configuration; +using Firebird2D.Logger; +using Firebird2D.SceneSystem; +using Firebird2D.EventPipelines; +using Firebird2D.KeyMapping; + +namespace Firebird2D +{ + public static class Game + { + + public static MainWindow? mainWindow {get; private set;} + + public static GameConfig gameConfig = new GameConfig(); + + public static EventBus? eventBus { get; private set;} + + public static KeyMapper? keyMapper { get; private set;} + + static void Main(string[] args) + { + eventBus = new EventBus(); + + keyMapper = new KeyMapper(eventBus); + + //GameLogger.Initalize(); + + //if (VideoMode.DesktopMode.Width < gameConfig.VideoMode.Width || VideoMode.DesktopMode.Height < gameConfig.VideoMode.Height) + //{ + // gameConfig.VideoMode = VideoMode.DesktopMode; + //} + + //Styles style = gameConfig.FullScreen ? Styles.Fullscreen : Styles.Default; + + //mainWindow = new MainWindow(gameConfig.VideoMode, "testgame", style); + + //SceneManager.LoadScenes(mainWindow); + + //mainWindow.Gameloop(); + + } + } +} + diff --git a/Firebird2D/GameSystem.cs b/Firebird2D/GameSystem.cs deleted file mode 100644 index a1d4554..0000000 --- a/Firebird2D/GameSystem.cs +++ /dev/null @@ -1,40 +0,0 @@ -using SFML.Graphics; -using SFML.Window; -using SFML.System; -using Microsoft.Extensions.Configuration; -using System.Text; -using Firebird2D.Core; -using Firebird2D.Configuration; -using Firebird2D.Logger; -using Firebird2D.SceneSystem; - -namespace Firebird2D -{ - public static class GameSystem - { - - public static MainWindow? mainWindow {get; private set;} - - public static GameConfig gameConfig = new GameConfig(); - - static void Main(string[] args) - { - GameLogger.Initalize(); - - if (VideoMode.DesktopMode.Width < gameConfig.VideoMode.Width || VideoMode.DesktopMode.Height < gameConfig.VideoMode.Height) - { - gameConfig.VideoMode = VideoMode.DesktopMode; - } - - Styles style = gameConfig.FullScreen ? Styles.Fullscreen : Styles.Default; - - mainWindow = new MainWindow(gameConfig.VideoMode, "testgame", style); - - SceneManager.LoadScenes(mainWindow); - - mainWindow.Gameloop(); - - } - } -} - diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs index 03bb2eb..92d98be 100644 --- a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs +++ b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache index fe3fb1c..ec709c2 100644 --- a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache +++ b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache @@ -1 +1 @@ -34789a2313a02eb3bf9ca4688175c16f412592a6383e7e87cd64b1ac4632e7a2 +c0a24d86bf21784cd90312be0fc44d53210fd1ff433ae25e4a8ab483ba3e79a7 diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.GeneratedMSBuildEditorConfig.editorconfig b/Firebird2D/obj/Debug/net8.0/Firebird2D.GeneratedMSBuildEditorConfig.editorconfig index 288795e..c4fba96 100644 --- a/Firebird2D/obj/Debug/net8.0/Firebird2D.GeneratedMSBuildEditorConfig.editorconfig +++ b/Firebird2D/obj/Debug/net8.0/Firebird2D.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Firebird2D -build_property.ProjectDir = C:\Users\wayan\source\repos\SFML_Test\Firebird2D\ +build_property.ProjectDir = G:\Coding\Firebird2D\Firebird2D\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache b/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache index f6520f0..6571147 100644 Binary files a/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache and b/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache differ diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.csproj.AssemblyReference.cache b/Firebird2D/obj/Debug/net8.0/Firebird2D.csproj.AssemblyReference.cache index fc66ffe..f0fd468 100644 Binary files a/Firebird2D/obj/Debug/net8.0/Firebird2D.csproj.AssemblyReference.cache and b/Firebird2D/obj/Debug/net8.0/Firebird2D.csproj.AssemblyReference.cache differ diff --git a/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json b/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json index df3d941..f7d2634 100644 --- a/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json +++ b/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json @@ -1,17 +1,161 @@ { "format": 1, "restore": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\Firebird2D.csproj": {} + "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj": {} }, "projects": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", - "projectName": "Firebird2D.Logger", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj", + "projectName": "Firebird2D.EventPipelines", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configFilePaths": [ + "C:\\Users\\wayan\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\Infrastructure\\Packages": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\References": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "dependencies": { + "SFML.Net": { + "target": "Package", + "version": "[2.6.1, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303/PortableRuntimeIdentifierGraph.json" + } + } + }, + "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj", + "projectName": "Firebird2D.KeyMapping", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj", + "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configFilePaths": [ + "C:\\Users\\wayan\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\Infrastructure\\Packages": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\References": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "projectReferences": { + "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303/PortableRuntimeIdentifierGraph.json" + } + } + }, + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectName": "Firebird2D.Logger", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -71,14 +215,14 @@ } } }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "projectName": "Firebird2D.Requirement", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -102,8 +246,8 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj" } } } @@ -142,14 +286,14 @@ } } }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", "projectName": "Firebird2D.SFMLExtensions", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -215,14 +359,14 @@ } } }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\Firebird2D.csproj": { + "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\Firebird2D.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj", "projectName": "Firebird2D", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\Firebird2D.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -246,14 +390,20 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj" }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj" }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj" + }, + "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj" + }, + "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj" } } } @@ -275,7 +425,7 @@ "dependencies": { "Microsoft.Extensions.Configuration": { "target": "Package", - "version": "[9.0.0, )" + "version": "[9.0.4, )" }, "Microsoft.Extensions.Configuration.Json": { "target": "Package", @@ -287,7 +437,7 @@ }, "SFML.Net": { "target": "Package", - "version": "[2.6.0, )" + "version": "[2.6.1, )" } }, "imports": [ diff --git a/Firebird2D/obj/project.assets.json b/Firebird2D/obj/project.assets.json index c08c5d9..bbf0d54 100644 --- a/Firebird2D/obj/project.assets.json +++ b/Firebird2D/obj/project.assets.json @@ -722,11 +722,11 @@ } } }, - "Microsoft.Extensions.Configuration/9.0.0": { + "Microsoft.Extensions.Configuration/9.0.4": { "type": "package", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", - "Microsoft.Extensions.Primitives": "9.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.4", + "Microsoft.Extensions.Primitives": "9.0.4" }, "compile": { "lib/net8.0/Microsoft.Extensions.Configuration.dll": { @@ -742,10 +742,10 @@ "buildTransitive/net8.0/_._": {} } }, - "Microsoft.Extensions.Configuration.Abstractions/9.0.0": { + "Microsoft.Extensions.Configuration.Abstractions/9.0.4": { "type": "package", "dependencies": { - "Microsoft.Extensions.Primitives": "9.0.0" + "Microsoft.Extensions.Primitives": "9.0.4" }, "compile": { "lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll": { @@ -863,7 +863,7 @@ "buildTransitive/net8.0/_._": {} } }, - "Microsoft.Extensions.Primitives/9.0.0": { + "Microsoft.Extensions.Primitives/9.0.4": { "type": "package", "compile": { "lib/net8.0/Microsoft.Extensions.Primitives.dll": { @@ -908,11 +908,11 @@ } } }, - "SFML.Audio/2.6.0": { + "SFML.Audio/2.6.1": { "type": "package", "dependencies": { "CSFML": "[2.6.1, 2.7.0)", - "SFML.System": "2.6.0" + "SFML.System": "2.6.1" }, "compile": { "lib/netstandard2.0/SFML.Audio.dll": { @@ -925,12 +925,12 @@ } } }, - "SFML.Graphics/2.6.0": { + "SFML.Graphics/2.6.1": { "type": "package", "dependencies": { "CSFML": "[2.6.1, 2.7.0)", - "SFML.System": "2.6.0", - "SFML.Window": "2.6.0" + "SFML.System": "2.6.1", + "SFML.Window": "2.6.1" }, "compile": { "lib/netstandard2.0/SFML.Graphics.dll": { @@ -943,16 +943,16 @@ } } }, - "SFML.Net/2.6.0": { + "SFML.Net/2.6.1": { "type": "package", "dependencies": { - "SFML.Audio": "2.6.0", - "SFML.Graphics": "2.6.0", - "SFML.System": "2.6.0", - "SFML.Window": "2.6.0" + "SFML.Audio": "2.6.1", + "SFML.Graphics": "2.6.1", + "SFML.System": "2.6.1", + "SFML.Window": "2.6.1" } }, - "SFML.System/2.6.0": { + "SFML.System/2.6.1": { "type": "package", "dependencies": { "CSFML": "[2.6.1, 2.7.0)" @@ -968,11 +968,11 @@ } } }, - "SFML.Window/2.6.0": { + "SFML.Window/2.6.1": { "type": "package", "dependencies": { "CSFML": "[2.6.1, 2.7.0)", - "SFML.System": "2.6.0" + "SFML.System": "2.6.1" }, "compile": { "lib/netstandard2.0/SFML.Window.dll": { @@ -1043,6 +1043,32 @@ "buildTransitive/net8.0/System.Text.Json.targets": {} } }, + "Firebird2D.EventPipelines/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "SFML.Net": "2.6.1" + }, + "compile": { + "bin/placeholder/Firebird2D.EventPipelines.dll": {} + }, + "runtime": { + "bin/placeholder/Firebird2D.EventPipelines.dll": {} + } + }, + "Firebird2D.KeyMapping/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "Firebird2D.EventPipelines": "1.0.0" + }, + "compile": { + "bin/placeholder/Firebird2D.KeyMapping.dll": {} + }, + "runtime": { + "bin/placeholder/Firebird2D.KeyMapping.dll": {} + } + }, "Firebird2D.Logger/1.0.0": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", @@ -1275,10 +1301,10 @@ "sfml-icon.png" ] }, - "Microsoft.Extensions.Configuration/9.0.0": { - "sha512": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==", + "Microsoft.Extensions.Configuration/9.0.4": { + "sha512": "KIVBrMbItnCJDd1RF4KEaE8jZwDJcDUJW5zXpbwQ05HNYTK1GveHxHK0B3SjgDJuR48GRACXAO+BLhL8h34S7g==", "type": "package", - "path": "microsoft.extensions.configuration/9.0.0", + "path": "microsoft.extensions.configuration/9.0.4", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1298,15 +1324,15 @@ "lib/net9.0/Microsoft.Extensions.Configuration.xml", "lib/netstandard2.0/Microsoft.Extensions.Configuration.dll", "lib/netstandard2.0/Microsoft.Extensions.Configuration.xml", - "microsoft.extensions.configuration.9.0.0.nupkg.sha512", + "microsoft.extensions.configuration.9.0.4.nupkg.sha512", "microsoft.extensions.configuration.nuspec", "useSharedDesignerContext.txt" ] }, - "Microsoft.Extensions.Configuration.Abstractions/9.0.0": { - "sha512": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", + "Microsoft.Extensions.Configuration.Abstractions/9.0.4": { + "sha512": "0LN/DiIKvBrkqp7gkF3qhGIeZk6/B63PthAHjQsxymJfIBcz0kbf4/p/t4lMgggVxZ+flRi5xvTwlpPOoZk8fg==", "type": "package", - "path": "microsoft.extensions.configuration.abstractions/9.0.0", + "path": "microsoft.extensions.configuration.abstractions/9.0.4", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1326,7 +1352,7 @@ "lib/net9.0/Microsoft.Extensions.Configuration.Abstractions.xml", "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll", "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.xml", - "microsoft.extensions.configuration.abstractions.9.0.0.nupkg.sha512", + "microsoft.extensions.configuration.abstractions.9.0.4.nupkg.sha512", "microsoft.extensions.configuration.abstractions.nuspec", "useSharedDesignerContext.txt" ] @@ -1473,10 +1499,10 @@ "useSharedDesignerContext.txt" ] }, - "Microsoft.Extensions.Primitives/9.0.0": { - "sha512": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==", + "Microsoft.Extensions.Primitives/9.0.4": { + "sha512": "SPFyMjyku1nqTFFJ928JAMd0QnRe4xjE7KeKnZMWXf3xk+6e0WiOZAluYtLdbJUXtsl2cCRSi8cBquJ408k8RA==", "type": "package", - "path": "microsoft.extensions.primitives/9.0.0", + "path": "microsoft.extensions.primitives/9.0.4", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1496,7 +1522,7 @@ "lib/net9.0/Microsoft.Extensions.Primitives.xml", "lib/netstandard2.0/Microsoft.Extensions.Primitives.dll", "lib/netstandard2.0/Microsoft.Extensions.Primitives.xml", - "microsoft.extensions.primitives.9.0.0.nupkg.sha512", + "microsoft.extensions.primitives.9.0.4.nupkg.sha512", "microsoft.extensions.primitives.nuspec", "useSharedDesignerContext.txt" ] @@ -1555,10 +1581,10 @@ "packageIcon.png" ] }, - "SFML.Audio/2.6.0": { - "sha512": "DvribzbjacRFSFU/A7xLkxlYEwMGKM9bwcpFo3TjStpKTDNSrSDw3EWuE0HwrQpzfiNxCAutnlRFvfwufUHuNw==", + "SFML.Audio/2.6.1": { + "sha512": "MsIlMTEeG623UYw3/Sb2qVw94xEHOxamUENuxbjSz4QiTsfCNQNEADpfTbXKI/FS5u7y/FsNmk+4II2iEf8MMw==", "type": "package", - "path": "sfml.audio/2.6.0", + "path": "sfml.audio/2.6.1", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1566,14 +1592,14 @@ "lib/netstandard2.0/SFML.Audio.dll", "lib/netstandard2.0/SFML.Audio.xml", "sfml-icon.png", - "sfml.audio.2.6.0.nupkg.sha512", + "sfml.audio.2.6.1.nupkg.sha512", "sfml.audio.nuspec" ] }, - "SFML.Graphics/2.6.0": { - "sha512": "bwYJT4siVta87d3ZaRN37FViOMAgiiYS9BYJOhHL70G9+KDtqbAl1LYg9hdEG8IHFSj55I7P8qkPL33KQ16RBg==", + "SFML.Graphics/2.6.1": { + "sha512": "pOtL7ss6r3m7P3MbZ4Oytjzug2mWJ5OHblZHlISIhb6IezmsFmBxqLsIq0YoyWGcAL4cgSXqDmflJivKpXgdtg==", "type": "package", - "path": "sfml.graphics/2.6.0", + "path": "sfml.graphics/2.6.1", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1581,27 +1607,27 @@ "lib/netstandard2.0/SFML.Graphics.dll", "lib/netstandard2.0/SFML.Graphics.xml", "sfml-icon.png", - "sfml.graphics.2.6.0.nupkg.sha512", + "sfml.graphics.2.6.1.nupkg.sha512", "sfml.graphics.nuspec" ] }, - "SFML.Net/2.6.0": { - "sha512": "jnHJp7PPvZ0FdIZQZo63DW3ROrgVJktTzycjGzoX1HsZZTzj7ioMOXtsbR2AAggdTyk6vIhd61IqEpLO4DSd+Q==", + "SFML.Net/2.6.1": { + "sha512": "OWjTdbVi86gTYHjlSB3Y77ZWDy01iIVMXfb5ApX3L5yp455VDmF828wBIc2+bfPxJDFSHgJ82LpZM5jFNUS/QA==", "type": "package", - "path": "sfml.net/2.6.0", + "path": "sfml.net/2.6.1", "files": [ ".nupkg.metadata", ".signature.p7s", "README.md", "sfml-icon.png", - "sfml.net.2.6.0.nupkg.sha512", + "sfml.net.2.6.1.nupkg.sha512", "sfml.net.nuspec" ] }, - "SFML.System/2.6.0": { - "sha512": "XDNdNah0PKZElyYMAqWd8Kbe/XsJExkTxPY0txIrsTXEFIiRWhlkcYBBZmGkA6wvB5Ib7XH8QqE8s3BY8ZAzaQ==", + "SFML.System/2.6.1": { + "sha512": "/3EV59uiMWxADWWSiqAOS+8FK4Da2r6RoZEujG14kLGYtQzNj4rV4pjjycyH30WWDONSedxmLT9chf8XN70+BQ==", "type": "package", - "path": "sfml.system/2.6.0", + "path": "sfml.system/2.6.1", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1609,14 +1635,14 @@ "lib/netstandard2.0/SFML.System.dll", "lib/netstandard2.0/SFML.System.xml", "sfml-icon.png", - "sfml.system.2.6.0.nupkg.sha512", + "sfml.system.2.6.1.nupkg.sha512", "sfml.system.nuspec" ] }, - "SFML.Window/2.6.0": { - "sha512": "C4FAnMI6adoNyc7gv33tIK9iYWuPxPUqQojLkhy2DTi4+3ZrlSNRDNZYc7V8Gaps3dOheGAP41/MJKSdTF8SZg==", + "SFML.Window/2.6.1": { + "sha512": "lzt42WWZiYvoMrDwvc4lpl6t/GH6AhvHI+inw/Aoh1v6xAO8GDnzzLVsaKi+RfPqdL2mHsih1qUZucuvAmoGdg==", "type": "package", - "path": "sfml.window/2.6.0", + "path": "sfml.window/2.6.1", "files": [ ".nupkg.metadata", ".signature.p7s", @@ -1624,7 +1650,7 @@ "lib/netstandard2.0/SFML.Window.dll", "lib/netstandard2.0/SFML.Window.xml", "sfml-icon.png", - "sfml.window.2.6.0.nupkg.sha512", + "sfml.window.2.6.1.nupkg.sha512", "sfml.window.nuspec" ] }, @@ -1759,6 +1785,16 @@ "useSharedDesignerContext.txt" ] }, + "Firebird2D.EventPipelines/1.0.0": { + "type": "project", + "path": "../Firebird2D.EventPipelines/Firebird2D.EventPipelines.csproj", + "msbuildProject": "../Firebird2D.EventPipelines/Firebird2D.EventPipelines.csproj" + }, + "Firebird2D.KeyMapping/1.0.0": { + "type": "project", + "path": "../Firebird2D.KeyMapper/Firebird2D.KeyMapping.csproj", + "msbuildProject": "../Firebird2D.KeyMapper/Firebird2D.KeyMapping.csproj" + }, "Firebird2D.Logger/1.0.0": { "type": "project", "path": "../Firebird2D.Logger/Firebird2D.Logger.csproj", @@ -1777,13 +1813,15 @@ }, "projectFileDependencyGroups": { "net8.0": [ + "Firebird2D.EventPipelines >= 1.0.0", + "Firebird2D.KeyMapping >= 1.0.0", "Firebird2D.Logger >= 1.0.0", "Firebird2D.Requirement >= 1.0.0", "Firebird2D.SFMLExtensions >= 1.0.0", - "Microsoft.Extensions.Configuration >= 9.0.0", + "Microsoft.Extensions.Configuration >= 9.0.4", "Microsoft.Extensions.Configuration.Json >= 9.0.0", "Newtonsoft.Json.Schema >= 4.0.1", - "SFML.Net >= 2.6.0" + "SFML.Net >= 2.6.1" ] }, "packageFolders": { @@ -1793,11 +1831,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\Firebird2D.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj", "projectName": "Firebird2D", - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\Firebird2D.csproj", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -1821,14 +1859,20 @@ "net8.0": { "targetAlias": "net8.0", "projectReferences": { - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Logger\\Firebird2D.Logger.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj" }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj" }, - "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { - "projectPath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj" + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj" + }, + "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj" + }, + "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj" } } } @@ -1850,7 +1894,7 @@ "dependencies": { "Microsoft.Extensions.Configuration": { "target": "Package", - "version": "[9.0.0, )" + "version": "[9.0.4, )" }, "Microsoft.Extensions.Configuration.Json": { "target": "Package", @@ -1862,7 +1906,7 @@ }, "SFML.Net": { "target": "Package", - "version": "[2.6.0, )" + "version": "[2.6.1, )" } }, "imports": [ diff --git a/Firebird2D/obj/project.nuget.cache b/Firebird2D/obj/project.nuget.cache index 279752d..0314e33 100644 --- a/Firebird2D/obj/project.nuget.cache +++ b/Firebird2D/obj/project.nuget.cache @@ -1,25 +1,25 @@ { "version": 2, - "dgSpecHash": "mqTKswFuLRY=", + "dgSpecHash": "TRKtJseqRqc=", "success": true, - "projectFilePath": "C:\\Users\\wayan\\source\\repos\\SFML_Test\\Firebird2D\\Firebird2D.csproj", + "projectFilePath": "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj", "expectedPackageFiles": [ "C:\\Users\\wayan\\.nuget\\packages\\csfml\\2.6.1\\csfml.2.6.1.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.configuration\\9.0.0\\microsoft.extensions.configuration.9.0.0.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\9.0.0\\microsoft.extensions.configuration.abstractions.9.0.0.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.configuration\\9.0.4\\microsoft.extensions.configuration.9.0.4.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\9.0.4\\microsoft.extensions.configuration.abstractions.9.0.4.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\9.0.0\\microsoft.extensions.configuration.fileextensions.9.0.0.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.configuration.json\\9.0.0\\microsoft.extensions.configuration.json.9.0.0.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\9.0.0\\microsoft.extensions.fileproviders.abstractions.9.0.0.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\9.0.0\\microsoft.extensions.fileproviders.physical.9.0.0.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\9.0.0\\microsoft.extensions.filesystemglobbing.9.0.0.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.primitives\\9.0.0\\microsoft.extensions.primitives.9.0.0.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\microsoft.extensions.primitives\\9.0.4\\microsoft.extensions.primitives.9.0.4.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\newtonsoft.json.schema\\4.0.1\\newtonsoft.json.schema.4.0.1.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\sfml.audio\\2.6.0\\sfml.audio.2.6.0.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\sfml.graphics\\2.6.0\\sfml.graphics.2.6.0.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\sfml.net\\2.6.0\\sfml.net.2.6.0.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\sfml.system\\2.6.0\\sfml.system.2.6.0.nupkg.sha512", - "C:\\Users\\wayan\\.nuget\\packages\\sfml.window\\2.6.0\\sfml.window.2.6.0.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\sfml.audio\\2.6.1\\sfml.audio.2.6.1.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\sfml.graphics\\2.6.1\\sfml.graphics.2.6.1.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\sfml.net\\2.6.1\\sfml.net.2.6.1.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\sfml.system\\2.6.1\\sfml.system.2.6.1.nupkg.sha512", + "C:\\Users\\wayan\\.nuget\\packages\\sfml.window\\2.6.1\\sfml.window.2.6.1.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\system.io.pipelines\\9.0.0\\system.io.pipelines.9.0.0.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\system.text.encodings.web\\9.0.0\\system.text.encodings.web.9.0.0.nupkg.sha512", "C:\\Users\\wayan\\.nuget\\packages\\system.text.json\\9.0.0\\system.text.json.9.0.0.nupkg.sha512"