Merge pull request #1778 from helix-toolkit/release/2.21.1

Release/2.21.1

README.md

@@ -1,3 +1,5 @@
+[![HelixToolkit](https://img.shields.io/badge/-Helix%20Toolkit-blue)](https://github.com/helix-toolkit/helix-toolkit) 
+
 <img src='https://avatars3.githubusercontent.com/u/8432523?s=200&v=4' width='64' />
 
 # Helix Toolkit

Source/Examples/WinUI/App1/App1 (Package)/App1 (Package).wapproj

@@ -64,7 +64,7 @@
  </ProjectReference>
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3">
+ <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.1">
  <IncludeAssets>build</IncludeAssets>
  </PackageReference>
  </ItemGroup>

Source/Examples/WinUI/App1/App1/App1.csproj

@@ -15,7 +15,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
+ <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.1" />
  <Manifest Include="$(ApplicationManifest)" />
  </ItemGroup>
 

Source/HelixToolkit.Core.Wpf/HelixToolkit.Core.Wpf.csproj

@@ -49,4 +49,8 @@
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
  </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Resources\" />
+ </ItemGroup>
 </Project>

Source/HelixToolkit.Shared/Geometry/MeshGeometryHelper.cs

@@ -311,7 +311,7 @@ public static MeshGeometry3D NoSharedVertices(this MeshGeometry3D input)
  ti.Add(i0);
  ti.Add(i1);
  ti.Add(i2);
- if (n != null)
+ if (n != null && input.Normals.Count>0)
  {
  n.Add(input.Normals[index0]);
  n.Add(input.Normals[index1]);

Source/HelixToolkit.SharpDX.Shared/Core/ParticleRenderCore.cs

@@ -840,7 +840,7 @@ protected override void OnUpdate(RenderContext context, DeviceContextProxy devic
  // Get consume buffer count.
  //Due to some intel integrated graphic card having issue copy structure count directly into constant buffer.
  //Has to use staging buffer to read and pass into constant buffer 
- FrameVariables.NumParticles = (uint)ReadCount("", deviceContext, BufferProxies[0]);
+ FrameVariables.NumParticles = (uint)ReadCount(string.Empty, deviceContext, BufferProxies[0]);
  perFrameCB.Upload(deviceContext, ref FrameVariables);
  #endregion
 

Source/HelixToolkit.SharpDX.Shared/Core/SkyBoxRenderCore.cs

@@ -150,6 +150,10 @@ public SamplerStateDescription SamplerDescription
  /// The name of the shader cube texture sampler.
  /// </value>
  public string ShaderCubeTextureSamplerName { set; get; } = DefaultSamplerStateNames.CubeMapSampler;
+ /// <summary>
+ /// Skip environment map rendering, but still keep it available for other object to use.
+ /// </summary>
+ public bool SkipRendering { set; get; }
  #endregion
 
  /// <summary>
@@ -237,6 +241,10 @@ protected override void OnRender(RenderContext context, DeviceContextProxy devic
  }
  context.SharedResource.EnvironementMap = cubeTextureRes;
  context.SharedResource.EnvironmentMapMipLevels = MipMapLevels;
+ if (SkipRendering)
+ {
+ return;
+ }
  DefaultShaderPass.BindShader(deviceContext);
  DefaultShaderPass.BindStates(deviceContext, StateType.BlendState | StateType.DepthStencilState);
  DefaultShaderPass.PixelShader.BindTexture(deviceContext, cubeTextureSlot, cubeTextureRes);

Source/HelixToolkit.SharpDX.Shared/Core/SkyDomeRenderCore.cs

@@ -114,6 +114,11 @@ public SamplerStateDescription SamplerDescription
  /// The name of the shader cube texture sampler.
  /// </value>
  public string ShaderCubeTextureSamplerName { set; get; } = DefaultSamplerStateNames.CubeMapSampler;
+ /// <summary>
+ /// Skip environment map rendering, but still keep it available for other object to use.
+ /// </summary>
+ public bool SkipRendering { set; get; }
+
  #endregion
 
  /// <summary>
@@ -187,6 +192,11 @@ protected void OnDefaultPassChanged(ShaderPass pass)
  protected override void OnRender(RenderContext context, DeviceContextProxy deviceContext)
  {
  context.SharedResource.EnvironementMap = cubeTextureRes;
+ context.SharedResource.EnvironmentMapMipLevels = MipMapLevels;
+ if (SkipRendering)
+ {
+ return;
+ }
  DefaultShaderPass.BindShader(deviceContext);
  DefaultShaderPass.BindStates(deviceContext, StateType.BlendState | StateType.DepthStencilState);
  DefaultShaderPass.PixelShader.BindTexture(deviceContext, cubeTextureSlot, cubeTextureRes);

Source/HelixToolkit.SharpDX.Shared/Core2D/FrameStatisticsRenderCore.cs

@@ -77,7 +77,7 @@ public D2D.Brush Background
  private Factory factory;
  private TextFormat format;
  private RectangleF renderBound = new RectangleF(0, 0, 100, 0);
- private string previousStr = "";
+ private string previousStr = string.Empty;
  /// <summary>
  /// Called when [attach].
  /// </summary>
@@ -87,7 +87,7 @@ protected override bool OnAttach(IRenderHost target)
  {
  factory = new Factory(FactoryType.Isolated);
  format = new TextFormat(factory, "Arial", 12 * target.DpiScale);
- previousStr = "";
+ previousStr = string.Empty;
  this.statistics = target.RenderStatistics;
  return base.OnAttach(target);
  }

Source/HelixToolkit.SharpDX.Shared/Core2D/TextRenderCore2D.cs

@@ -20,7 +20,7 @@ namespace Core2D
  {
  public class TextRenderCore2D : RenderCore2DBase
  {
- private string text = "";
+ private string text = string.Empty;
  public string Text
  {
  set

Source/HelixToolkit.SharpDX.Shared/HelixToolkit.SharpDX.Shared.projitems

@@ -201,6 +201,7 @@
  <Compile Include="$(MSBuildThisFileDirectory)Render\RenderHost\DefaultRenderHostPartial_Properties.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)Render\RenderHost\DX11RenderHostConfiguration.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)Utilities\DepthStencilFormatHelper.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Utilities\StringHelper.cs" />
  <Compile Include="..\HelixToolkit.SharpDX.Shared\ShaderManager\StructArrayPool.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)ShaderManager\MaterialVariablePool.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)ShaderManager\TextureResourceManager.cs" />

Source/HelixToolkit.SharpDX.Shared/Interface/IRenderCoreParams.cs

@@ -495,6 +495,13 @@ TextureModel CubeTexture
  {
  set; get;
  }
+ /// <summary>
+ /// Skip environment map rendering, but still keep it available for other object to use.
+ /// </summary>
+ bool SkipRendering
+ {
+ set; get;
+ }
  }
  /// <summary>
  /// 

Source/HelixToolkit.SharpDX.Shared/Model/Animations/AnimationGroupUpdater.cs

@@ -24,7 +24,7 @@ public class AnimationGroupUpdater : IAnimationUpdater
  public string Name
  {
  set; get;
- } = "";
+ } = string.Empty;
 
  private List<IAnimationUpdater> children = new List<IAnimationUpdater>();
  public IList<IAnimationUpdater> Children => children;
@@ -57,12 +57,12 @@ public AnimationRepeatMode RepeatMode
  }
  }
 
- public AnimationGroupUpdater(string name = "")
+ public AnimationGroupUpdater(string name = StringHelper.EmptyStr)
  {
  Name = name;
  }
 
- public AnimationGroupUpdater(IEnumerable<IAnimationUpdater> updaters, string name = "")
+ public AnimationGroupUpdater(IEnumerable<IAnimationUpdater> updaters, string name = StringHelper.EmptyStr)
  : this(name)
  {
  children.AddRange(updaters);

Source/HelixToolkit.SharpDX.Shared/Model/Animations/KeyFrameUpdater.cs

@@ -27,7 +27,7 @@ public class KeyFrameUpdater : IAnimationUpdater
  public string Name
  {
  set; get;
- } = "";
+ } = string.Empty;
 
  public Animation Animation
  {

Source/HelixToolkit.SharpDX.Shared/Model/Animations/MorphTargetKeyFrameUpdater.cs

@@ -24,7 +24,7 @@ public class MorphTargetKeyFrameUpdater : IAnimationUpdater
  public string Name
  {
  set; get;
- } = "";
+ } = string.Empty;
  public Animation animation
  {
  get;

Source/HelixToolkit.SharpDX.Shared/Model/Animations/NodeAnimationUpdater.cs

@@ -29,7 +29,7 @@ private struct IndexTime
  public string Name
  {
  set; get;
- } = "";
+ } = string.Empty;
 
  public Animation Animation
  {

Source/HelixToolkit.SharpDX.Shared/Model/Geometry/BillboardSingleText3D.cs

@@ -54,7 +54,7 @@ public override BillboardType Type
  }
  }
 
- private TextInfo mTextInfo = new TextInfo("", new Vector3());
+ private TextInfo mTextInfo = new TextInfo(string.Empty, new Vector3());
  /// <summary>
  /// Gets or sets the text information.
  /// </summary>

Source/HelixToolkit.SharpDX.Shared/Model/Material/GenericMaterialCore.cs

@@ -307,7 +307,7 @@ public GenericLineMaterialCore(ShaderPass shaderPass, string modelMaterialConsta
  public override MaterialVariable CreateMaterialVariables(IEffectsManager manager, IRenderTechnique technique)
  {
  return new GenericMeshMaterialVariable(manager, technique, this, cbDescription,
- MaterialPassName, ShadowPassName, "");
+ MaterialPassName, ShadowPassName, string.Empty);
  }
  }
  [DataContract]

Source/HelixToolkit.SharpDX.Shared/Model/Material/Variables/GenericMaterialVariable.cs

@@ -248,7 +248,7 @@ public sealed class GenericPointMaterialVariable : GenericMaterialVariable
  GenericMaterialCore materialCore, ConstantBufferDescription constantBufferDescription,
  string materialShaderPassName = DefaultPassNames.Default,
  string shadowShaderPassName = DefaultPassNames.ShadowPass)
- : base(manager, technique, materialCore, constantBufferDescription, materialShaderPassName, shadowShaderPassName, "")
+ : base(manager, technique, materialCore, constantBufferDescription, materialShaderPassName, shadowShaderPassName, string.Empty)
  {
 
  }

Source/HelixToolkit.SharpDX.Shared/Model/ObservableObject.cs

@@ -39,13 +39,13 @@ public bool DisablePropertyChangedEvent
  }
 
  public event PropertyChangedEventHandler PropertyChanged;
