more API refactoring

src/glTF2Sharp.DOM/Schema2/gltf.Materials.cs

@@ -11,14 +11,14 @@ namespace glTF2Sharp.Schema2
     {
         #region lifecycle
 
-        public static Material CreateBestChoice(IReadOnlyList<String> channelKeys)
+        internal static Material CreateBestChoice(IReadOnlyList<String> channelKeys)
         {
             if (channelKeys.Contains("Diffuse") && channelKeys.Contains("Glossiness")) return CreateMaterialPBRSpecularGlossiness();
 
                 return CreatePBRMetallicRoughness();
         }
 
-        public static Material CreatePBRMetallicRoughness()
+        internal static Material CreatePBRMetallicRoughness()
         {
             var m = new Material
             {
@@ -28,7 +28,7 @@ namespace glTF2Sharp.Schema2
             return m;
         }
 
-        public static Material CreateMaterialPBRSpecularGlossiness()
+        internal static Material CreateMaterialPBRSpecularGlossiness()
         {
             var m = new Material();
 
@@ -37,7 +37,7 @@ namespace glTF2Sharp.Schema2
             return m;
         }
 
-        public static Material CreateMaterialUnlit()
+        internal static Material CreateMaterialUnlit()
         {
             var m = new Material();
 
@@ -54,13 +54,13 @@ namespace glTF2Sharp.Schema2
 
         public AlphaMode Alpha
         {
-            get => _alphaMode ?? _alphaModeDefault;
-            set => _alphaMode = value == _alphaModeDefault ? (AlphaMode?)null : value;
+            get => _alphaMode.AsValue(_alphaModeDefault);
+            set => _alphaMode = value.AsNullable(_alphaModeDefault);
         }
 
         public Double AlphaCutoff
         {
-            get => _alphaCutoff ?? _alphaCutoffDefault;
+            get => _alphaCutoff.AsValue(_alphaCutoffDefault);
             set => _alphaCutoff = value.AsNullable(_alphaCutoffDefault, _alphaCutoffMinimum, double.MaxValue);
         }
 
@@ -70,10 +70,7 @@ namespace glTF2Sharp.Schema2
             set => _doubleSided = value.AsNullable(_doubleSidedDefault);
         }
 
-        public Boolean Unlit
-        {
-            get => this.GetExtension<MaterialUnlit_KHR>() != null;            
-        }
+        public Boolean Unlit => this.GetExtension<MaterialUnlit_KHR>() != null;
 
         public IEnumerable<MaterialChannelView> Channels
         {
@@ -302,7 +299,7 @@ namespace glTF2Sharp.Schema2
                 value => _specularFactor = new Vector3(value.X,value.Y,value.Z).AsNullable(_specularFactorDefault)
                 );
         }
-    }
+    }    
 
     public partial class ModelRoot
     {

src/glTF2Sharp.DOM/Schema2/gltf.Scene.cs

@@ -10,9 +10,9 @@ namespace glTF2Sharp.Schema2
     {
         IEnumerable<Node> VisualChildren { get; }
 
-        Node AddNode(string name);
+        Node AddVisualNode(string name);
 
-        Node FindNode(string name);
+        Node FindVisualNode(string name);
     }
 
     [System.Diagnostics.DebuggerDisplay("Node[{LogicalIndex}] {Name} SkinJoint:{IsSkinJoint} T:{LocalTransform.Translation.X} {LocalTransform.Translation.Y} {LocalTransform.Translation.Z}")]
@@ -158,7 +158,7 @@ namespace glTF2Sharp.Schema2
             return allChildren;
         }
 
-        public Node AddNode(string name)
+        public Node AddVisualNode(string name)
         {
             var node = this.LogicalParent._AddLogicalNode(this._children);
             node.Name = name;
@@ -175,7 +175,7 @@ namespace glTF2Sharp.Schema2
             this._children.Add(idx);
         }
 
-        public Node FindNode(string name)
+        public Node FindVisualNode(string name)
         {
             return this.VisualChildren.FirstOrDefault(item => item.Name == name);
         }
@@ -292,19 +292,19 @@ namespace glTF2Sharp.Schema2
             return VisualChildren.Any(item => item._ContainsVisualNode(node, true));
         }
 
-        public Node AddNode(string name)
+        public Node AddVisualNode(String name)
         {
             return this.LogicalParent._AddLogicalNode(this._nodes);
         }
 
-        public void AddNode(Node node)
+        public void AddVisualNode(Node node)
         {
             var idx = this.LogicalParent._UseLogicaNode(node);
 
             this._nodes.Add(idx);
         }
 
-        public Node FindNode(string name)
+        public Node FindVisualNode(String name)
         {
             return this.VisualChildren.FirstOrDefault(item => item.Name == name);
         }

src/glTF2Sharp.Tests/Schema2/CreateModelTests.cs

@@ -57,7 +57,7 @@ namespace glTF2Sharp.Schema2
 
             var scene = root.UseScene("Empty Scene");
 
-            var node = scene.AddNode("Triangle");
+            var node = scene.AddVisualNode("Triangle");
 
             // assign the mesh we previously created
 

src/glTF2Sharp.Tests/Schema2/LoadModelTests.cs

@@ -104,7 +104,7 @@ namespace glTF2Sharp.Schema2
 
             var scene = model.DefaultScene;
 
-            var pollyNode = scene.FindNode("Polly_Display");            
+            var pollyNode = scene.FindVisualNode("Polly_Display");            
 
             var pollyPrimitive = pollyNode.Mesh.Primitives[0];