From 478e30b24b959fb995cedf12711cb45596d0aa4c Mon Sep 17 00:00:00 2001
From: Chris Bell <chrisbell@bellsworne.com>
Date: Thu, 16 Jan 2025 22:27:21 -0600
Subject: [PATCH] Begin mesh and more advanced node stuff

---
 .../.idea/.idea.GLTFViewer/.idea/avalonia.xml |  1 +
 GLTFViewer/GLTFViewer/DesignDoc.md            |  1 +
 GLTFViewer/GLTFViewer/Engine/Nodes/Mesh.cs    |  8 +++++
 .../GLTFViewer/Engine/{ => Nodes}/Node.cs     | 36 ++++++++++++-------
 .../Engine/{ => Nodes}/NodeProperty.cs        |  0
 GLTFViewer/GLTFViewer/Engine/Ui/SceneTree.cs  | 13 +------
 6 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 GLTFViewer/GLTFViewer/Engine/Nodes/Mesh.cs
 rename GLTFViewer/GLTFViewer/Engine/{ => Nodes}/Node.cs (71%)
 rename GLTFViewer/GLTFViewer/Engine/{ => Nodes}/NodeProperty.cs (100%)

diff --git a/GLTFViewer/.idea/.idea.GLTFViewer/.idea/avalonia.xml b/GLTFViewer/.idea/.idea.GLTFViewer/.idea/avalonia.xml
index 0959a72..cdadad4 100644
--- a/GLTFViewer/.idea/.idea.GLTFViewer/.idea/avalonia.xml
+++ b/GLTFViewer/.idea/.idea.GLTFViewer/.idea/avalonia.xml
@@ -4,6 +4,7 @@
     <option name="projectPerEditor">
       <map>
         <entry key="GLTFViewer/BaseOpenTKControl.axaml" value="GLTFViewer/GLTFViewer.csproj" />
+        <entry key="GLTFViewer/Engine/Ui/Controls/BaseOpenTKControl.axaml" value="GLTFViewer/GLTFViewer.csproj" />
         <entry key="GLTFViewer/Engine/Ui/Controls/BasePropertyViewerControl.axaml" value="GLTFViewer/GLTFViewer.csproj" />
         <entry key="GLTFViewer/Engine/Ui/Controls/BaseSceneTreeControl.axaml" value="GLTFViewer/GLTFViewer.csproj" />
         <entry key="GLTFViewer/Engine/Ui/Controls/MainUI.axaml" value="GLTFViewer/GLTFViewer.csproj" />
diff --git a/GLTFViewer/GLTFViewer/DesignDoc.md b/GLTFViewer/GLTFViewer/DesignDoc.md
index e8f3915..68de4ba 100644
--- a/GLTFViewer/GLTFViewer/DesignDoc.md
+++ b/GLTFViewer/GLTFViewer/DesignDoc.md
@@ -15,6 +15,7 @@ A simple application to load GLTF scenes and render the model(s) in a lit scene
 
 ## Development Status
 - 01/15/2025 Update 1: Successfully have Avalonia project set up with a BaseOpenTK control rendering the OpenTK context. Also have a Renerer class to seperate out the rendering code from the control, but it's empty for now. There is also some boilerplate UI for the inspector, but its only visual and will need to be filled out.
+- 01/15/2025 Update 2: Have some basic UI and Node structure. Now deciding how best to load models, render them, and handling scenes.  
 
 ## Development Environment
 - OS: Linux (NixOS)
diff --git a/GLTFViewer/GLTFViewer/Engine/Nodes/Mesh.cs b/GLTFViewer/GLTFViewer/Engine/Nodes/Mesh.cs
new file mode 100644
index 0000000..fc331ff
--- /dev/null
+++ b/GLTFViewer/GLTFViewer/Engine/Nodes/Mesh.cs
@@ -0,0 +1,8 @@
+using System.Collections.ObjectModel;
+
+namespace GLTFViewer.Engine;
+
+public class Mesh : Node
+{
+
+}
\ No newline at end of file
diff --git a/GLTFViewer/GLTFViewer/Engine/Node.cs b/GLTFViewer/GLTFViewer/Engine/Nodes/Node.cs
similarity index 71%
rename from GLTFViewer/GLTFViewer/Engine/Node.cs
rename to GLTFViewer/GLTFViewer/Engine/Nodes/Node.cs
index a186ca8..e99a838 100644
--- a/GLTFViewer/GLTFViewer/Engine/Node.cs
+++ b/GLTFViewer/GLTFViewer/Engine/Nodes/Node.cs
@@ -6,22 +6,32 @@ namespace GLTFViewer.Engine;
 
 public class Node
 {
-    public string Name { get; }
-    public ObservableCollection<Node> Children { get; }
-    public ObservableCollection<NodeProperty> Properties { get; }
-
-    public Node(string name)
+    public string Name { get; set; } = "Node";
+    public ObservableCollection<Node> Children { get; } = [];
+    public ObservableCollection<NodeProperty> Properties { get; } = [];
+    
+    public virtual void Update()
     {
-        Name = name;
-        Children = new ObservableCollection<Node>();
-        Properties = new ObservableCollection<NodeProperty>();
+        foreach (var node in Children)
+        {
+            node.Update();
+        }
     }
-
-    public Node(string name, ObservableCollection<Node> children)
+    
+    public virtual void EnterScene()
     {
-        Name = name;
-        Children = children;
-        Properties = new ObservableCollection<NodeProperty>();
+        foreach (var node in Children)
+        {
+            node.EnterScene();
+        }
+    }
+    
+    public virtual void ExitScene()
+    {
+        foreach (var node in Children)
+        {
+            node.ExitScene();
+        }
     }
 
     public void AddChild(Node child)
diff --git a/GLTFViewer/GLTFViewer/Engine/NodeProperty.cs b/GLTFViewer/GLTFViewer/Engine/Nodes/NodeProperty.cs
similarity index 100%
rename from GLTFViewer/GLTFViewer/Engine/NodeProperty.cs
rename to GLTFViewer/GLTFViewer/Engine/Nodes/NodeProperty.cs
diff --git a/GLTFViewer/GLTFViewer/Engine/Ui/SceneTree.cs b/GLTFViewer/GLTFViewer/Engine/Ui/SceneTree.cs
index ef4587f..a606096 100644
--- a/GLTFViewer/GLTFViewer/Engine/Ui/SceneTree.cs
+++ b/GLTFViewer/GLTFViewer/Engine/Ui/SceneTree.cs
@@ -6,10 +6,8 @@ namespace GLTFViewer.Engine.Ui;
 
 public class SceneTree
 {
-    public Node Root { get; } = new Node("root");
-    
     private TreeView _sceneTreeView;
-    private ObservableCollection<Node> _nodes;
+    private ObservableCollection<Node> _nodes = [];
 
     public SceneTree(TreeView sceneTreeView)
     {
@@ -20,15 +18,6 @@ public class SceneTree
     
     public void Initialize()
     {
-        Root.AddProperty(new NodeProperty<string>("TestPropertyString", "TestValue"));
-        Root.AddProperty(new NodeProperty<int>("TestPropertyInt", 42));
-        
-        
-        _nodes = new ObservableCollection<Node>()
-        {
-            Root
-        };
-        
         _sceneTreeView.ItemsSource = _nodes;
         _sceneTreeView.ItemTemplate = new FuncTreeDataTemplate<Node>(
             (node, _) =>