Allow Watch3D nodes to run in software mode (#14650)

sm6srw · web-flow · commit 0a0a3138ad91 · 2023-11-30T08:14:11.000-05:00
* This is just a test

* Cleanup code
diff --git a/src/DynamoCoreWpf/ViewModels/Watch3D/DefaultWatch3DViewModel.cs b/src/DynamoCoreWpf/ViewModels/Watch3D/DefaultWatch3DViewModel.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Media3D;
 using System.Xml;
@@ -393,12 +394,14 @@ private void LogVisualizationCapabilities()
             var pixelShader4Supported = RenderCapability.IsPixelShaderVersionSupported(4, 0);
             var softwareEffectSupported = RenderCapability.IsShaderEffectSoftwareRenderingSupported;
             var maxTextureSize = RenderCapability.MaxHardwareTextureSize;
+            var renderMode = RenderOptions.ProcessRenderMode;
 
             logger.Log(string.Format("RENDER : Rendering Tier: {0}", renderingTier));
             logger.LogError(string.Format("RENDER : Pixel Shader 3 Supported: {0}", pixelShader3Supported));
             logger.Log(string.Format("RENDER : Pixel Shader 4 Supported: {0}", pixelShader4Supported));
             logger.Log(string.Format("RENDER : Software Effect Rendering Supported: {0}", softwareEffectSupported));
             logger.Log(string.Format("RENDER : Maximum hardware texture size: {0}", maxTextureSize));
+            logger.Log(string.Format("RENDER : ProcessRenderMode: {0}", renderMode == RenderMode.Default ? "Hardware (with Software fallback)" : "Software" ));
         }
 
         private void RegisterModelEventhandlers(IDynamoModel dynamoModel)
diff --git a/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeViewCustomization.cs b/src/Libraries/Watch3DNodeModelsWpf/Watch3DNodeViewCustomization.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -48,9 +48,6 @@ public void CustomizeView(Watch3D model, NodeView nodeView)
             var dynamoViewModel = nodeView.ViewModel.DynamoViewModel;
             watch3dModel = model;
 
-            var renderingTier = (RenderCapability.Tier >> 16);
-            if (renderingTier < 2) return;
-
             var dynamoModel = dynamoViewModel.Model;
 
             var vmParams = new Watch3DViewModelStartupParams(dynamoModel);
diff --git a/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs b/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -51,12 +51,6 @@ public void Watch3DHasViewer()
             var path = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Process) + ";" + Model.PathManager.DynamoCoreDirectory;
             Environment.SetEnvironmentVariable("Path", path, EnvironmentVariableTarget.Process);
 
-            var renderingTier = (System.Windows.Media.RenderCapability.Tier >> 16);
-            if (renderingTier < 2)
-            {
-                Assert.Inconclusive("Hardware rendering is not available. Watch3D is not created.");
-            }
-
             Open(@"UI\CoreUINodes.dyn");
             var nodeView = NodeViewWithGuid("6869c998-b819-4686-8849-6f36162c4182"); // NodeViewOf<Watch3D>();
             var watchView = nodeView.ChildrenOfType<Watch3DView>().FirstOrDefault();
