Skip to content

Commit

Permalink
Merge pull request #301 from FUSEEProjectTeam/develop
Browse files Browse the repository at this point in the history
Release 0.10.0
  • Loading branch information
griestopf authored May 10, 2021
2 parents 3a76195 + a962271 commit a703197
Show file tree
Hide file tree
Showing 201 changed files with 3,632 additions and 1,290 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-format": {
"version": "3.3.111304",
"version": "4.1.131201",
"commands": [
"dotnet-format"
]
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,20 @@ jobs:
matrix:
os: [ 'windows-latest' ]
runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Math
run: dotnet test -c Release src/Tests/Math/Core/Fusee.Test.Math.Core.csproj

- name: Serialization V1
run: dotnet test -c Release src/Tests/Serialization/Fusee.Serialization.Test/Fusee.Test.Serialization.V1.csproj


- name: Assets
run: dotnet test -c Release src/Tests/AssetStorage/Desktop/Fusee.Test.AssetStorage.Desktop.csproj

- name: Xene
run: dotnet test -c Release src/Tests/Xene/Fusee.Xene.Test/Fusee.Test.Xene.csproj

Expand Down Expand Up @@ -93,9 +96,9 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1

- name: Build with MSBuild
run: msbuild Fusee.sln -r -p:Configuration=Release-Android
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
- name: dotnet tool restore
run: dotnet tool restore
- name: dotnet format folder
run: dotnet tool run dotnet-format -f . --exclude src\Engine\Imp\Graphics\Shared
run: dotnet tool run dotnet-format . -f --exclude src\Engine\Imp\Graphics\Shared
- name: dotnet format solution
run: dotnet tool run dotnet-format
run: dotnet tool run dotnet-format Fusee.sln
- name: Commiting changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
Expand Down
11 changes: 5 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<Authors>FuseeProjectTeam</Authors>
<Company>Furtwangen University</Company>
<Product>FUSEE</Product>
<Version>0.9.1.0</Version>
<AssemblyVersion>0.9.1.0</AssemblyVersion>
<FileVersion>0.9.1.0</FileVersion>
<PackageVersion>0.9.1.0</PackageVersion>
<Version>0.10.0.0</Version>
<AssemblyVersion>0.10.0.0</AssemblyVersion>
<FileVersion>0.10.0.0-b</FileVersion>
<PackageVersion>0.10.0.0</PackageVersion>
<Copyright>Copyright © 2013-today</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://fusee3d.org/</PackageProjectUrl>
Expand All @@ -37,9 +37,8 @@
<!--
Suppress warnings
1701 and 1702 is standard.
NU1701: Package restore of OpenTK 3.1 with net462 - remove after update to OpenTK 4
-->
<NoWarn>1701;1702;NU1701</NoWarn>
<NoWarn>1701;1702</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.AdvancedUI.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.Bone.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Examples/Complete/Camera/Android/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
using System.IO;
using Android.App;
using Android.Content.PM;
using Android.OS;
using Android.Util;
using Android.Views;
using Android.Widget;
using Fusee.Base.Core;
using Fusee.Base.Common;
using Fusee.Base.Core;
using Fusee.Base.Imp.Android;
using Fusee.Engine.Common;
using Fusee.Engine.Core;
using Fusee.Engine.Core.Scene;
using Fusee.Engine.Imp.Graphics.Android;
using Fusee.Serialization;
using System.IO;
using Font = Fusee.Base.Core.Font;
using Path = Fusee.Base.Common.Path;
using Fusee.Engine.Common;
using Fusee.Engine.Core.Scene;

namespace Fusee.Examples.Camera.Android
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
6 changes: 3 additions & 3 deletions Examples/Complete/Camera/Core/Camera.cs
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@ public override void RenderAFrame()
}

float4x4 viewProjection = _mainCam.GetProjectionMat(Width, Height, out float4 viewport) * float4x4.Invert(_mainCamTransform.Matrix());
_frustum.Vertices = Frustum.CalculateFrustumCorners(viewProjection).ToArray();
_frustum.Vertices = FrustumF.CalculateFrustumCorners(viewProjection).ToArray();

Frustum frustum = new Frustum();
FrustumF frustum = new FrustumF();
frustum.CalculateFrustumPlanes(viewProjection);

// Sets a mesh inactive if it does not pass the culling test and active if it does.
Expand All @@ -206,7 +206,7 @@ public override void RenderAFrame()
Present();
}

private void UserSideFrustumCulling(IList<SceneNode> nodeChildren, Frustum frustum)
private void UserSideFrustumCulling(IList<SceneNode> nodeChildren, FrustumF frustum)
{
foreach (SceneNode node in nodeChildren)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.Camera.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.GeometryEditing.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.Materials.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.MeshingAround.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.NormalMap.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.Picking.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.RenderLayer.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Android.App;
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Desktop\Fusee.Base.Imp.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.Simple.Core.csproj" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<PackageReference Include="protobuf-net" Version="3.0.62" />
<PackageReference Include="protobuf-net" Version="3.0.101" />
</ItemGroup>
<!-- Fusee References -->
<ItemGroup>
Expand Down
Loading

0 comments on commit a703197

Please sign in to comment.