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

Jump to bottom

helix upgrade #14134

Merged
merged 20 commits into from
Aug 7, 2023
Merged

helix upgrade #14134

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a00ddde
helix upgrade
marbelarrietaGlobant Jul 6, 2023
fa59635
Merge branch 'master' into DYN-5989
marbelarrietaGlobant Jul 7, 2023
b7f9385
fix csproj
marbelarrietaGlobant Jul 7, 2023
dc65a77
moving libraries in multitargeting
marbelarrietaGlobant Jul 10, 2023
a423b8c
Merge branch 'master' into DYN-5989
marbelarrietaGlobant Jul 10, 2023
918e91c
Update DynamoCoreWpf.csproj
marbelarrietaGlobant Jul 10, 2023
c6c776e
Merge branch 'master' into DYN-5989
marbelarrietaGlobant Jul 12, 2023
ce7962d
Update Watch3DNodeModelsWpf.csproj
marbelarrietaGlobant Jul 12, 2023
7152ff0
Merge remote-tracking branch 'upstream/master' into DYN-5989
marbelarrietaGlobant Jul 27, 2023
76a5d35
fix merge
marbelarrietaGlobant Jul 27, 2023
d2d2549
fix common dependencies
marbelarrietaGlobant Jul 27, 2023
7acaf82
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
mjkkirschner Aug 3, 2023
d518661
update hlsl refs
mjkkirschner Aug 4, 2023
0b731d4
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
mjkkirschner Aug 4, 2023
0f7fb1d
update shaders
mjkkirschner Aug 4, 2023
80a80d2
updates
mjkkirschner Aug 4, 2023
a3ae207
sln update
mjkkirschner Aug 4, 2023
d3a890c
Merge branch 'master' of https://github.com/DynamoDS/Dynamo into DYN-…
mjkkirschner Aug 4, 2023
f4bc5ca
merge
mjkkirschner Aug 4, 2023
0a5aac1
do not yet build viz tests
mjkkirschner Aug 4, 2023
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
34 changes: 30 additions & 4 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,32 @@
<None Remove="Views\Menu\TrustedPathView.xaml" />
<None Remove="Views\GuidedTour\HtmlPages\Resources\ConnectTheNode.gif" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="HelixToolkit" Version="2.24.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<Reference Include="System.Configuration" />
<Reference Include="PresentationCore" />
<PackageReference Include="HelixToolkit.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.24.0" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
</ItemGroup>
Expand Down Expand Up @@ -140,9 +166,6 @@
<PackageReference Include="RestSharp" Version="106.12.0" />
<PackageReference Include="FontAwesome.WPF" Version="4.7.0.9" CopyXML="true" />
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
<PackageReference Include="HelixToolkit" Version="2.17.0" />
<PackageReference Include="HelixToolkit.Wpf" Version="2.17.0" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.17.0" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0">
<IncludeAssets>none</IncludeAssets>
Expand All @@ -157,7 +180,10 @@
<Reference Include="Dynamo.Microsoft.Xaml.Behaviors, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\extern\Microsoft.Xaml.Behaviors\$(TargetFramework)\Dynamo.Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
</Reference>
<Reference Include="Microsoft.Practices.Prism">
<HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
</Reference>
<PackageReference Include="Prism.Core" Version="8.1.97" />
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
using Autodesk.DesignScript.Interfaces;
using Dynamo.Visualization;
using HelixToolkit.Wpf.SharpDX;
mjkkirschner marked this conversation as resolved.
Show resolved Hide resolved
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
#endif
using SharpDX;
using ITransformable = Autodesk.DesignScript.Interfaces.ITransformable;

Expand Down
7 changes: 6 additions & 1 deletion src/DynamoCoreWpf/ViewModels/Watch3D/DynamoEffectsManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
using HelixToolkit.SharpDX.Core.Shaders;
#else
using HelixToolkit.Wpf.SharpDX;
using HelixToolkit.Wpf.SharpDX.Shaders;
#endif
using System;

namespace Dynamo.Wpf.ViewModels.Watch3D
Expand Down
15 changes: 11 additions & 4 deletions src/DynamoCoreWpf/ViewModels/Watch3D/DynamoGeometryModel3D.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
using System;
using System.Windows;
using System;
using System.Windows;
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
using HelixToolkit.SharpDX.Core.Core;
using HelixToolkit.SharpDX.Core.Model.Scene;
#else
using HelixToolkit.Wpf.SharpDX;
using HelixToolkit.Wpf.SharpDX.Core;
using HelixToolkit.Wpf.SharpDX.Model.Scene;
#endif

