Merge pull request #45 from jwoff78/main

Cleanup, new render, refactor
OrkEngine · Sep 18, 2023 · 4241a9e · 4241a9e
2 parents e958b5d + 6256df1
commit 4241a9e
Show file tree

Hide file tree

Showing 122 changed files with 3,718 additions and 29,640 deletions.
diff --git a/source/OrkEngine3D.Annotations/OrkEngine3D.Annotations.csproj b/source/OrkEngine3D.Annotations/OrkEngine3D.Annotations.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
   </PropertyGroup>

diff --git a/source/OrkEngine3D.Common.Utils/AssetDatabase.cs b/source/OrkEngine3D.Common.Utils/AssetDatabase.cs
diff --git a/source/OrkEngine3D.Common.Utils/AssetDefinition.cs b/source/OrkEngine3D.Common.Utils/AssetDefinition.cs
diff --git a/source/OrkEngine3D.Common.Utils/AssetID.cs b/source/OrkEngine3D.Common.Utils/AssetID.cs
diff --git a/source/OrkEngine3D.Common.Utils/AssetLoader.cs b/source/OrkEngine3D.Common.Utils/AssetLoader.cs
diff --git a/source/OrkEngine3D.Common.Utils/AssetRef.cs b/source/OrkEngine3D.Common.Utils/AssetRef.cs
diff --git a/source/OrkEngine3D.Common.Utils/CreatedResourceCache.cs b/source/OrkEngine3D.Common.Utils/CreatedResourceCache.cs
diff --git a/source/OrkEngine3D.Common.Utils/OrkEngine3D.Common.Utils.csproj b/source/OrkEngine3D.Common.Utils/OrkEngine3D.Common.Utils.csproj
diff --git a/source/OrkEngine3D.Components.Tests/OrkEngine3D.Components.Tests.csproj b/source/OrkEngine3D.Components.Tests/OrkEngine3D.Components.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/source/OrkEngine3D.Core/Components/Transform.cs b/source/OrkEngine3D.Core/Components/Transform.cs
@@ -364,7 +364,7 @@ private void OnParentRotationChanged(Quaternion oldParentRot, Quaternion newPare
             Quaternion diff = Quaternion.Concatenate(Quaternion.Inverse(oldParentRot), newParentRot);
             _physicsEntity.Orientation = Quaternion.Concatenate(_physicsEntity.BufferedStates.InterpolatedStates.Orientation, diff);
             Vector3 basisDirection = Vector3.Transform(GetInterpolatedPosition() - _parent.Position, Quaternion.Inverse(oldRot));
-            float distance = basisDirection.Length();
+            float distance = basisDirection.Length;
             Vector3 newDirection = Vector3.Transform(basisDirection, newParentRot);
             if (newDirection != Vector3.Zero)
             {

diff --git a/source/OrkEngine3D.Core/OrkEngine3D.Core.csproj b/source/OrkEngine3D.Core/OrkEngine3D.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
   </PropertyGroup>
@@ -13,8 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\OrkEngine3D.Common.Utils\OrkEngine3D.Common.Utils.csproj" />
-    <ProjectReference Include="..\OrkEngine3D.Mathematics\OrkEngine3D.Mathematics.csproj" />
+    <ProjectReference Include="..\vendor\OrkEngine3D.Mathematics\source\OrkEngine3D.Mathematics\OrkEngine3D.Mathematics.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/source/OrkEngine3D.Diagnostics/OrkEngine3D.Diagnostics.csproj b/source/OrkEngine3D.Diagnostics/OrkEngine3D.Diagnostics.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <RootNamespace>OrkEngine3D.Diagnostics</RootNamespace>

diff --git a/source/OrkEngine3D.Graphics.Tests/OrkEngine3D.Graphics.Tests.csproj b/source/OrkEngine3D.Graphics.Tests/OrkEngine3D.Graphics.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenTK" Version="5.0.0-pre.7" />
+	  <PackageReference Include="OpenTK" Version="4.7.7" />
   </ItemGroup>
 
 </Project>