Switched over a lot more stuff over to readonly.

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

Hide file tree

Showing 32 changed files with 96 additions and 90 deletions.
diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/material/GlColorMaterialShader.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/material/GlColorMaterialShader.cs
@@ -7,30 +7,29 @@
 namespace fin.ui.rendering.gl.material {
   public class GlColorMaterialShader(
       IReadOnlyModel model,
-      IColorMaterial colorMaterial,
+      IReadOnlyColorMaterial colorMaterial,
       IBoneTransformManager? boneTransformManager,
       IReadOnlyLighting? lighting)
-      : BGlMaterialShader<IColorMaterial>(model,
+      : BGlMaterialShader<IReadOnlyColorMaterial>(model,
                                           colorMaterial,
                                           boneTransformManager,
                                           lighting) {
-    private readonly IColorMaterial material_ = colorMaterial;
     private IShaderUniform<Vector4> diffuseLightColorUniform_;
 
     protected override void DisposeInternal() { }
 
-    protected override void Setup(IColorMaterial material,
+    protected override void Setup(IReadOnlyColorMaterial material,
                                   GlShaderProgram shaderProgram) {
       this.diffuseLightColorUniform_ =
           shaderProgram.GetUniformVec4("diffuseColor");
     }
 
     protected override void PassUniformsAndBindTextures(GlShaderProgram impl) {
       this.diffuseLightColorUniform_.SetAndMaybeMarkDirty(
-          new Vector4(this.material_.Color.R / 255f,
-                      this.material_.Color.G / 255f,
-                      this.material_.Color.B / 255f,
-                      this.material_.Color.A / 255f));
+          new Vector4(colorMaterial.Color.R / 255f,
+                      colorMaterial.Color.G / 255f,
+                      colorMaterial.Color.B / 255f,
+                      colorMaterial.Color.A / 255f));
     }
   }
 }
diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/material/GlMaterialShader.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/material/GlMaterialShader.cs
@@ -13,19 +13,19 @@ public static IGlMaterialShader FromMaterial(
       => material.GetShaderType() switch {
           FinShaderType.FIXED_FUNCTION => new GlFixedFunctionMaterialShader(
               model,
-              Asserts.AsA<IFixedFunctionMaterial>(material),
+              Asserts.AsA<IReadOnlyFixedFunctionMaterial>(material),
               boneTransformManager,
               lighting),
           FinShaderType.TEXTURE => new GlTextureMaterialShader(model,
-            Asserts.AsA<ITextureMaterial>(material),
+            Asserts.AsA<IReadOnlyTextureMaterial>(material),
             boneTransformManager,
             lighting),
           FinShaderType.COLOR => new GlColorMaterialShader(model,
-            Asserts.AsA<IColorMaterial>(material),
+            Asserts.AsA<IReadOnlyColorMaterial>(material),
             boneTransformManager,
             lighting),
           FinShaderType.STANDARD => new GlStandardMaterialShader(model,
-            Asserts.AsA<IStandardMaterial>(material),
+            Asserts.AsA<IReadOnlyStandardMaterial>(material),
             boneTransformManager,
             lighting),
           FinShaderType.NULL => new GlNullMaterialShader(

diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/material/GlStandardMaterialShader.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/material/GlStandardMaterialShader.cs
@@ -4,16 +4,16 @@
 namespace fin.ui.rendering.gl.material {
   public class GlStandardMaterialShader(
       IReadOnlyModel model,
-      IStandardMaterial standardMaterial,
+      IReadOnlyStandardMaterial standardMaterial,
       IBoneTransformManager? boneTransformManager,
       IReadOnlyLighting? lighting)
-      : BGlMaterialShader<IStandardMaterial>(model,
-                                             standardMaterial,
-                                             boneTransformManager,
-                                             lighting) {
+      : BGlMaterialShader<IReadOnlyStandardMaterial>(model,
+        standardMaterial,
+        boneTransformManager,
+        lighting) {
     protected override void DisposeInternal() { }
 
-    protected override void Setup(IStandardMaterial material,
+    protected override void Setup(IReadOnlyStandardMaterial material,
                                   GlShaderProgram shaderProgram) {
       var diffuseFinTexture = material.DiffuseTexture;
       var diffuseGlTexture =

diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/model/SkeletonRenderer.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/model/SkeletonRenderer.cs
@@ -11,7 +11,7 @@
 namespace fin.ui.rendering.gl.model {
   public interface ISkeletonRenderer : IRenderable {
     ISkeleton Skeleton { get; }
-    IBone? SelectedBone { get; set; }
+    IReadOnlyBone? SelectedBone { get; set; }
     float Scale { get; set; }
   }
 
@@ -28,7 +28,7 @@ public SkeletonRenderer(ISkeleton skeleton,
     }
 
     public ISkeleton Skeleton { get; }
-    public IBone? SelectedBone { get; set; }
+    public IReadOnlyBone? SelectedBone { get; set; }
     public float Scale { get; set; } = 1;
 
     public void Render() {

diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/model/UseLightingDetector.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/model/UseLightingDetector.cs
@@ -3,7 +3,7 @@
 
 namespace fin.ui.rendering.gl.model {
   public class UseLightingDetector {
-    public bool ShouldUseLightingFor(IModel model) {
+    public bool ShouldUseLightingFor(IReadOnlyModel model) {
       var useLighting = false;
       foreach (var vertex in model.Skin.Vertices) {
         if (vertex is IReadOnlyNormalVertex { LocalNormal: { } }) {

diff --git a/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/scene/SceneModelRenderer.cs b/FinModelUtility/Fin/Fin.Ui/src/rendering/gl/scene/SceneModelRenderer.cs
@@ -14,7 +14,7 @@ public class SceneModelRenderer : IRenderable, IDisposable {
     private readonly ISceneModel sceneModel_;
     private readonly IModelRenderer modelRenderer_;
 
-    private readonly ListDictionary<IBone, SceneModelRenderer>
+    private readonly ListDictionary<IReadOnlyBone, SceneModelRenderer>
         children_ = new();
 
     public SceneModelRenderer(ISceneModel sceneModel,

diff --git a/FinModelUtility/Fin/Fin/src/model/ModelInterfaces.cs b/FinModelUtility/Fin/Fin/src/model/ModelInterfaces.cs
@@ -9,7 +9,8 @@ public partial interface IModel {
     IAnimationManager AnimationManager { get; }
   }
 
-  public interface IModel<out TSkin> : IModel where TSkin : ISkin {
+  [GenerateReadOnly]
+  public partial interface IModel<out TSkin> : IModel where TSkin : ISkin {
     new TSkin Skin { get; }
   }
 }
diff --git a/FinModelUtility/Fin/Fin/src/model/SkinInterfaces.cs b/FinModelUtility/Fin/Fin/src/model/SkinInterfaces.cs
@@ -34,7 +34,9 @@ IBoneWeights CreateBoneWeights(
         params IBoneWeight[] weights);
   }
 
-  public interface ISkin<out TVertex> : ISkin where TVertex : IReadOnlyVertex {
+  [GenerateReadOnly]
+  public partial interface ISkin<out TVertex> : ISkin
+      where TVertex : IReadOnlyVertex {
     IReadOnlyList<TVertex> TypedVertices { get; }
 
     TVertex AddVertex(Position position);

diff --git a/FinModelUtility/Fin/Fin/src/model/util/ModelMinMaxBoundsScaleCalculator.cs b/FinModelUtility/Fin/Fin/src/model/util/ModelMinMaxBoundsScaleCalculator.cs
@@ -7,10 +7,10 @@
 
 namespace fin.model.util {
   public class ModelMinMaxBoundsScaleCalculator
-      : BMinMaxBoundsScaleCalculator<IModel> {
+      : BMinMaxBoundsScaleCalculator<IReadOnlyModel> {
     private readonly BoneTransformManager boneTransformManager_ = new();
 
-    public override Bounds CalculateBounds(IModel model) {
+    public override Bounds CalculateBounds(IReadOnlyModel model) {
       var minX = float.MaxValue;
       var minY = float.MaxValue;
       var minZ = float.MaxValue;
@@ -29,7 +29,7 @@ public override Bounds CalculateBounds(IModel model) {
       return new Bounds(minX, minY, minZ, maxX, maxY, maxZ);
     }
 
-    public Bounds CalculateBounds(IEnumerable<IModel> models) {
+    public Bounds CalculateBounds(IEnumerable<IReadOnlyModel> models) {
       var minX = float.MaxValue;
       var minY = float.MaxValue;
       var minZ = float.MaxValue;
@@ -50,7 +50,7 @@ public Bounds CalculateBounds(IEnumerable<IModel> models) {
       return new Bounds(minX, minY, minZ, maxX, maxY, maxZ);
     }
 
-    private void FactorModelIntoBounds_(IModel model,
+    private void FactorModelIntoBounds_(IReadOnlyModel model,
                                         ref float minX,
                                         ref float minY,
                                         ref float minZ,

diff --git a/FinModelUtility/Fin/Fin/src/scene/SceneInterfaces.cs b/FinModelUtility/Fin/Fin/src/scene/SceneInterfaces.cs
@@ -87,14 +87,14 @@ ISceneObject SetRotationDegrees(float xDegrees,
   ///   onto bones.
   /// </summary>
   public interface ISceneModel : IDisposable {
-    IReadOnlyListDictionary<IBone, ISceneModel> Children { get; }
-    ISceneModel AddModelOntoBone(IModel model, IBone bone);
+    IReadOnlyListDictionary<IReadOnlyBone, ISceneModel> Children { get; }
+    ISceneModel AddModelOntoBone(IReadOnlyModel model, IReadOnlyBone bone);
 
-    IModel Model { get; }
+    IReadOnlyModel Model { get; }
 
     IBoneTransformManager BoneTransformManager { get; }
 
-    IModelAnimation? Animation { get; set; }
+    IReadOnlyModelAnimation? Animation { get; set; }
     IAnimationPlaybackManager AnimationPlaybackManager { get; }
 
     float ViewerScale { get; set; }

diff --git a/FinModelUtility/Fin/Fin/src/scene/impl/SceneModelImpl.cs b/FinModelUtility/Fin/Fin/src/scene/impl/SceneModelImpl.cs
@@ -9,17 +9,19 @@
 namespace fin.scene {
   public partial class SceneImpl {
     private class SceneModelImpl : ISceneModel {
-      private readonly ListDictionary<IBone, ISceneModel> children_ = new();
-      private IModelAnimation? animation_;
+      private readonly ListDictionary<IReadOnlyBone, ISceneModel> children_ = new();
+      private IReadOnlyModelAnimation? animation_;
 
-      public SceneModelImpl(IModel model) {
+      public SceneModelImpl(IReadOnlyModel model) {
         this.Model = model;
         this.BoneTransformManager = new BoneTransformManager();
 
         this.Init_();
       }
 
-      private SceneModelImpl(IModel model, SceneModelImpl parent, IBone bone) {
+      private SceneModelImpl(IReadOnlyModel model,
+                             SceneModelImpl parent,
+                             IReadOnlyBone bone) {
         this.Model = model;
         this.BoneTransformManager =
             new BoneTransformManager((parent.BoneTransformManager, bone));
@@ -54,20 +56,21 @@ private void ReleaseUnmanagedResources_() {
         }
       }
 
-      public IReadOnlyListDictionary<IBone, ISceneModel> Children
+      public IReadOnlyListDictionary<IReadOnlyBone, ISceneModel> Children
         => this.children_;
 
-      public ISceneModel AddModelOntoBone(IModel model, IBone bone) {
+      public ISceneModel AddModelOntoBone(IReadOnlyModel model,
+                                          IReadOnlyBone bone) {
         var child = new SceneModelImpl(model, this, bone);
         this.children_.Add(bone, child);
         return child;
       }
 
-      public IModel Model { get; }
+      public IReadOnlyModel Model { get; }
 
       public IBoneTransformManager BoneTransformManager { get; }
 
-      public IModelAnimation? Animation {
+      public IReadOnlyModelAnimation? Animation {
         get => this.animation_;
         set {
           if (this.animation_ == value) {

diff --git a/FinModelUtility/UniversalAssetTool/UniversalAssetTool.Ui/src/ui/ISceneViewerPanel.cs b/FinModelUtility/UniversalAssetTool/UniversalAssetTool.Ui/src/ui/ISceneViewerPanel.cs
@@ -12,7 +12,7 @@ public interface ISceneViewerPanel {
 
     ISceneModel? FirstSceneModel { get; }
     IAnimationPlaybackManager? AnimationPlaybackManager { get; }
-    IModelAnimation? Animation { get; set; }
+    IReadOnlyModelAnimation? Animation { get; set; }
     ISkeletonRenderer? SkeletonRenderer { get; }
 
     TimeSpan FrameTime { get; }

diff --git a/...iversalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/common/scene/SceneViewerGlPanel.cs b/...iversalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/common/scene/SceneViewerGlPanel.cs
@@ -99,7 +99,7 @@ public ISkeletonRenderer? SkeletonRenderer
              ?.ModelRenderers.FirstOrDefault()
              ?.SkeletonRenderer;
 
-    public IModelAnimation? Animation {
+    public IReadOnlyModelAnimation? Animation {
       get => this.FirstSceneModel?.Animation;
       set {
         if (this.FirstSceneModel == null) {

diff --git a/...UniversalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/common/scene/SceneViewerPanel.cs b/...UniversalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/common/scene/SceneViewerPanel.cs
@@ -35,7 +35,7 @@ public IAnimationPlaybackManager? AnimationPlaybackManager
 
     public ISkeletonRenderer? SkeletonRenderer => this.impl_.SkeletonRenderer;
 
-    public IModelAnimation? Animation {
+    public IReadOnlyModelAnimation? Animation {
       get => this.impl_.Animation;
       set => this.impl_.Animation = value;
     }

diff --git a/...Utility/UniversalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/ModelTabs.cs b/...Utility/UniversalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/ModelTabs.cs
@@ -12,7 +12,7 @@ public ModelTabs() {
       InitializeComponent();
     }
 
-    public (IFileBundle, IModel)? Model {
+    public (IFileBundle, IReadOnlyModel)? Model {
       set {
         var modelFileBundle = value?.Item1;
         var model = value?.Item2;

diff --git a/...alAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/animations/AnimationsTab.cs b/...alAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/animations/AnimationsTab.cs
@@ -6,7 +6,7 @@
 
 namespace uni.ui.winforms.right_panel {
   public partial class AnimationsTab : UserControl {
-    private IModelAnimation[]? animations_;
+    private IReadOnlyModelAnimation[]? animations_;
 
     public AnimationsTab() {
       InitializeComponent();
@@ -22,7 +22,7 @@ public AnimationsTab() {
       };
     }
 
-    public IModel? Model {
+    public IReadOnlyModel? Model {
       set {
         this.listView_.SelectedIndices.Clear();
         this.listView_.Items.Clear();
@@ -51,7 +51,7 @@ public IAnimationPlaybackManager? AnimationPlaybackManager {
       set => this.animationPlaybackPanel_.Impl = value;
     }
 
-    public delegate void AnimationSelected(IModelAnimation? animation);
+    public delegate void AnimationSelected(IReadOnlyModelAnimation? animation);
 
     public event AnimationSelected OnAnimationSelected;
   }

diff --git a/...tTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/IMaterialViewerPanel.cs b/...tTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/IMaterialViewerPanel.cs
@@ -2,6 +2,6 @@
 
 namespace uni.ui.winforms.right_panel.materials {
   public interface IMaterialViewerPanel {
-    public IMaterial? Material { get; set; }
+    public IReadOnlyMaterial? Material { get; set; }
   }
 }
diff --git a/...AssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialSelector.cs b/...AssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialSelector.cs
@@ -6,8 +6,8 @@
 
 namespace uni.ui.winforms.right_panel.materials {
   public partial class MaterialSelector : UserControl {
-    private IReadOnlyList<IMaterial>? materials_;
-    private IMaterial? selectedMaterial_ = null;
+    private IReadOnlyList<IReadOnlyMaterial>? materials_;
+    private IReadOnlyMaterial? selectedMaterial_ = null;
 
     public MaterialSelector() {
       InitializeComponent();
@@ -20,7 +20,7 @@ public MaterialSelector() {
       };
     }
 
-    public IReadOnlyList<IMaterial>? Materials {
+    public IReadOnlyList<IReadOnlyMaterial>? Materials {
       get => this.materials_;
       set {
         this.materials_ = value;
@@ -41,7 +41,7 @@ public IReadOnlyList<IMaterial>? Materials {
       }
     }
 
-    public IMaterial? SelectedMaterial {
+    public IReadOnlyMaterial? SelectedMaterial {
       get => this.selectedMaterial_;
       set {
         if (this.selectedMaterial_ == value || this.materials_ == null) {
@@ -58,7 +58,7 @@ public IMaterial? SelectedMaterial {
       }
     }
 
-    public delegate void OnMaterialSelectedHandler(IMaterial? material);
+    public delegate void OnMaterialSelectedHandler(IReadOnlyMaterial? material);
 
     public event OnMaterialSelectedHandler OnMaterialSelected = delegate { };
   }

diff --git a/...Tool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialViewerGlPanel.cs b/...Tool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialViewerGlPanel.cs
@@ -13,10 +13,10 @@
 
 namespace uni.ui.winforms.right_panel.materials {
   public class MaterialViewerGlPanel : BGlPanel, IMaterialViewerPanel {
-    private IMaterial? material_;
+    private IReadOnlyMaterial? material_;
     private IGlMaterialShader? materialShader_;
 
-    public IMaterial? Material {
+    public IReadOnlyMaterial? Material {
       get => this.material_;
       set {
         this.material_ = value;

diff --git a/...etTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialViewerPanel.cs b/...etTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialViewerPanel.cs
@@ -8,7 +8,7 @@ public MaterialViewerPanel() {
       this.InitializeComponent();
     }
 
-    public IMaterial? Material {
+    public IReadOnlyMaterial? Material {
       get => this.impl_.Material;
       set {
         this.groupBox_.Text = value == null

diff --git a/...rsalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialsTab.cs b/...rsalAssetTool/UniversalAssetTool.Ui/src/ui/winforms/right_panel/materials/MaterialsTab.cs
@@ -5,7 +5,7 @@
 
 namespace uni.ui.winforms.right_panel.materials {
   public partial class MaterialsTab : UserControl {
-    private IModel? model_;
+    private IReadOnlyModel? model_;
 
     public MaterialsTab() {
       InitializeComponent();
@@ -17,7 +17,7 @@ public MaterialsTab() {
       };
     }
 
-    public (IModel, IReadOnlyList<IMaterial>)? ModelAndMaterials {
+    public (IReadOnlyModel, IReadOnlyList<IReadOnlyMaterial>)? ModelAndMaterials {
       set {
         this.model_ = value?.Item1;
         this.materialSelector_.Materials = value?.Item2;