namespace Dynamo.Wpf.ViewModels.Watch3D
{
Expand Down Expand Up @@ -90,9 +97,9 @@ protected override RenderCore OnCreateRenderCore()
return new DynamoGeometryMeshCore();
}

protected override IRenderTechnique OnCreateRenderTechnique(IRenderHost host)
protected override IRenderTechnique OnCreateRenderTechnique(IEffectsManager effectsManager)
{
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
return host.EffectsManager[DynamoEffectsManager.DynamoMeshShaderName];
return effectsManager[DynamoEffectsManager.DynamoMeshShaderName];
}
}
}
12 changes: 9 additions & 3 deletions src/DynamoCoreWpf/ViewModels/Watch3D/DynamoLineGeometryModel3D.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
using System;
using System;
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
using HelixToolkit.SharpDX.Core.Core;
using HelixToolkit.SharpDX.Core.Model.Scene;
#else
using HelixToolkit.Wpf.SharpDX.Core;
using HelixToolkit.Wpf.SharpDX.Model.Scene;
#endif


namespace Dynamo.Wpf.ViewModels.Watch3D
Expand Down Expand Up @@ -41,9 +47,9 @@ protected override RenderCore OnCreateRenderCore()
return new DynamoPointLineRenderCore();
}

protected override IRenderTechnique OnCreateRenderTechnique(IRenderHost host)
protected override IRenderTechnique OnCreateRenderTechnique(IEffectsManager effectsManager)
{
return host.EffectsManager[DynamoEffectsManager.DynamoLineShaderName];
return effectsManager[DynamoEffectsManager.DynamoLineShaderName];
}
}
}
12 changes: 9 additions & 3 deletions src/DynamoCoreWpf/ViewModels/Watch3D/DynamoPointGeometryModel3D.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
using System;
using System;
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
using HelixToolkit.SharpDX.Core.Core;
using HelixToolkit.SharpDX.Core.Model.Scene;
#else
using HelixToolkit.Wpf.SharpDX.Core;
using HelixToolkit.Wpf.SharpDX.Model.Scene;
#endif

namespace Dynamo.Wpf.ViewModels.Watch3D
{
Expand Down Expand Up @@ -31,9 +37,9 @@ protected override RenderCore OnCreateRenderCore()
return new DynamoPointLineRenderCore();
}

protected override IRenderTechnique OnCreateRenderTechnique(IRenderHost host)
protected override IRenderTechnique OnCreateRenderTechnique(IEffectsManager effectsManager)
{
return host.EffectsManager[DynamoEffectsManager.DynamoPointShaderName];
return effectsManager[DynamoEffectsManager.DynamoPointShaderName];
}
}

Expand Down
6 changes: 5 additions & 1 deletion src/DynamoCoreWpf/ViewModels/Watch3D/DynamoPointLineRenderCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
using System.Windows;
using System.Windows;
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
using HelixToolkit.SharpDX.Core.Core;
#else
using HelixToolkit.Wpf.SharpDX.Core;
#endif

