diff --git a/Awperative/Kernel/Entities/Bodies/Components/Location.cs b/Awperative/Kernel/Entities/Bodies/Components/Location.cs deleted file mode 100644 index d9b19f2..0000000 --- a/Awperative/Kernel/Entities/Bodies/Components/Location.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Awperative; - -public sealed partial class Body -{ - public Component GetComponent() where Generic : Component => GetComponents()[0]; - public Component[] GetComponents() where Generic : Component { - - List returnValue = []; - foreach (Component component in _components) - if (component is Generic) returnValue.Add(component); - - if(returnValue.Count == 0) { Debug.LogWarning("Scene has no components of this type"); return null; } - - return returnValue.ToArray(); - } - - public Component FindSingleton() where Generic : Component { - foreach (Component component in _components) - if (component.GetType() == typeof(Generic)) - if(component.EnforceSingleton) - return component; - else { - Debug.LogError("Component is not a singleton"); - return null; - } - - Debug.LogError("Scene does not contain a component of this type"); - return null; - } - - public bool SingletonExists() where Generic : Component - { - foreach (Component __component in _components) - if (__component.GetType() == typeof(Generic)) - if (__component.EnforceSingleton) - return true; - else - return false; - - return false; - } -} \ No newline at end of file diff --git a/Awperative/Kernel/Entities/Bodies/Core.cs b/Awperative/Kernel/Entities/Bodies/Core.cs index 56c3f6b..92c0a08 100644 --- a/Awperative/Kernel/Entities/Bodies/Core.cs +++ b/Awperative/Kernel/Entities/Bodies/Core.cs @@ -1,11 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.Xna.Framework; namespace Awperative; -public sealed partial class Body +public sealed partial class Body : DockerEntity { @@ -80,4 +81,16 @@ public sealed partial class Body + internal void Unload() { foreach (Component component in _components) component.Unload(); } + internal void Load() { foreach (Component component in _components) { component.Load(); } } + + + + internal void Update(GameTime __gameTime) { foreach (Component component in _components) { component.Update(__gameTime); } } + internal void Draw(GameTime __gameTime) { foreach (Component component in _components) { component.Draw(__gameTime); } } + + + + internal void Destroy() { foreach(Component component in _components) component.Destroy(); } + internal void Create() { foreach (Component component in _components) component.Create(); } } \ No newline at end of file diff --git a/Awperative/Kernel/Entities/Bodies/Time.cs b/Awperative/Kernel/Entities/Bodies/Time.cs deleted file mode 100644 index c3f1101..0000000 --- a/Awperative/Kernel/Entities/Bodies/Time.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Linq; -using Microsoft.Xna.Framework; - - -namespace Awperative; - - -public sealed partial class Body -{ - internal void Unload() { foreach (Component component in _components) component.Unload(); } - internal void Load() { foreach (Component component in _components) { component.Load(); } } - - - - internal void Update(GameTime __gameTime) { foreach (Component component in _components) { component.Update(__gameTime); } } - internal void Draw(GameTime __gameTime) { foreach (Component component in _components) { component.Draw(__gameTime); } } - - - - internal void Destroy() { foreach(Component component in _components) component.Destroy(); } - internal void Create() { foreach (Component component in _components) component.Create(); } -} \ No newline at end of file diff --git a/Awperative/Kernel/Entities/Bodies/Components/Addition.cs b/Awperative/Kernel/Entities/DockerEntity/Addition.cs similarity index 83% rename from Awperative/Kernel/Entities/Bodies/Components/Addition.cs rename to Awperative/Kernel/Entities/DockerEntity/Addition.cs index 424a869..44f23e8 100644 --- a/Awperative/Kernel/Entities/Bodies/Components/Addition.cs +++ b/Awperative/Kernel/Entities/DockerEntity/Addition.cs @@ -2,13 +2,11 @@ using System; namespace Awperative; -public sealed partial class Body +public abstract partial class DockerEntity { public Component AddComponent() where Generic : Component => AddComponent([]); public Component AddComponent(object[] __args) where Generic : Component { - - if (SingletonExists()) { Debug.LogError("Cannot add component when singleton exists"); return null; } if(typeof(Generic).GetConstructor((Type[]) __args) == null) { Debug.LogError("Component does not contain a valid constructor"); return null; }; try { diff --git a/Awperative/Kernel/Entities/Entity/DockerEntity.cs b/Awperative/Kernel/Entities/DockerEntity/Core.cs similarity index 65% rename from Awperative/Kernel/Entities/Entity/DockerEntity.cs rename to Awperative/Kernel/Entities/DockerEntity/Core.cs index df5bfe0..f355ce1 100644 --- a/Awperative/Kernel/Entities/Entity/DockerEntity.cs +++ b/Awperative/Kernel/Entities/DockerEntity/Core.cs @@ -8,14 +8,9 @@ namespace Awperative; /// /// Base class for all Awperative entities, manages components as a requirement because that is the job of all entities. /// -internal abstract partial class DockerEntity +public abstract partial class DockerEntity { - public Scene scene; - - public List Components => _components.ToList(); - - - + public Scene Scene; internal HashSet _components; } \ No newline at end of file diff --git a/Awperative/Kernel/Entities/DockerEntity/Location.cs b/Awperative/Kernel/Entities/DockerEntity/Location.cs new file mode 100644 index 0000000..d16b56a --- /dev/null +++ b/Awperative/Kernel/Entities/DockerEntity/Location.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; + +namespace Awperative; + +public abstract partial class DockerEntity +{ + public Component GetComponent() where Generic : Component => GetComponents()[0]; + public Component[] GetComponents() where Generic : Component { + + List returnValue = []; + foreach (Component component in _components) + if (component is Generic) returnValue.Add(component); + + if(returnValue.Count == 0) { Debug.LogWarning("Scene has no components of this type"); return null; } + + return returnValue.ToArray(); + } +} \ No newline at end of file diff --git a/Awperative/Kernel/Entities/Bodies/Components/Removal.cs b/Awperative/Kernel/Entities/DockerEntity/Removal.cs similarity index 95% rename from Awperative/Kernel/Entities/Bodies/Components/Removal.cs rename to Awperative/Kernel/Entities/DockerEntity/Removal.cs index 12aa5d2..d817f3f 100644 --- a/Awperative/Kernel/Entities/Bodies/Components/Removal.cs +++ b/Awperative/Kernel/Entities/DockerEntity/Removal.cs @@ -1,6 +1,6 @@ namespace Awperative; -public sealed partial class Body +public abstract partial class DockerEntity { public void RemoveComponent(Component __component) { diff --git a/Awperative/Kernel/Entities/Entity/Components.cs b/Awperative/Kernel/Entities/Entity/Components.cs deleted file mode 100644 index 28f2791..0000000 --- a/Awperative/Kernel/Entities/Entity/Components.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Awperative; - - -internal abstract partial class DockerEntity -{ - -} \ No newline at end of file diff --git a/Awperative/Kernel/Entities/Scenes/Behaviors.cs b/Awperative/Kernel/Entities/Scenes/Behaviors.cs deleted file mode 100644 index eeb90be..0000000 --- a/Awperative/Kernel/Entities/Scenes/Behaviors.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System; -using System.Collections.Generic; - - -namespace Awperative; - - -public sealed partial class Scene : DockerEntity -{ - - public List behaviors { get; private set; } = []; - - //todo: use extern keyword to make transform ambiguous to support potential 3D games - - - public Generic AddBehavior(object[] args) where Generic : Behavior { - - if (SingletonExists()) - throw new Exception("Cannot add behavior when singleton exists!"); - - Generic behavior = (Generic) Activator.CreateInstance(typeof(Generic), args); - - if(behavior == null) - throw new Exception("Failed to create behavior!"); - - behaviors.Add(behavior); - behavior.Initiate(this); - - BehaviorCreatedEvent?.Invoke(this, new BehaviorCreateEvent(behavior, this)); - - return behavior; - } - - public Generic AddBehavior() where Generic : Behavior { - - if (SingletonExists()) - throw new Exception("Cannot add behavior when singleton exists!"); - - Generic behavior = (Generic) Activator.CreateInstance(typeof(Generic)); - - if(behavior == null) - throw new Exception("Failed to create behavior!"); - - behaviors.Add(behavior); - behavior.Initiate(this); - - BehaviorCreatedEvent?.Invoke(this, new BehaviorCreateEvent(behavior, this)); - - return behavior; - } - - public Generic[] GetBehaviors() where Generic : Behavior { - - List foundBehaviors = behaviors.FindAll(x => x.GetType() == typeof(Generic)); - - if(foundBehaviors.Count == 0) - throw new Exception("Scene has no behaviors of that type!"); - - return foundBehaviors.ToArray() as Generic[]; - } - - public Generic GetBehavior() where Generic : Behavior { - - Behavior foundBehavior = behaviors.Find(x => x.GetType() == typeof(Generic)); - - if(foundBehavior == null) - throw new Exception("Scene has no behaviors of that type!"); - - return foundBehavior as Generic; - } - - public void RemoveBehaviors() where Generic : Behavior { - - Behavior[] foundBehaviors = GetBehaviors(); - - if(foundBehaviors.Length == 0) - throw new Exception("Scene has no behaviors of that type!"); - - foreach (Behavior behavior in foundBehaviors) { - behavior.End(); - behaviors.Remove(behavior); - BehaviorDestroyedEvent?.Invoke(this, new BehaviorDestroyEvent(behavior, this)); - } - } - - public void RemoveBehavior() where Generic : Behavior { - - Behavior foundBehavior = GetBehavior(); - - if(foundBehavior == null) - throw new Exception("Scene has no behaviors of that type!"); - - foundBehavior.End(); - behaviors.Remove(foundBehavior); - BehaviorDestroyedEvent?.Invoke(this ,new BehaviorDestroyEvent(foundBehavior, this)); - } - - public void RemoveBehavior(Behavior __behavior) { - __behavior.End(); - behaviors.Remove(__behavior); - BehaviorDestroyedEvent?.Invoke(this, new BehaviorDestroyEvent(__behavior, this)); - } - - public Generic FindSingleton() where Generic : Behavior - { - foreach (Behavior __behavior in behaviors) - if (__behavior.GetType() == typeof(Generic)) - if(__behavior.EnforceSingleton) - return (Generic) __behavior; - else - throw new Exception("Behavior is not a singleton"); - - throw new Exception("Behavior not found"); - return null; - } - - public bool SingletonExists() where Generic : Behavior - { - - foreach (Behavior __behavior in behaviors) - if (__behavior.GetType() == typeof(Generic)) - if (__behavior.EnforceSingleton) - return true; - else - return false; - - return false; - } - - public void RecompileBehaviorOrder() { - behaviors.Sort((a, b) => a.Priority.CompareTo(b.Priority)); - behaviors.Reverse(); - } -} \ No newline at end of file diff --git a/Awperative/Kernel/Entities/Scenes/Bodies.cs b/Awperative/Kernel/Entities/Scenes/Bodies.cs index 20ece63..505539a 100644 --- a/Awperative/Kernel/Entities/Scenes/Bodies.cs +++ b/Awperative/Kernel/Entities/Scenes/Bodies.cs @@ -7,8 +7,6 @@ namespace Awperative; public sealed partial class Scene : DockerEntity { - public List bodies { get; private set; } = []; - public Body AddBody(Transform __transform) { Body body = new Body(this, __transform); bodies.Add(body); diff --git a/Awperative/Kernel/Entities/Scenes/Core.cs b/Awperative/Kernel/Entities/Scenes/Core.cs index bd33b0a..27c1ca2 100644 --- a/Awperative/Kernel/Entities/Scenes/Core.cs +++ b/Awperative/Kernel/Entities/Scenes/Core.cs @@ -1,10 +1,35 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; + namespace Awperative; public sealed partial class Scene : DockerEntity { + public List bodies { get; private set; } = []; + + public void Unload() { + foreach (Component component in _components) component.Unload(); + foreach (Body body in bodies.ToList()) body.Unload(); + } + + public void Load() { + foreach (Component component in _components) component.Load(); + foreach (Body body in bodies.ToList()) { body.Load(); } + } + + public void Update(GameTime __gameTime) { + foreach (Component component in _components) component.Update(__gameTime); + foreach (Body body in bodies.ToList()) { body.Update(__gameTime); } + } + + public void Draw(GameTime __gameTime) { + foreach (Component component in _components) component.Draw(__gameTime); + foreach (Body body in bodies.ToList()) { body.Draw(__gameTime); } + } //todo: add scene.destroy in v5 } diff --git a/Awperative/Kernel/Entities/Scenes/Events.cs b/Awperative/Kernel/Entities/Scenes/Events.cs index 10a6762..7e31ce9 100644 --- a/Awperative/Kernel/Entities/Scenes/Events.cs +++ b/Awperative/Kernel/Entities/Scenes/Events.cs @@ -6,9 +6,6 @@ namespace Awperative; public sealed partial class Scene : DockerEntity { - public event EventHandler BehaviorCreatedEvent; - public event EventHandler BehaviorDestroyedEvent; - public event EventHandler BodyCreatedEvent; public event EventHandler BodyDestroyedEvent; diff --git a/Awperative/Kernel/Entities/Scenes/Time.cs b/Awperative/Kernel/Entities/Scenes/Time.cs deleted file mode 100644 index 8a9102a..0000000 --- a/Awperative/Kernel/Entities/Scenes/Time.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Linq; -using Microsoft.Xna.Framework; - - -namespace Awperative; - -public sealed partial class Scene : DockerEntity -{ - - public void Unload() { - foreach (Behavior behavior in behaviors.ToList()) behavior.Unload(); - foreach (Body body in bodies.ToList()) body.Unload(); - } - - public void Load() { - foreach (Behavior behavior in behaviors.ToList()) { behavior.Load(); } - foreach (Body body in bodies.ToList()) { body.Load(); } - } - - public void Update(GameTime __gameTime) { - foreach (Behavior behavior in behaviors.ToList()) { behavior.Update(__gameTime); } - foreach (Body body in bodies.ToList()) { body.Update(__gameTime); } - } - - public void Draw(GameTime __gameTime) { - foreach (Behavior behavior in behaviors.ToList()) { behavior.Draw(__gameTime); } - foreach (Body body in bodies.ToList()) { body.Draw(__gameTime); } - } -} \ No newline at end of file diff --git a/Awperative/Kernel/Events/Behaviors/BehaviorCreateEvent.cs b/Awperative/Kernel/Events/Behaviors/BehaviorCreateEvent.cs deleted file mode 100644 index cbbd2d6..0000000 --- a/Awperative/Kernel/Events/Behaviors/BehaviorCreateEvent.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Awperative; - -public sealed record BehaviorCreateEvent -{ - public readonly Behavior behavior; - public readonly Scene scene; - - internal BehaviorCreateEvent() {} - - internal BehaviorCreateEvent(Behavior __behavior, Scene __scene) - { - behavior = __behavior; - scene = __scene; - } -} \ No newline at end of file diff --git a/Awperative/Kernel/Events/Behaviors/BehaviorDestroyEvent.cs b/Awperative/Kernel/Events/Behaviors/BehaviorDestroyEvent.cs deleted file mode 100644 index 01ca030..0000000 --- a/Awperative/Kernel/Events/Behaviors/BehaviorDestroyEvent.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Awperative; - -public sealed record BehaviorDestroyEvent -{ - public readonly Behavior behavior; - public readonly Scene scene; - - internal BehaviorDestroyEvent() {} - - internal BehaviorDestroyEvent(Behavior __behavior, Scene __scene) - { - behavior = __behavior; - scene = __scene; - } -} \ No newline at end of file diff --git a/Awperative/Kernel/Scripting/BodyComponent.cs b/Awperative/Kernel/Scripting/BodyComponent.cs index 8d813c6..c4d59f7 100644 --- a/Awperative/Kernel/Scripting/BodyComponent.cs +++ b/Awperative/Kernel/Scripting/BodyComponent.cs @@ -4,4 +4,16 @@ namespace Awperative; public class BodyComponent : Component { + + public Body Body; + + internal override void Initiate(DockerEntity __docker) { + Docker = __docker; + + Body = (Body)__docker; + Create(); + } + + public Transform Transform => Body.transform; + } \ No newline at end of file diff --git a/Awperative/Kernel/Scripting/Component/Component.cs b/Awperative/Kernel/Scripting/Component/Core.cs similarity index 60% rename from Awperative/Kernel/Scripting/Component/Component.cs rename to Awperative/Kernel/Scripting/Component/Core.cs index b64b236..000b576 100644 --- a/Awperative/Kernel/Scripting/Component/Component.cs +++ b/Awperative/Kernel/Scripting/Component/Core.cs @@ -7,23 +7,27 @@ namespace Awperative; /// /// The lowest level scripting class in Awperative. Components are scene level and provide access to all scene level methods, can be applied to any docker and inherited +/// Sadly component does not have excessive access to specific types. +/// Anything that inherits Component is built to work in any DockerEntity, which leads to generic +/// Assumptions. If you want to make a body specific or scene specific component both classes are available. /// -public abstract class Component +public abstract partial class Component { - internal DockerEntity Parent; + public Scene Scene { get; set; } + internal DockerEntity Docker; - internal void Initiate(DockerEntity __parent) { - Parent = __parent; + internal virtual void Initiate(DockerEntity __docker) { + Docker = __docker; Create(); } - internal void End() { + internal virtual void End() { Destroy(); } diff --git a/Awperative/Kernel/Scripting/Component/Methods.cs b/Awperative/Kernel/Scripting/Component/Methods.cs new file mode 100644 index 0000000..9a47eeb --- /dev/null +++ b/Awperative/Kernel/Scripting/Component/Methods.cs @@ -0,0 +1,26 @@ +namespace Awperative; + +public abstract partial class Component +{ + + protected Body AddBody() => Scene.AddBody(); + protected Body AddBody(Transform __transform) => Scene.AddBody(__transform); + + protected Body GetBody(string __tag) => Scene.GetBody(__tag); + protected Body[] GetBodies(string __tag) => Scene.GetBodies(__tag); + + protected void DestroyBody(Body __body) => Scene.DestroyBody(__body); + + + + + + public Component AddComponent() where Generic : Component => Docker.AddComponent(); + public Component AddComponent(object[] __args) where Generic : Component => Docker.AddComponent(__args); + + public Component GetComponent() where Generic : Component => Docker.GetComponent(); + public Component[] GetComponents() where Generic : Component => Docker.GetComponents(); + + public void RemoveComponent() where Generic : Component => Docker.RemoveComponent(); + +} \ No newline at end of file diff --git a/Awperative/Kernel/Scripting/Component/NewFile1.txt b/Awperative/Kernel/Scripting/Component/NewFile1.txt deleted file mode 100644 index 93a106f..0000000 --- a/Awperative/Kernel/Scripting/Component/NewFile1.txt +++ /dev/null @@ -1,72 +0,0 @@ -using Microsoft.Xna.Framework; - - -namespace Awperative; - -public abstract class Component -{ - - - - - - public Scene scene; - public Body body; - - public bool Enabled = false; - public bool EnforceSingleton = false; - - //0 = default highest priority called first, lowest priority called last - //todo: add optional parameter for priority at creation - public int Priority { - get => _priority; - set { _priority = value; } - } private int _priority = 0; - - - protected Transform transform => body.transform; - - protected Body AddBody() => scene.AddBody(); - protected Body AddBody(Transform __transform) => scene.AddBody(__transform); - - protected Body GetBody(string __tag) => scene.GetBody(__tag); - protected Body[] GetBodies(string __tag) => scene.GetBodies(__tag); - - protected void DestroyBody(Body __body) => scene.DestroyBody(__body); - - - - public Generic AddBehavior() where Generic : Behavior => scene.AddBehavior(); - public Generic AddBehavior(object[] __args) where Generic : Behavior => scene.AddBehavior(__args); - - public Generic GetBehavior() where Generic : Behavior => scene.GetBehavior(); - public Generic[] GetBehaviors() where Generic : Behavior => scene.GetBehaviors(); - - - public void RemoveBehavior() where Generic : Behavior => scene.RemoveBehavior(); - - - - public Component AddComponent() where Generic : Component => body.AddComponent(); - public Component AddComponent(object[] __args) where Generic : Component => body.AddComponent(__args); - - public Component GetComponent() where Generic : Component => body.GetComponent(); - public Component[] GetComponents() where Generic : Component => body.GetComponents(); - - public void RemoveComponent() where Generic : Component => body.RemoveComponent(); - - - - //creation logic - internal void Initiate(Body __body) - { - body = __body; - scene = __body.Scene; - Create(); - } - - internal void End() - { - Destroy(); - } -} \ No newline at end of file diff --git a/Awperative/Kernel/Scripting/Component/hello.cs b/Awperative/Kernel/Scripting/Component/hello.cs deleted file mode 100644 index 5499214..0000000 --- a/Awperative/Kernel/Scripting/Component/hello.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Awperative; - - -public class hello : BodyComponent -{ - public void Start() { - - this.ExtensionTest(); - } -} \ No newline at end of file diff --git a/Awperative/bin/Debug/net8.0/Awperative.dll b/Awperative/bin/Debug/net8.0/Awperative.dll index 5bd431f..8d66d7e 100644 Binary files a/Awperative/bin/Debug/net8.0/Awperative.dll and b/Awperative/bin/Debug/net8.0/Awperative.dll differ diff --git a/Awperative/bin/Debug/net8.0/Awperative.pdb b/Awperative/bin/Debug/net8.0/Awperative.pdb index 357fce2..b523cb1 100644 Binary files a/Awperative/bin/Debug/net8.0/Awperative.pdb and b/Awperative/bin/Debug/net8.0/Awperative.pdb differ diff --git a/Awperative/obj/Awperative.csproj.nuget.dgspec.json b/Awperative/obj/Awperative.csproj.nuget.dgspec.json index 58ccd1e..e8b6061 100644 --- a/Awperative/obj/Awperative.csproj.nuget.dgspec.json +++ b/Awperative/obj/Awperative.csproj.nuget.dgspec.json @@ -1,20 +1,20 @@ { "format": 1, "restore": { - "/home/avery/Programming/Awperative/Awperative/Awperative.csproj": {} + "/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj": {} }, "projects": { - "/home/avery/Programming/Awperative/Awperative/Awperative.csproj": { + "/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "/home/avery/Programming/Awperative/Awperative/Awperative.csproj", + "projectUniqueName": "/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj", "projectName": "Awperative", - "projectPath": "/home/avery/Programming/Awperative/Awperative/Awperative.csproj", - "packagesPath": "/home/avery/.nuget/packages/", - "outputPath": "/home/avery/Programming/Awperative/Awperative/obj/", + "projectPath": "/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj", + "packagesPath": "/Users/averynorris/.nuget/packages/", + "outputPath": "/Users/averynorris/RiderProjects/Awperative/Awperative/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/home/avery/.nuget/NuGet/NuGet.Config" + "/Users/averynorris/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net8.0" @@ -32,7 +32,13 @@ "warnAsError": [ "NU1605" ] - } + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "9.0.300" }, "frameworks": { "net8.0": { @@ -55,12 +61,22 @@ ], "assetTargetFallback": true, "warn": true, + "downloadDependencies": [ + { + "name": "Microsoft.AspNetCore.App.Ref", + "version": "[8.0.20, 8.0.20]" + }, + { + "name": "Microsoft.NETCore.App.Ref", + "version": "[8.0.20, 8.0.20]" + } + ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/lib/dotnet/sdk/8.0.123/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/9.0.305/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Awperative/obj/Awperative.csproj.nuget.g.props b/Awperative/obj/Awperative.csproj.nuget.g.props index 08dec0c..3e128ba 100644 --- a/Awperative/obj/Awperative.csproj.nuget.g.props +++ b/Awperative/obj/Awperative.csproj.nuget.g.props @@ -4,12 +4,12 @@ True NuGet $(MSBuildThisFileDirectory)project.assets.json - /home/avery/.nuget/packages/ - /home/avery/.nuget/packages/ + /Users/averynorris/.nuget/packages/ + /Users/averynorris/.nuget/packages/ PackageReference 6.14.0 - + \ No newline at end of file diff --git a/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfo.cs b/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfo.cs index 994cd9b..5e6ad89 100644 --- a/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfo.cs +++ b/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Awperative")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a78b5aef96c286d7f54b11963ffa6c3090398b85")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+67fca0c271ce945c612999f54223bca0718349dc")] [assembly: System.Reflection.AssemblyProductAttribute("Awperative")] [assembly: System.Reflection.AssemblyTitleAttribute("Awperative")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfoInputs.cache b/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfoInputs.cache index cfff6bc..dda52b7 100644 --- a/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfoInputs.cache +++ b/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfoInputs.cache @@ -1 +1 @@ -5ebc44aa1d8b334bde6fb25c7d47f03612c55ffac27d8f46c1f104b7334054b4 +952122ca1789a87944cd35cf39a919e8125756f5a5b45023331b2add882658ea diff --git a/Awperative/obj/Debug/net8.0/Awperative.GeneratedMSBuildEditorConfig.editorconfig b/Awperative/obj/Debug/net8.0/Awperative.GeneratedMSBuildEditorConfig.editorconfig index d9e84d9..2e98d1b 100644 --- a/Awperative/obj/Debug/net8.0/Awperative.GeneratedMSBuildEditorConfig.editorconfig +++ b/Awperative/obj/Debug/net8.0/Awperative.GeneratedMSBuildEditorConfig.editorconfig @@ -8,6 +8,8 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Awperative -build_property.ProjectDir = /home/avery/Programming/Awperative/Awperative/ +build_property.ProjectDir = /Users/averynorris/RiderProjects/Awperative/Awperative/ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/Awperative/obj/Debug/net8.0/Awperative.assets.cache b/Awperative/obj/Debug/net8.0/Awperative.assets.cache index 73acc41..2c2f0c8 100644 Binary files a/Awperative/obj/Debug/net8.0/Awperative.assets.cache and b/Awperative/obj/Debug/net8.0/Awperative.assets.cache differ diff --git a/Awperative/obj/Debug/net8.0/Awperative.csproj.AssemblyReference.cache b/Awperative/obj/Debug/net8.0/Awperative.csproj.AssemblyReference.cache index 26465f8..5aa557f 100644 Binary files a/Awperative/obj/Debug/net8.0/Awperative.csproj.AssemblyReference.cache and b/Awperative/obj/Debug/net8.0/Awperative.csproj.AssemblyReference.cache differ diff --git a/Awperative/obj/Debug/net8.0/Awperative.csproj.CoreCompileInputs.cache b/Awperative/obj/Debug/net8.0/Awperative.csproj.CoreCompileInputs.cache index 1bd1268..86051e7 100644 --- a/Awperative/obj/Debug/net8.0/Awperative.csproj.CoreCompileInputs.cache +++ b/Awperative/obj/Debug/net8.0/Awperative.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0400c56c4a1b68e1972a170888bce3d3aee36f4c67a26871cb8491bbb0e074af +95848c046b9b32c14cf563754dd778d9bd1782510c1ef05d43cd25a8dc421370 diff --git a/Awperative/obj/Debug/net8.0/Awperative.csproj.FileListAbsolute.txt b/Awperative/obj/Debug/net8.0/Awperative.csproj.FileListAbsolute.txt index 2e3a98e..6388b3b 100644 --- a/Awperative/obj/Debug/net8.0/Awperative.csproj.FileListAbsolute.txt +++ b/Awperative/obj/Debug/net8.0/Awperative.csproj.FileListAbsolute.txt @@ -23,3 +23,16 @@ /home/avery/Programming/Awperative/Awperative/obj/Debug/net8.0/refint/Awperative.dll /home/avery/Programming/Awperative/Awperative/obj/Debug/net8.0/Awperative.pdb /home/avery/Programming/Awperative/Awperative/obj/Debug/net8.0/ref/Awperative.dll +/Users/averynorris/RiderProjects/Awperative/Awperative/bin/Debug/net8.0/Awperative.deps.json +/Users/averynorris/RiderProjects/Awperative/Awperative/bin/Debug/net8.0/Awperative.dll +/Users/averynorris/RiderProjects/Awperative/Awperative/bin/Debug/net8.0/Awperative.pdb +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.csproj.AssemblyReference.cache +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.GeneratedMSBuildEditorConfig.editorconfig +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfoInputs.cache +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.AssemblyInfo.cs +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.csproj.CoreCompileInputs.cache +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.sourcelink.json +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.dll +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/refint/Awperative.dll +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/Awperative.pdb +/Users/averynorris/RiderProjects/Awperative/Awperative/obj/Debug/net8.0/ref/Awperative.dll diff --git a/Awperative/obj/Debug/net8.0/Awperative.dll b/Awperative/obj/Debug/net8.0/Awperative.dll index 5bd431f..8d66d7e 100644 Binary files a/Awperative/obj/Debug/net8.0/Awperative.dll and b/Awperative/obj/Debug/net8.0/Awperative.dll differ diff --git a/Awperative/obj/Debug/net8.0/Awperative.pdb b/Awperative/obj/Debug/net8.0/Awperative.pdb index 357fce2..b523cb1 100644 Binary files a/Awperative/obj/Debug/net8.0/Awperative.pdb and b/Awperative/obj/Debug/net8.0/Awperative.pdb differ diff --git a/Awperative/obj/Debug/net8.0/Awperative.sourcelink.json b/Awperative/obj/Debug/net8.0/Awperative.sourcelink.json index fc75504..212e032 100644 --- a/Awperative/obj/Debug/net8.0/Awperative.sourcelink.json +++ b/Awperative/obj/Debug/net8.0/Awperative.sourcelink.json @@ -1 +1 @@ -{"documents":{"/home/avery/Programming/Awperative/*":"https://raw.githubusercontent.com/BlazeyDotOrg/Awperative/a78b5aef96c286d7f54b11963ffa6c3090398b85/*"}} \ No newline at end of file +{"documents":{"/Users/averynorris/RiderProjects/Awperative/*":"https://raw.githubusercontent.com/BlazeyDotOrg/Awperative/67fca0c271ce945c612999f54223bca0718349dc/*"}} \ No newline at end of file diff --git a/Awperative/obj/Debug/net8.0/ref/Awperative.dll b/Awperative/obj/Debug/net8.0/ref/Awperative.dll index b9b2b16..07df3cd 100644 Binary files a/Awperative/obj/Debug/net8.0/ref/Awperative.dll and b/Awperative/obj/Debug/net8.0/ref/Awperative.dll differ diff --git a/Awperative/obj/Debug/net8.0/refint/Awperative.dll b/Awperative/obj/Debug/net8.0/refint/Awperative.dll index b9b2b16..07df3cd 100644 Binary files a/Awperative/obj/Debug/net8.0/refint/Awperative.dll and b/Awperative/obj/Debug/net8.0/refint/Awperative.dll differ diff --git a/Awperative/obj/project.assets.json b/Awperative/obj/project.assets.json index 721c7fe..13ed217 100644 --- a/Awperative/obj/project.assets.json +++ b/Awperative/obj/project.assets.json @@ -273,19 +273,19 @@ ] }, "packageFolders": { - "/home/avery/.nuget/packages/": {} + "/Users/averynorris/.nuget/packages/": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/home/avery/Programming/Awperative/Awperative/Awperative.csproj", + "projectUniqueName": "/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj", "projectName": "Awperative", - "projectPath": "/home/avery/Programming/Awperative/Awperative/Awperative.csproj", - "packagesPath": "/home/avery/.nuget/packages/", - "outputPath": "/home/avery/Programming/Awperative/Awperative/obj/", + "projectPath": "/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj", + "packagesPath": "/Users/averynorris/.nuget/packages/", + "outputPath": "/Users/averynorris/RiderProjects/Awperative/Awperative/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/home/avery/.nuget/NuGet/NuGet.Config" + "/Users/averynorris/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net8.0" @@ -303,7 +303,13 @@ "warnAsError": [ "NU1605" ] - } + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "9.0.300" }, "frameworks": { "net8.0": { @@ -326,12 +332,22 @@ ], "assetTargetFallback": true, "warn": true, + "downloadDependencies": [ + { + "name": "Microsoft.AspNetCore.App.Ref", + "version": "[8.0.20, 8.0.20]" + }, + { + "name": "Microsoft.NETCore.App.Ref", + "version": "[8.0.20, 8.0.20]" + } + ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/lib/dotnet/sdk/8.0.123/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/9.0.305/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Awperative/obj/project.nuget.cache b/Awperative/obj/project.nuget.cache index a01abdc..9aa2dce 100644 --- a/Awperative/obj/project.nuget.cache +++ b/Awperative/obj/project.nuget.cache @@ -1,15 +1,17 @@ { "version": 2, - "dgSpecHash": "oHHZKOBBLTE=", + "dgSpecHash": "rY6Za5NlkX4=", "success": true, - "projectFilePath": "/home/avery/Programming/Awperative/Awperative/Awperative.csproj", + "projectFilePath": "/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj", "expectedPackageFiles": [ - "/home/avery/.nuget/packages/monogame.framework.desktopgl/3.8.4.1/monogame.framework.desktopgl.3.8.4.1.nupkg.sha512", - "/home/avery/.nuget/packages/monogame.library.openal/1.24.3.2/monogame.library.openal.1.24.3.2.nupkg.sha512", - "/home/avery/.nuget/packages/monogame.library.sdl/2.32.2.1/monogame.library.sdl.2.32.2.1.nupkg.sha512", - "/home/avery/.nuget/packages/nvorbis/0.10.4/nvorbis.0.10.4.nupkg.sha512", - "/home/avery/.nuget/packages/system.memory/4.5.3/system.memory.4.5.3.nupkg.sha512", - "/home/avery/.nuget/packages/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg.sha512" + "/Users/averynorris/.nuget/packages/monogame.framework.desktopgl/3.8.4.1/monogame.framework.desktopgl.3.8.4.1.nupkg.sha512", + "/Users/averynorris/.nuget/packages/monogame.library.openal/1.24.3.2/monogame.library.openal.1.24.3.2.nupkg.sha512", + "/Users/averynorris/.nuget/packages/monogame.library.sdl/2.32.2.1/monogame.library.sdl.2.32.2.1.nupkg.sha512", + "/Users/averynorris/.nuget/packages/nvorbis/0.10.4/nvorbis.0.10.4.nupkg.sha512", + "/Users/averynorris/.nuget/packages/system.memory/4.5.3/system.memory.4.5.3.nupkg.sha512", + "/Users/averynorris/.nuget/packages/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg.sha512", + "/Users/averynorris/.nuget/packages/microsoft.netcore.app.ref/8.0.20/microsoft.netcore.app.ref.8.0.20.nupkg.sha512", + "/Users/averynorris/.nuget/packages/microsoft.aspnetcore.app.ref/8.0.20/microsoft.aspnetcore.app.ref.8.0.20.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Awperative/obj/project.packagespec.json b/Awperative/obj/project.packagespec.json index f45ed5a..7b00ac3 100644 --- a/Awperative/obj/project.packagespec.json +++ b/Awperative/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/home/avery/Programming/Awperative/Awperative/Awperative.csproj","projectName":"Awperative","projectPath":"/home/avery/Programming/Awperative/Awperative/Awperative.csproj","outputPath":"/home/avery/Programming/Awperative/Awperative/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"MonoGame.Framework.DesktopGL":{"suppressParent":"All","target":"Package","version":"[3.8.*, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/lib/dotnet/sdk/8.0.123/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj","projectName":"Awperative","projectPath":"/Users/averynorris/RiderProjects/Awperative/Awperative/Awperative.csproj","outputPath":"/Users/averynorris/RiderProjects/Awperative/Awperative/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"MonoGame.Framework.DesktopGL":{"suppressParent":"All","target":"Package","version":"[3.8.*, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[8.0.20, 8.0.20]"},{"name":"Microsoft.NETCore.App.Ref","version":"[8.0.20, 8.0.20]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/local/share/dotnet/sdk/9.0.305/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/Awperative/obj/rider.project.model.nuget.info b/Awperative/obj/rider.project.model.nuget.info index 20d25bd..04de3fb 100644 --- a/Awperative/obj/rider.project.model.nuget.info +++ b/Awperative/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17705828079759943 \ No newline at end of file +17705966520825743 \ No newline at end of file diff --git a/Awperative/obj/rider.project.restore.info b/Awperative/obj/rider.project.restore.info index 0e34b82..4a11dac 100644 --- a/Awperative/obj/rider.project.restore.info +++ b/Awperative/obj/rider.project.restore.info @@ -1 +1 @@ -17705828120140388 \ No newline at end of file +17705973335994258 \ No newline at end of file