cleanup (#40)

* cleanup * fix bbox min/max
ACEmulator · Jan 20, 2022 · 6e3201f · 6e3201f
1 parent 1b09be3
commit 6e3201f
Show file tree

Hide file tree

Showing 201 changed files with 907 additions and 1,639 deletions.
diff --git a/ACViewer/ACViewer.csproj b/ACViewer/ACViewer.csproj
@@ -158,6 +158,9 @@
     <Compile Include="Entity\TimeOfDay.cs" />
     <Compile Include="Entity\TMTerrainDesc.cs" />
     <Compile Include="Enum\DatType.cs" />
+    <Compile Include="Enum\Facing.cs" />
+    <Compile Include="Enum\ModelType.cs" />
+    <Compile Include="Enum\ViewMode.cs" />
     <Compile Include="Extensions\PositionExtensions.cs" />
     <Compile Include="Extensions\TextureExtensions.cs" />
     <Compile Include="Extensions\Vector2Extensions.cs" />

diff --git a/ACViewer/Data/DIDTable.cs b/ACViewer/Data/DIDTable.cs
@@ -1,17 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ACViewer.Data
 {
     public class DIDTable: IEquatable<DIDTable>
     {
-        public uint SetupID;
-        public uint MotionTableID;
-        public uint SoundTableID;
-        public uint CombatTableID;
+        public uint SetupID { get; set; }
+        public uint MotionTableID { get; set; }
+        public uint SoundTableID { get; set; }
+        public uint CombatTableID { get; set; }
 
         public DIDTable() { }
 

diff --git a/ACViewer/Data/DIDTables.cs b/ACViewer/Data/DIDTables.cs
@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ACViewer.Data
 {
     public static class DIDTables
     {
-        public static Dictionary<uint, DIDTable> Setups;
+        public static Dictionary<uint, DIDTable> Setups { get; set; }
 
         static DIDTables()
         {

diff --git a/ACViewer/Entity/AmbientSoundDesc.cs b/ACViewer/Entity/AmbientSoundDesc.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+
 using ACE.Entity.Enum;
 
 namespace ACViewer.Entity

diff --git a/ACViewer/Entity/AmbientSoundTableDesc.cs b/ACViewer/Entity/AmbientSoundTableDesc.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/AnimData.cs b/ACViewer/Entity/AnimData.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/AnimPartChange.cs b/ACViewer/Entity/AnimPartChange.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/AnimationFrame.cs b/ACViewer/Entity/AnimationFrame.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 
-using ACViewer.Entity.AnimationHooks;
-
 namespace ACViewer.Entity
 {
     public class AnimationFrame

diff --git a/ACViewer/Entity/AnimationHook.cs b/ACViewer/Entity/AnimationHook.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using ACE.Entity.Enum;
+
 using ACViewer.Entity.AnimationHooks;
 
 namespace ACViewer.Entity

diff --git a/ACViewer/Entity/BSPLeaf.cs b/ACViewer/Entity/BSPLeaf.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+
 using ACE.Entity.Enum;
 
 namespace ACViewer.Entity
@@ -26,8 +23,8 @@ public override List<TreeNode> BuildTree(BSPType bspType)
             if (bspType == BSPType.Physics)
             {
                 var solid = new TreeNode($"Solid: {_bspLeaf.Solid}");
-                var sphere = new TreeNode($"Sphere: {new Sphere(_bspLeaf.Sphere).ToString()}");
-                var inPolys = new TreeNode($"InPolys: {String.Join(", ", _bspLeaf.InPolys)}");
+                var sphere = new TreeNode($"Sphere: {new Sphere(_bspLeaf.Sphere)}");
+                var inPolys = new TreeNode($"InPolys: {string.Join(", ", _bspLeaf.InPolys)}");
 
                 treeNode.AddRange(new List<TreeNode>() { solid, sphere, inPolys });
             }

diff --git a/ACViewer/Entity/BSPNode.cs b/ACViewer/Entity/BSPNode.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+
 using ACE.Entity.Enum;
 
 namespace ACViewer.Entity
@@ -57,13 +54,13 @@ public virtual List<TreeNode> BuildTree(BSPType bspType)
             if (bspType == BSPType.Cell)
                 return treeNode;
 
-            var sphere = new TreeNode($"Sphere: {new Sphere(_bspNode.Sphere).ToString()}");
+            var sphere = new TreeNode($"Sphere: {new Sphere(_bspNode.Sphere)}");
             treeNode.Add(sphere);
 
             if (bspType == BSPType.Physics)
                 return treeNode;
 
-            var inPolys = new TreeNode($"InPolys: {String.Join(", ", _bspNode.InPolys)}");
+            var inPolys = new TreeNode($"InPolys: {string.Join(", ", _bspNode.InPolys)}");
             treeNode.Add(inPolys);
 
             return treeNode;

diff --git a/ACViewer/Entity/BSPPortal.cs b/ACViewer/Entity/BSPPortal.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+
 using ACE.Entity.Enum;
 
 namespace ACViewer.Entity
@@ -20,7 +17,7 @@ public override List<TreeNode> BuildTree(BSPType bspType)
         {
             var type = new TreeNode($"Type: {_bspPortal.Type:X8}");
 
-            var splitter = new TreeNode($"Splitting Plane: {new Plane(_bspPortal.SplittingPlane).ToString()}");
+            var splitter = new TreeNode($"Splitting Plane: {new Plane(_bspPortal.SplittingPlane)}");
 
             var posNode = new TreeNode("PosNode:");
             if (_bspPortal.PosNode != null)
@@ -48,8 +45,8 @@ public override List<TreeNode> BuildTree(BSPType bspType)
 
             if (bspType == BSPType.Drawing)
             {
-                var sphere = new TreeNode($"Sphere: {new Sphere(_bspPortal.Sphere).ToString()}");
-                var inPolys = new TreeNode($"InPolys: {String.Join(", ", _bspPortal.InPolys)}");
+                var sphere = new TreeNode($"Sphere: {new Sphere(_bspPortal.Sphere)}");
+                var inPolys = new TreeNode($"InPolys: {string.Join(", ", _bspPortal.InPolys)}");
 
                 var inPortals = new TreeNode("InPortals:");
                 foreach (var inPortal in _bspPortal.InPortals)

diff --git a/ACViewer/Entity/BSPTree.cs b/ACViewer/Entity/BSPTree.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ACE.Entity.Enum;
+using ACE.Entity.Enum;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/BldPortal.cs b/ACViewer/Entity/BldPortal.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/BuildInfo.cs b/ACViewer/Entity/BuildInfo.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {
@@ -18,7 +14,7 @@ public BuildInfo(ACE.DatLoader.Entity.BuildInfo buildInfo)
         public List<TreeNode> BuildTree()
         {
             var modelID = new TreeNode($"ModelID: {_buildInfo.ModelId:X8}");
-            var frame = new TreeNode($"Frame: {new Frame(_buildInfo.Frame).ToString()}");
+            var frame = new TreeNode($"Frame: {new Frame(_buildInfo.Frame)}");
             var numLeaves = new TreeNode($"NumLeaves: {_buildInfo.NumLeaves}");
 
             var portals = new TreeNode("Portals:");

diff --git a/ACViewer/Entity/CellPortal.cs b/ACViewer/Entity/CellPortal.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/CellStruct.cs b/ACViewer/Entity/CellStruct.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
+
 using ACE.Entity.Enum;
 
 namespace ACViewer.Entity

diff --git a/ACViewer/Entity/ChatEmoteData.cs b/ACViewer/Entity/ChatEmoteData.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/ClothingBaseEffect.cs b/ACViewer/Entity/ClothingBaseEffect.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/ClothingObjectEffect.cs b/ACViewer/Entity/ClothingObjectEffect.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/ClothingSubPalette.cs b/ACViewer/Entity/ClothingSubPalette.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {
@@ -21,7 +17,7 @@ public List<TreeNode> BuildTree()
 
             if (_subPalette.Ranges.Count == 1)
             {
-                var range = new TreeNode($"Range: {new ClothingSubPaletteRange(_subPalette.Ranges[0]).ToString()}");
+                var range = new TreeNode($"Range: {new ClothingSubPaletteRange(_subPalette.Ranges[0])}");
                 treeNode.Add(range);
             }
             else

diff --git a/ACViewer/Entity/ClothingSubPaletteEffect.cs b/ACViewer/Entity/ClothingSubPaletteEffect.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/ClothingSubPaletteRange.cs b/ACViewer/Entity/ClothingSubPaletteRange.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/ClothingTextureEffect.cs b/ACViewer/Entity/ClothingTextureEffect.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ACViewer.Entity
+namespace ACViewer.Entity
 {
     public class ClothingTextureEffect
     {

diff --git a/ACViewer/Entity/Color.cs b/ACViewer/Entity/Color.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/CombatManeuver.cs b/ACViewer/Entity/CombatManeuver.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/Contract.cs b/ACViewer/Entity/Contract.cs
@@ -1,9 +1,4 @@
-using ACE.Entity.Enum;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/CylSphere.cs b/ACViewer/Entity/CylSphere.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ACViewer.Entity
+namespace ACViewer.Entity
 {
     public class CylSphere
     {

diff --git a/ACViewer/Entity/DayGroup.cs b/ACViewer/Entity/DayGroup.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {

diff --git a/ACViewer/Entity/EyeStripCG.cs b/ACViewer/Entity/EyeStripCG.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace ACViewer.Entity
 {