namespace Dynamo.Wpf.ViewModels.Watch3D
{
Expand Down
18 changes: 17 additions & 1 deletion src/DynamoCoreWpf/ViewModels/Watch3D/HelixWatch3DViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,32 @@
using Dynamo.Wpf.Rendering;
using DynamoUtilities;
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
using HelixToolkit.SharpDX.Core.Shaders;
#else
using HelixToolkit.Wpf.SharpDX.Shaders;
#endif
using System;
using HelixToolkit.Wpf.SharpDX.Utilities;
using Newtonsoft.Json;
using SharpDX;
using Color = SharpDX.Color;
using ColorConverter = System.Windows.Media.ColorConverter;
using GeometryModel3D = HelixToolkit.Wpf.SharpDX.GeometryModel3D;
using Matrix = SharpDX.Matrix;
#if NET5_0_OR_GREATER
using GeometryModel3D = HelixToolkit.Wpf.SharpDX.GeometryModel3D;
using MeshBuilder = HelixToolkit.SharpDX.Core.MeshBuilder;
using MeshGeometry3D = HelixToolkit.SharpDX.Core.MeshGeometry3D;
using PerspectiveCamera = HelixToolkit.Wpf.SharpDX.PerspectiveCamera;
using TextInfo = HelixToolkit.SharpDX.Core.TextInfo;
#else
using GeometryModel3D = HelixToolkit.Wpf.SharpDX.GeometryModel3D;
mjkkirschner marked this conversation as resolved.
Show resolved Hide resolved
using MeshBuilder = HelixToolkit.Wpf.SharpDX.MeshBuilder;
using MeshGeometry3D = HelixToolkit.Wpf.SharpDX.MeshGeometry3D;
using PerspectiveCamera = HelixToolkit.Wpf.SharpDX.PerspectiveCamera;
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
using TextInfo = HelixToolkit.Wpf.SharpDX.TextInfo;
#endif

namespace Dynamo.Wpf.ViewModels.Watch3D
{
Expand Down Expand Up @@ -209,10 +223,12 @@ public class HelixWatch3DViewModel : DefaultWatch3DViewModel
private readonly Dictionary<string, List<Tuple<string, Vector3>>> labelPlaces
= new Dictionary<string, List<Tuple<string, Vector3>>>();

#if NET48
// This makes sure the NVidia graphics card is used for rendering when available. In the absence of this
// there are found to be issues with Helix crashing when the app is used with external monitors.
// See: https://github.com/helix-toolkit/helix-toolkit/wiki/Tips-on-performance-optimization-(WPF.SharpDX-and-UWP)#2-laptops-with-nvidia-optimus-dual-graphics-cardhelixtoolkitsharpdx-only
private static NVOptimusEnabler nvEnabler = new NVOptimusEnabler();
#endif

#if DEBUG
private readonly Stopwatch renderTimer = new Stopwatch();
Expand Down
5 changes: 4 additions & 1 deletion src/DynamoCoreWpf/Views/Preview/CameraExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using System.Windows.Media.Media3D;
using System.Windows.Media.Media3D;
using Dynamo.Wpf.ViewModels.Watch3D;
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
#endif
using SharpDX;
using OrthographicCamera = HelixToolkit.Wpf.SharpDX.OrthographicCamera;
using PerspectiveCamera = HelixToolkit.Wpf.SharpDX.PerspectiveCamera;
Expand Down
5 changes: 4 additions & 1 deletion src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Windows;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
Expand All @@ -9,6 +9,9 @@
using Dynamo.Visualization;
using Dynamo.Wpf.ViewModels.Watch3D;
using HelixToolkit.Wpf.SharpDX;
#if NET5_0_OR_GREATER
using HelixToolkit.SharpDX.Core;
#endif
using SharpDX;
using Point = System.Windows.Point;

Expand Down
43 changes: 24 additions & 19 deletions src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeModelsWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,32 @@
<DestinationSubDirectory>..\</DestinationSubDirectory>
</ReferenceCopyLocalPaths>
</ItemDefinitionGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
<PackageReference Include="HelixToolkit" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<PackageReference Include="HelixToolkit" Version="2.24.0" />
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="HelixToolkit.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.24.0" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" CopyMetaData="true" />
<PackageReference Include="HelixToolkit" Version="2.17.0" CopyPDB="true" />
<PackageReference Include="HelixToolkit.Wpf" Version="2.17.0" CopyPDB="true" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.17.0" CopyPDB="true" />
<PackageReference Include="SharpDX" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Direct3D9" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" CopyPDB="true" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<PackageReference Include="SharpDX" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Direct3D9" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" CopyPDB="true" />
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" CopyPDB="true" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DynamoCoreWpf\DynamoCoreWpf.csproj">
<Project>{51BB6014-43F7-4F31-B8D3-E3C37EBEDAF4}</Project>
Expand Down
15 changes: 11 additions & 4 deletions src/VisualizationTests/WpfVisualizationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@
<AssemblyName>WpfVisualizationTests</AssemblyName>
<TestProjectDefaults>true</TestProjectDefaults>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
<PackageReference Include="HelixToolkit" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<PackageReference Include="HelixToolkit" Version="2.24.0" />
marbelarrietaGlobant marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="HelixToolkit.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.24.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
<PackageReference Include="HelixToolkit" Version="2.17.0" />
<PackageReference Include="HelixToolkit.Wpf" Version="2.17.0" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.17.0" />
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="SharpDX" Version="4.2.0" />
Expand Down
15 changes: 11 additions & 4 deletions test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
<PackageReference Include="HelixToolkit" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.24.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
<PackageReference Include="HelixToolkit" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Wpf" Version="2.24.0" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.24.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AvalonEdit" Version="6.3.0.90"/>
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
<PackageReference Include="Greg" Version="2.5.0.5076">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="HelixToolkit" Version="2.17.0" />
<PackageReference Include="HelixToolkit.Wpf" Version="2.17.0" />
<PackageReference Include="HelixToolkit.Wpf.SharpDX" Version="2.17.0" />
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NUnit" Version="2.6.3" />
<PackageReference Include="RestSharp" Version="106.12.0" />
Expand Down
Loading