- protected void RaisePropertyChanged([CallerMemberName] string propertyName = "")
+ protected void RaisePropertyChanged([CallerMemberName] string propertyName = StringHelper.EmptyStr)
  {
  if (!DisablePropertyChangedEvent)
  PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
  }
 
- protected bool Set<T>(ref T backingField, T value, [CallerMemberName] string propertyName = "")
+ protected bool Set<T>(ref T backingField, T value, [CallerMemberName] string propertyName = StringHelper.EmptyStr)
  {
  if (EqualityComparer<T>.Default.Equals(backingField, value))
  {
@@ -57,7 +57,7 @@ protected bool Set<T>(ref T backingField, T value, [CallerMemberName] string pro
  return true;
  }
 
- protected bool Set<T>(ref T backingField, T value, bool raisePropertyChanged, [CallerMemberName] string propertyName = "")
+ protected bool Set<T>(ref T backingField, T value, bool raisePropertyChanged, [CallerMemberName] string propertyName = StringHelper.EmptyStr)
  {
  if (EqualityComparer<T>.Default.Equals(backingField, value))
  {

Source/HelixToolkit.SharpDX.Shared/Model/Scene/CoordinateSystemNode.cs

@@ -222,7 +222,7 @@ private void UpdateModel()
 
  private void UpdateAxisColor(int which, Color4 color)
  {
- var label = "";
+ var label = string.Empty;
  switch (which)
  {
  case 0:

Source/HelixToolkit.SharpDX.Shared/Model/Scene/EnvironmentMapNode.cs

@@ -41,6 +41,20 @@ public TextureModel Texture
  return (RenderCore as ISkyboxRenderParams).CubeTexture;
  }
  }
+ /// <summary>
+ /// Skip environment map rendering, but still keep it available for other object to use.
+ /// </summary>
+ public bool SkipRendering
+ {
+ set
+ {
+ (RenderCore as ISkyboxRenderParams).SkipRendering = value;
+ }
+ get
+ {
+ return (RenderCore as ISkyboxRenderParams).SkipRendering;
+ }
+ }
 
  private readonly bool UseSkyDome = false;
  /// <summary>

Source/HelixToolkit.SharpDX.Shared/Model/Scene2D/TextNode2D.cs

@@ -22,7 +22,7 @@ namespace Model.Scene2D
 
  public class TextNode2D : SceneNode2D
  {
- private string text = "";
+ private string text = string.Empty;
  public string Text
  {
  set

Source/HelixToolkit.SharpDX.Shared/Render/RenderContext.cs

@@ -255,7 +255,7 @@ public IRenderHost RenderHost
  /// <value>
  /// The name of the custom pass.
  /// </value>
- public string CustomPassName = "";
+ public string CustomPassName = string.Empty;
 
  /// <summary>
  /// Gets or sets the time stamp.

Source/HelixToolkit.SharpDX.Shared/Render/RenderHost/DefaultRenderHost.cs

@@ -498,7 +498,7 @@ private void Clear(bool clearFrameRenderables, bool clearPerFrameRenderables)
  /// </summary>
  protected override void OnEndingD3D()
  {
- Logger.Log(LogLevel.Information, "", nameof(DefaultRenderHost));
+ Logger.Log(LogLevel.Information, string.Empty, nameof(DefaultRenderHost));
  asyncTask?.Wait();
  getTriangleCountTask?.Wait();
  getPostEffectCoreTask?.Wait();

Source/HelixToolkit.SharpDX.Shared/Render/RenderHost/RenderHostBase.cs

@@ -952,7 +952,7 @@ public virtual void StartRendering()
  {
  lock (lockObj)
  {
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  renderStatistics.Reset();
  lastRenderingDuration = TimeSpan.Zero;
  lastRenderTime = TimeSpan.Zero;
@@ -965,7 +965,7 @@ public virtual void StartRendering()
  /// </summary>
  protected void CreateAndBindBuffers()
  {
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  RemoveAndDispose(ref renderBuffer);
  renderBuffer = CreateRenderBuffer();
  renderBuffer.OnNewBufferCreated += RenderBuffer_OnNewBufferCreated;
@@ -1024,7 +1024,7 @@ protected virtual void AttachRenderable(IDeviceResources deviceResources)
  {
  return;
  }
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  if (EnableSharingModelMode && SharedModelContainer != null)
  {
  SharedModelContainer.CurrentRenderHost = this;
@@ -1062,7 +1062,7 @@ public void EndD3D()
  {
  lock (lockObj)
  {
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  StopRendering();
  IsInitialized = false;
  RemoveAndDispose(ref immediateDeviceContext);
@@ -1081,23 +1081,23 @@ protected virtual void OnEndingD3D()
 
  private void OnManagerDisposed(object sender, EventArgs args)
  {
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  EndD3D();
  }
  /// <summary>
  /// Stops the rendering.
  /// </summary>
  public virtual void StopRendering()
  {
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  StopRenderLoop?.Invoke(this, EventArgs.Empty);
  }
  /// <summary>
  /// Disposes the buffers.
  /// </summary>
  protected virtual void DisposeBuffers()
  {
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  if (renderBuffer != null)
  {
  renderBuffer.OnNewBufferCreated -= RenderBuffer_OnNewBufferCreated;
@@ -1112,7 +1112,7 @@ protected virtual void DisposeBuffers()
  /// </summary>
  protected virtual void DetachRenderable()
  {
- Log(LogLevel.Information, "");
+ Log(LogLevel.Information, string.Empty);
  RemoveAndDispose(ref renderContext);
  RemoveAndDispose(ref renderContext2D);
  Viewport?.Detach();
@@ -1229,7 +1229,7 @@ protected override void OnDispose(bool disposeManagedResources)
  base.OnDispose(disposeManagedResources);
  }
 
- private void Log<Type>(LogLevel level, Type msg, [CallerMemberName] string caller = "", [CallerLineNumber] int sourceLineNumber = 0)
+ private void Log<Type>(LogLevel level, Type msg, [CallerMemberName] string caller = StringHelper.EmptyStr, [CallerLineNumber] int sourceLineNumber = 0)
  {
  Logger.Log(level, msg, nameof(DX11RenderHostBase), caller, sourceLineNumber);
  }

Source/HelixToolkit.SharpDX.Shared/Render/Renderer/ImmediateContextRenderer.cs

@@ -333,7 +333,7 @@ public virtual void RenderToPingPongBuffer(RenderContext context, ref RenderPara
  if (count > 0)
  {
  var buffer = context.RenderHost.RenderBuffer;
- var depthStencilBuffer = buffer.DepthStencilBufferNoMSAA;
+ var depthStencilBuffer = parameter.IsMSAATexture ? buffer.DepthStencilBuffer : buffer.DepthStencilBufferNoMSAA;
  ImmediateContext.SetRenderTargets(depthStencilBuffer, parameter.RenderTargetView);
 
  for (var i = start; i < start + count; ++i)