Browse Source

Removed vertex attribute DynamicallyAccessedMembers attribute since it's no longer needed

vpenades 1 year ago
parent
commit
1d67cc2199

+ 4 - 16
src/SharpGLTF.Toolkit/Geometry/VertexTypes/VertexGeometry.cs

@@ -88,10 +88,7 @@ namespace SharpGLTF.Geometry.VertexTypes
 
     /// <summary>
     /// Defines a Vertex attribute with a Position.
-    /// </summary>
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+    /// </summary>    
     [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
     public struct VertexPosition : IVertexGeometry, IEquatable<VertexPosition>
     {
@@ -192,10 +189,7 @@ namespace SharpGLTF.Geometry.VertexTypes
 
     /// <summary>
     /// Defines a Vertex attribute with a Position and a Normal.
-    /// </summary>
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+    /// </summary>    
     [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
     public struct VertexPositionNormal : IVertexGeometry, IEquatable<VertexPositionNormal>
     {
@@ -304,10 +298,7 @@ namespace SharpGLTF.Geometry.VertexTypes
 
     /// <summary>
     /// Defines a Vertex attribute with a Position, a Normal and a Tangent.
-    /// </summary>
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+    /// </summary>    
     [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
     public struct VertexPositionNormalTangent : IVertexGeometry, IEquatable<VertexPositionNormalTangent>
     {
@@ -419,10 +410,7 @@ namespace SharpGLTF.Geometry.VertexTypes
 
     /// <summary>
     /// Defines a Vertex attribute with a Position, a Normal and a Tangent.
-    /// </summary>
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+    /// </summary>    
     [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
     public struct VertexGeometryDelta : IVertexGeometry, IEquatable<VertexGeometryDelta>
     {

+ 0 - 42
src/SharpGLTF.Toolkit/Geometry/VertexTypes/VertexMaterial.Permutations.cs

@@ -25,9 +25,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -128,9 +125,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -239,9 +233,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -357,9 +348,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -483,9 +471,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -586,9 +571,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -697,9 +679,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -816,9 +795,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -942,9 +918,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -1076,9 +1049,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -1187,9 +1157,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -1306,9 +1273,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -1433,9 +1397,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
@@ -1567,9 +1528,6 @@ namespace SharpGLTF.Geometry.VertexTypes
          /// <summary>
      /// Defines a Vertex attribute with a material Color.
      /// </summary>
-     #if NET6_0_OR_GREATER
-     [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-     #endif
      [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
      [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
      [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]

+ 3 - 3
src/SharpGLTF.Toolkit/Geometry/VertexTypes/VertexMaterial.Permutations.tt

@@ -51,9 +51,9 @@ void WriteVertexMaterialPermutation(int colorCount, int textureCount)
     WriteLine("/// <summary>");
     WriteLine("/// Defines a Vertex attribute with a material Color.");
     WriteLine("/// </summary>");
-    WriteLine("#if NET6_0_OR_GREATER");
-    WriteLine("[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]");
-    WriteLine("#endif");
+    // WriteLine("#if NET6_0_OR_GREATER");
+    // WriteLine("[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]");
+    // WriteLine("#endif");
     WriteLine("[System.CodeDom.Compiler.GeneratedCodeAttribute(\"Microsoft.VisualStudio.TextTemplating\", \"17.0.0.0\")]");
     WriteLine("[System.Diagnostics.DebuggerDisplay(\"{_GetDebuggerDisplay(),nq}\")]");
     WriteLine("[System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]");

+ 2 - 8
src/SharpGLTF.Toolkit/Geometry/VertexTypes/VertexSkinning.cs

@@ -79,10 +79,7 @@ namespace SharpGLTF.Geometry.VertexTypes
 
     /// <summary>
     /// Defines a Vertex attribute with up to 65535 bone joints and 4 weights.
-    /// </summary>
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+    /// </summary>    
     [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
     public struct VertexJoints4 : IVertexSkinning, IEquatable<VertexJoints4>
     {
@@ -214,10 +211,7 @@ namespace SharpGLTF.Geometry.VertexTypes
 
     /// <summary>
     /// Defines a Vertex attribute with up to 65535 bone joints and 8 weights.
-    /// </summary>
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+    /// </summary>    
     [System.Diagnostics.DebuggerDisplay("{_GetDebuggerDisplay(),nq}")]
     public struct VertexJoints8 : IVertexSkinning, IEquatable<VertexJoints8>
     {

+ 0 - 4
tests/SharpGLTF.Cesium.Tests/VertexPointcloud.cs

@@ -9,10 +9,6 @@ using SharpGLTF.Schema2;
 
 namespace SharpGLTF
 {
-    #if NET6_0_OR_GREATER
-        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
-
     [System.Diagnostics.DebuggerDisplay("𝐂:{Color} 𝐔𝐕:{TexCoord}")]
     public struct VertexPointcloud : IVertexCustom
     {

+ 0 - 4
tests/SharpGLTF.Cesium.Tests/VertexWithFeatureId.cs

@@ -9,10 +9,6 @@ using SharpGLTF.Schema2;
 
 namespace SharpGLTF
 {
-
-    #if NET6_0_OR_GREATER
-        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
     [System.Diagnostics.DebuggerDisplay("𝐂:{Color} 𝐔𝐕:{TexCoord}")]
     public struct VertexWithFeatureId : IVertexCustom
     {

+ 1 - 5
tests/SharpGLTF.Cesium.Tests/VertexWithFeatureIds.cs

@@ -8,11 +8,7 @@ using SharpGLTF.Memory;
 using SharpGLTF.Schema2;
 
 namespace SharpGLTF
-{
-    #if NET6_0_OR_GREATER
-        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
-
+{    
     [System.Diagnostics.DebuggerDisplay("𝐂:{Color} 𝐔𝐕:{TexCoord}")]
     public struct VertexWithFeatureIds : IVertexCustom
     {

+ 2 - 8
tests/SharpGLTF.Toolkit.Tests/Geometry/VertexTypes/CustomVertices.cs

@@ -8,10 +8,7 @@ using SharpGLTF.Memory;
 using SharpGLTF.Schema2;
 
 namespace SharpGLTF.Geometry.VertexTypes
-{
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+{    
     [System.Diagnostics.DebuggerDisplay("𝐂:{Color} 𝐔𝐕:{TexCoord} {CustomId}")]
     public struct VertexColor1Texture1Custom1 : IVertexCustom
     {
@@ -129,10 +126,7 @@ namespace SharpGLTF.Geometry.VertexTypes
 
         #endregion
     }
-
-    #if NET6_0_OR_GREATER
-    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
-    #endif
+    
     [System.Diagnostics.DebuggerDisplay("{CustomId0} {CustomId1}")]
     public struct VertexCustom2 : IVertexCustom
     {