Skip to content

Commit

Permalink
This is just a test
Browse files Browse the repository at this point in the history
  • Loading branch information
sm6srw committed Nov 28, 2023
1 parent 8f8e28b commit f6cabf6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 : RenderMode: {0}", renderMode));
}

private void RegisterModelEventhandlers(IDynamoModel dynamoModel)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -48,8 +48,8 @@ public void CustomizeView(Watch3D model, NodeView nodeView)
var dynamoViewModel = nodeView.ViewModel.DynamoViewModel;
watch3dModel = model;

var renderingTier = (RenderCapability.Tier >> 16);
if (renderingTier < 2) return;
// var renderingTier = (RenderCapability.Tier >> 16);
// if (renderingTier < 2) return;

var dynamoModel = dynamoViewModel.Model;

Expand Down
12 changes: 6 additions & 6 deletions test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
Expand Down Expand Up @@ -51,11 +51,11 @@ 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.");
}
// 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>();
Expand Down

0 comments on commit f6cabf6

Please sign in to comment.