Set up readonly for some skeleton logic.

MeltyPlayer · Apr 26, 2024 · a40ab06 · a40ab06
1 parent 66b83ad
commit a40ab06
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/model/SkeletonRenderer.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/model/SkeletonRenderer.cs
@@ -10,7 +10,7 @@
 
 namespace fin.ui.rendering.gl.model {
   public interface ISkeletonRenderer : IRenderable {
-    ISkeleton Skeleton { get; }
+    IReadOnlySkeleton Skeleton { get; }
     IReadOnlyBone? SelectedBone { get; set; }
     float Scale { get; set; }
   }
@@ -21,13 +21,13 @@ public interface ISkeletonRenderer : IRenderable {
   public class SkeletonRenderer : ISkeletonRenderer {
     private readonly IBoneTransformManager boneTransformManager_;
 
-    public SkeletonRenderer(ISkeleton skeleton,
+    public SkeletonRenderer(IReadOnlySkeleton skeleton,
                             IBoneTransformManager boneTransformManager) {
       this.Skeleton = skeleton;
       this.boneTransformManager_ = boneTransformManager;
     }
 
-    public ISkeleton Skeleton { get; }
+    public IReadOnlySkeleton Skeleton { get; }
     public IReadOnlyBone? SelectedBone { get; set; }
     public float Scale { get; set; } = 1;
 
@@ -45,7 +45,7 @@ public void Render() {
 
         GL.Color4(0, 0, 1f, 1);
 
-        var boneQueue = new Queue<(IBone, Vector3?)>();
+        var boneQueue = new Queue<(IReadOnlyBone, Vector3?)>();
         boneQueue.Enqueue((this.Skeleton.Root, null));
         while (boneQueue.Any()) {
           var (bone, parentLocation) = boneQueue.Dequeue();

diff --git a/FinModelUtility/Fin/Fin/src/model/SkeletonInterfaces.cs b/FinModelUtility/Fin/Fin/src/model/SkeletonInterfaces.cs
@@ -6,7 +6,8 @@
 using schema.readOnly;
 
 namespace fin.model {
-  public interface ISkeleton : IEnumerable<IBone> {
+  [GenerateReadOnly]
+  public partial interface ISkeleton : IEnumerable<IReadOnlyBone> {
     IBone Root { get; }
     IReadOnlyList<IBone> Bones { get; }
   }

diff --git a/FinModelUtility/Fin/Fin/src/model/impl/SkeletonImpl.cs b/FinModelUtility/Fin/Fin/src/model/impl/SkeletonImpl.cs
@@ -128,8 +128,8 @@ public IBone AlwaysFaceTowardsCamera(Quaternion adjustment) {
 
       IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
 
-      public IEnumerator<IBone> GetEnumerator() {
-        var queue = new Queue<IBone>();
+      public IEnumerator<IReadOnlyBone> GetEnumerator() {
+        var queue = new Queue<IReadOnlyBone>();
         queue.Enqueue(this.Root);
         while (queue.Count > 0) {
           var bone = queue.Dequeue();

diff --git a/FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfSkeletonBuilder.cs b/FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfSkeletonBuilder.cs
@@ -15,7 +15,7 @@ public class GltfSkeletonBuilder {
         GltfNode rootNode,
         GltfSkin skin,
         float scale,
-        ISkeleton skeleton) {
+        IReadOnlySkeleton skeleton) {
       var rootBone = skeleton.Root;
 
       var boneQueue

diff --git a/FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfSkinBuilder.cs b/FinModelUtility/Fin/Fin/src/model/io/exporters/gltf/GltfSkinBuilder.cs
@@ -31,7 +31,6 @@ public class GltfSkinBuilder {
 
       var boneToIndex
           = model.Skeleton.Skip(1)
-                 .CastTo<IBone, IReadOnlyBone>()
                  .ToIndexByValueIndexableDictionary();
 
       var nullMaterialBuilder =

diff --git a/FinModelUtility/Fin/Fin/src/model/util/ModelMinMaxBoundsScaleCalculator.cs b/FinModelUtility/Fin/Fin/src/model/util/ModelMinMaxBoundsScaleCalculator.cs
@@ -82,7 +82,7 @@ private void FactorModelIntoBounds_(IReadOnlyModel model,
       }
 
       if (!anyVertices) {
-        var boneQueue = new Queue<IBone>();
+        var boneQueue = new Queue<IReadOnlyBone>();
         boneQueue.Enqueue(model.Skeleton.Root);
 
         while (boneQueue.Count > 0) {

diff --git a/FinModelUtility/Fin/Fin/src/model/util/SceneMinMaxBoundsScaleCalculator.cs b/FinModelUtility/Fin/Fin/src/model/util/SceneMinMaxBoundsScaleCalculator.cs
@@ -44,7 +44,7 @@ public override Bounds CalculateBounds(IScene scene) {
             }
 
             if (!anyVertices) {
-              var boneQueue = new Queue<IBone>();
+              var boneQueue = new Queue<IReadOnlyBone>();
               boneQueue.Enqueue(model.Skeleton.Root);
 
               while (boneQueue.Count > 0) {

diff --git a/FinModelUtility/Fin/Fin/src/model/util/SceneModelMinMaxBoundsScaleCalculator.cs b/FinModelUtility/Fin/Fin/src/model/util/SceneModelMinMaxBoundsScaleCalculator.cs
@@ -85,7 +85,7 @@ private void FactorModelIntoBounds_(ISceneModel sceneModel,
       }
 
       if (!anyVertices) {
-        var boneQueue = new Queue<IBone>();
+        var boneQueue = new Queue<IReadOnlyBone>();
         boneQueue.Enqueue(model.Skeleton.Root);
 
         while (boneQueue.Count > 0) {

diff --git a/FinModelUtility/Games/HaloWars/HaloWarsTools/Resources/HWVisResource.cs b/FinModelUtility/Games/HaloWars/HaloWarsTools/Resources/HWVisResource.cs
@@ -109,7 +109,7 @@ private HWModel[] ImportModels_() {
       var modelQueue = new Queue<(VisModel, VisSubModelRef?, bool)>();
       modelQueue.Enqueue((firstModel, null, true));
 
-      var attachmentPointMap = new NullFriendlyDictionary<string, (ISceneModel, IBone)>();
+      var attachmentPointMap = new NullFriendlyDictionary<string, (ISceneModel, IReadOnlyBone)>();
 
       while (modelQueue.Count > 0) {
         var (visModel, subModelRef, flipFaces) = modelQueue.Dequeue();

diff --git a/...lAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/skeleton/SkeletonTreeView.cs b/...lAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/skeleton/SkeletonTreeView.cs
@@ -19,7 +19,7 @@ public interface ISkeletonTreeView {
 
   public interface ISkeletonTreeNode {
     string Text { get; }
-    IBone Bone { get; }
+    IReadOnlyBone Bone { get; }
 
     ISkeletonTreeNode? Parent { get; }
   }
@@ -35,26 +35,26 @@ public partial class SkeletonTreeView : UserControl, ISkeletonTreeView {
     protected class SkeletonNode : ISkeletonTreeNode {
       private readonly common.IBetterTreeNode<SkeletonNode> treeNode_;
 
-      public SkeletonNode(SkeletonTreeView treeView, IBone bone) {
+      public SkeletonNode(SkeletonTreeView treeView, IReadOnlyBone bone) {
         this.Bone = bone;
 
         this.treeNode_ = treeView.betterTreeView_.Root;
         this.treeNode_.Data = this;
       }
 
-      private SkeletonNode(SkeletonNode parent, IBone bone) {
+      private SkeletonNode(SkeletonNode parent, IReadOnlyBone bone) {
         this.Bone = bone;
 
         this.treeNode_ = parent.treeNode_.Add(bone.Name);
         this.treeNode_.Data = this;
       }
 
       public string Text => this.treeNode_.Text ?? "n/a";
-      public IBone Bone { get; set; }
+      public IReadOnlyBone Bone { get; set; }
 
       public ISkeletonTreeNode? Parent => this.treeNode_.Parent?.Data;
 
-      public SkeletonNode AddChild(IBone bone) => new(this, bone);
+      public SkeletonNode AddChild(IReadOnlyBone bone) => new(this, bone);
     }
 
     public SkeletonTreeView() {
@@ -72,13 +72,13 @@ public SkeletonTreeView() {
       };
     }
 
-    public void Populate(ISkeleton? skeleton) {
+    public void Populate(IReadOnlySkeleton? skeleton) {
       this.betterTreeView_.BeginUpdate();
       this.betterTreeView_.Clear();
 
       if (skeleton != null) {
         var boneQueue =
-            new FinTuple2Queue<IBone, SkeletonNode>(
+            new FinTuple2Queue<IReadOnlyBone, SkeletonNode>(
                 (skeleton.Root, new SkeletonNode(this, skeleton.Root)));
         while (boneQueue.TryDequeue(out var bone, out var node)) {
           boneQueue.Enqueue(