- Updated all nuget packages

- Capped NUnit, OpenTK and Moq to their respective versions - Downgraded OpenTK to 4.3.0 for editor integration - see opentk/GLWpfControl#73 - Renamed TagComponent to Tag - Removed FinalEngine.Rendering.Components - Transform now implements IEntityComponent
softwareantics · Apr 17, 2024 · ec2241b · ec2241b
1 parent 02bed33
commit ec2241b
Show file tree

Hide file tree

Showing 26 changed files with 213 additions and 289 deletions.
diff --git a/...ngine.ECS/Components/Core/TagComponent.cs → FinalEngine.ECS/Components/Core/Tag.cs b/...ngine.ECS/Components/Core/TagComponent.cs → FinalEngine.ECS/Components/Core/Tag.cs
@@ -1,4 +1,4 @@
-// <copyright file="TagComponent.cs" company="Software Antics">
+// <copyright file="Tag.cs" company="Software Antics">
 //     Copyright (c) Software Antics. All rights reserved.
 // </copyright>
 
@@ -17,7 +17,7 @@ namespace FinalEngine.ECS.Components.Core;
 /// <seealso cref="IEntityComponent" />
 /// <seealso cref="INotifyPropertyChanged" />
 [Category("Core")]
-public sealed class TagComponent : IEntityComponent, INotifyPropertyChanged
+public sealed class Tag : IEntityComponent, INotifyPropertyChanged
 {
     private string? name;
 

diff --git a/FinalEngine.Editor.Common/FinalEngine.Editor.Common.csproj b/FinalEngine.Editor.Common/FinalEngine.Editor.Common.csproj
@@ -23,18 +23,17 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.IO.Abstractions" Version="20.0.4" />
+    <PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\FinalEngine.ECS\FinalEngine.ECS.csproj" />
-    <ProjectReference Include="..\FinalEngine.Rendering.Components\FinalEngine.Rendering.Components.csproj" />
     <ProjectReference Include="..\FinalEngine.Rendering\FinalEngine.Rendering.csproj" />
   </ItemGroup>
 </Project>
diff --git a/FinalEngine.Editor.Common/Models/Scenes/Scene.cs b/FinalEngine.Editor.Common/Models/Scenes/Scene.cs
@@ -11,7 +11,7 @@ namespace FinalEngine.Editor.Common.Models.Scenes;
 using FinalEngine.ECS;
 using FinalEngine.ECS.Components.Core;
 using FinalEngine.ECS.Exceptions;
-using FinalEngine.Rendering.Components.Core;
+using FinalEngine.Rendering.Core;
 using Microsoft.Extensions.Logging;
 
 public sealed class Scene : IScene
@@ -42,12 +42,12 @@ public void AddEntity(string tag, Guid uniqueID)
 
         var entity = new Entity(uniqueID);
 
-        entity.AddComponent(new TagComponent()
+        entity.AddComponent(new Tag()
         {
             Name = tag,
         });
 
-        entity.AddComponent(new TransformComponent());
+        entity.AddComponent(new Transform());
 
         this.world.AddEntity(entity);
         this.entities.Add(entity);

diff --git a/FinalEngine.Editor.Desktop/FinalEngine.Editor.Desktop.csproj b/FinalEngine.Editor.Desktop/FinalEngine.Editor.Desktop.csproj
@@ -26,17 +26,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dirkster.AvalonDock" Version="4.72.0" />
-    <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.0" />
-    <PackageReference Include="EventBinder" Version="2.5.2" />
-    <PackageReference Include="GLWpfControl" Version="1.0.0" />
+    <PackageReference Include="Dirkster.AvalonDock" Version="4.72.1" />
+    <PackageReference Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
+    <PackageReference Include="EventBinder" Version="2.5.3" />
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    <PackageReference Include="OpenTK.GLWpfControl" Version="4.2.3" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/FinalEngine.Editor.Desktop/Views/Scenes/SceneView.xaml b/FinalEngine.Editor.Desktop/Views/Scenes/SceneView.xaml
@@ -12,14 +12,6 @@
         <glwpf:GLWpfControl x:Name="glWpfControl"
                             RegisterToEventsDirectly="False"
                             CanInvokeOnHandledEvents="False"
-                            Render="{eb:EventBinding RenderCommand.Execute, `null`}">
-            <glwpf:GLWpfControl.Settings>
-                <glwpf:GLWpfControlSettings MajorVersion="4"
-                                            MinorVersion="5"
-                                            GraphicsContextFlags="ForwardCompatible"
-                                            GraphicsProfile="Core"
-                                            RenderContinuously="True" />
-            </glwpf:GLWpfControl.Settings>
-        </glwpf:GLWpfControl>
+                            Render="{eb:EventBinding RenderCommand.Execute, `null`}" />
     </Grid>
 </UserControl>
diff --git a/FinalEngine.Editor.Desktop/Views/Scenes/SceneView.xaml.cs b/FinalEngine.Editor.Desktop/Views/Scenes/SceneView.xaml.cs
@@ -5,12 +5,22 @@
 namespace FinalEngine.Editor.Desktop.Views.Scenes;
 
 using System.Windows.Controls;
+using OpenTK.Windowing.Common;
+using OpenTK.Wpf;
 
 public partial class SceneView : UserControl
 {
     public SceneView()
     {
         this.InitializeComponent();
-        this.glWpfControl.Start();
+
+        this.glWpfControl.Start(new GLWpfControlSettings()
+        {
+            MajorVersion = 4,
+            MinorVersion = 6,
+            GraphicsProfile = ContextProfile.Compatability,
+            GraphicsContextFlags = ContextFlags.ForwardCompatible,
+            RenderContinuously = true,
+        });
     }
 }
diff --git a/FinalEngine.Editor.ViewModels/FinalEngine.Editor.ViewModels.csproj b/FinalEngine.Editor.ViewModels/FinalEngine.Editor.ViewModels.csproj
@@ -19,12 +19,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/FinalEngine.Editor.ViewModels/Inspectors/EntityComponentViewModel.cs b/FinalEngine.Editor.ViewModels/Inspectors/EntityComponentViewModel.cs
@@ -134,7 +134,7 @@ public ICommand ToggleCommand
 
     private bool CanRemove()
     {
-        return this.component.GetType() != typeof(TagComponent);
+        return this.component.GetType() != typeof(Tag);
     }
 
     private void Remove()

diff --git a/FinalEngine.Editor.ViewModels/Inspectors/EntityInspectorViewModel.cs b/FinalEngine.Editor.ViewModels/Inspectors/EntityInspectorViewModel.cs
@@ -78,7 +78,7 @@ private void IntializeComponentTypes()
     {
         this.categorizedComponentTypes.Clear();
 
-        var assembly = Assembly.GetAssembly(typeof(TagComponent)) ?? throw new TypeAccessException("Failed to initialize core engine components.");
+        var assembly = Assembly.GetAssembly(typeof(Tag)) ?? throw new TypeAccessException("Failed to initialize core engine components.");
 
         var categoryToTypeMap = this.typeResolver.GetCategorizedTypes(assembly);
 

diff --git a/FinalEngine.Examples.Sponza/FinalEngine.Examples.Sponza.csproj b/FinalEngine.Examples.Sponza/FinalEngine.Examples.Sponza.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="AssimpNet" Version="4.1.0" />
     <PackageReference Include="ImGui.NET" Version="1.88.0" />
-    <PackageReference Include="System.IO.Abstractions" Version="20.0.4" />
+    <PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
   </ItemGroup>
 
   <ItemGroup>