Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

357 remove icons desktop #420

Merged
merged 8 commits into from
Feb 23, 2022
Merged

357 remove icons desktop #420

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81c1aba
Removed all deps to Sys.Draw and removed all code regarding icons
wrestledBearOnce Jan 24, 2022
c300a30
Repaired wrong ctor call to non window version
wrestledBearOnce Jan 24, 2022
5f9b3f1
Merge branch 'develop' into 357-remove-icons-desktop
wrestledBearOnce Jan 28, 2022
dd51251
Re-enabled window icons, fixed compute fractal example
wrestledBearOnce Jan 28, 2022
b89e45c
Linting
wrestledBearOnce Jan 28, 2022
c051722
Merge remote-tracking branch 'origin/develop' into 357-remove-icons-d…
wrestledBearOnce Jan 28, 2022
2bb1d15
Merge branch 'develop' into 357-remove-icons-desktop
wrestledBearOnce Feb 23, 2022
063ff4b
Convert icon from Bgra to Rgba and flip vertically
wrestledBearOnce Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Examples/Complete/AdvancedUI/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions Examples/Complete/AdvancedUI/Desktop/Fusee.Examples.AdvancedUI.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputPath>$(BaseOutputPath)\Examples\AdvancedUI\Desktop\</OutputPath>
Expand All @@ -11,8 +11,7 @@
<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="6.0.0" />

</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/AdvancedUI/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public static void Main()
Core.AdvancedUI app = new();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/BoneAnimation/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions Examples/Complete/BoneAnimation/Desktop/Fusee.Examples.BoneAnimation.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputPath>$(BaseOutputPath)\Examples\BoneAnimation\Desktop\</OutputPath>
Expand All @@ -11,8 +11,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.BoneAnimation.Core.csproj" />

<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/BoneAnimation/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public static void Main()
var app = new Fusee.Examples.BoneAnimation.Core.Bone();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
var appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/Camera/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions Examples/Complete/Camera/Desktop/Fusee.Examples.Camera.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,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="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/Camera/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public static void Main()
var app = new Core.CameraExample();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/ComputeFractal/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Examples/Complete/ComputeFractal/Core/ComputeFractal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public override void Init()
{
_gui = FuseeGuiHelper.CreateDefaultGui(this, CanvasRenderMode.Screen, "Fractal Magnification Factor: " + _depthFactor);
_guiRenderer = new SceneRendererForward(_gui);
_depthFactorText = _gui.Children[0].Children[1].Children[0].GetComponent<GuiText>();
_depthFactorText = _gui.Children[0].Children[0].Children[1].Children[0].GetComponent<GuiText>();

// Set the clear color for the backbuffer to white (100% intensity in all color channels R, G, B, A).
RC.ClearColor = new float4(1, 1, 1, 1);
Expand Down
2 changes: 0 additions & 2 deletions Examples/Complete/ComputeFractal/Desktop/Fusee.Examples.ComputeFractal.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,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.ComputeFractal.Core.csproj" />

<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/ComputeFractal/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public static void Main()
var app = new Core.ComputeFractal();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/Deferred/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions Examples/Complete/Deferred/Desktop/Fusee.Examples.Deferred.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputPath>$(BaseOutputPath)\Examples\Deferred\Desktop\</OutputPath>
Expand All @@ -11,8 +11,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.Deferred.Core.csproj" />

<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/Deferred/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public static void Main()
var app = new Core.Deferred();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/GeometryEditing/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions Examples/Complete/GeometryEditing/Desktop/Fusee.Examples.GeometryEditing.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,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="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/GeometryEditing/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public static void Main()
var app = new Core.GeometryEditing();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
3 changes: 1 addition & 2 deletions Examples/Complete/Integrations/Wpf/View/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ private void OpenFusee()
fuseeApp.FusToWpfEvents += FusToWpfEvents;

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
fuseeApp.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
fuseeApp.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp();
fuseeApp.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(fuseeApp.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(fuseeApp.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(fuseeApp.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/Labyrinth/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions Examples/Complete/Labyrinth/Desktop/Fusee.Examples.Labyrinth.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,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.Labyrinth.Core.csproj" />

<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/Labyrinth/Desktop/MainDesktop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public static void Main()
var app = new Core.Labyrinth();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/Materials/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions Examples/Complete/Materials/Desktop/Fusee.Examples.Materials.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputPath>$(BaseOutputPath)\Examples\Materials\Desktop\</OutputPath>
Expand All @@ -11,8 +11,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="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/Materials/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public static void Main()
var app = new Core.Materials();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/MeshingAround/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions Examples/Complete/MeshingAround/Desktop/Fusee.Examples.MeshingAround.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,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="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/MeshingAround/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public static void Main()
var app = new Core.MeshingAround();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
var appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Binary file added Examples/Complete/Picking/Core/Assets/FuseeIconTop32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions Examples/Complete/Picking/Desktop/Fusee.Examples.Picking.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,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="6.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Examples/Complete/Picking/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public static void Main()
var app = new Core.Picking();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
var icon = AssetStorage.Get<ImageData>("FuseeIconTop32.png");
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(icon);
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
2 changes: 0 additions & 2 deletions Examples/Complete/PointCloudLive/Desktop/Fusee.Examples.PointCloudLive.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,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.PointCloudLive.Core.csproj" />

<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions Examples/Complete/PointCloudLive/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public static void Main()
var app = new Core.PointCloudLive();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
app.CanvasImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasImp();
app.ContextImplementor = new Fusee.Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Fusee.Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
2 changes: 0 additions & 2 deletions ...es/Complete/PointCloudOutOfCore/Desktop/Fusee.Examples.PointCloudOutOfCore.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<ProjectReference Include="$(FuseeEngineRoot)\src\Engine\Imp\Graphics\Desktop\Fusee.Engine.Imp.Graphics.Desktop.csproj" />
<ProjectReference Include="$(FuseeEngineRoot)\src\PointCloud\Core\Fusee.PointCloud.Core.csproj" />
<ProjectReference Include="..\Core\Fusee.Examples.PointCloudOutOfCore.Core.csproj" />

<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions Examples/Complete/PointCloudOutOfCore/Desktop/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ public static void Main()
AppSetup.DoSetup(out IPcRendering app, ptType, PtRenderingParams.Instance.MaxNoOfVisiblePoints, PtRenderingParams.Instance.PathToOocFile);

// Inject Fusee.Engine InjectMe dependencies (hard coded)
System.Drawing.Icon appIcon = System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
app.CanvasImplementor = new Engine.Imp.Graphics.Desktop.RenderCanvasImp(appIcon);
app.CanvasImplementor = new Engine.Imp.Graphics.Desktop.RenderCanvasImp();
app.ContextImplementor = new Engine.Imp.Graphics.Desktop.RenderContextImp(app.CanvasImplementor);
Input.AddDriverImp(new Engine.Imp.Graphics.Desktop.RenderCanvasInputDriverImp(app.CanvasImplementor));
Input.AddDriverImp(new Engine.Imp.Graphics.Desktop.WindowsTouchInputDriverImp(app.CanvasImplementor));
Expand Down
Loading