Database Inspector Features

Aetheria Database Tools now has the ability to customize the shapes of items and hardpoints, and displays hardpoints when editing hull shape
List elements now have foldouts
Lists are presented in the Database Inspector with colors when the list type implements ITintInspector interface

Assets/Scripts/Editor/DatabaseInspector.cs

@@ -10,6 +10,7 @@ using UnityEditor;
 using UnityEngine;
 using static Unity.Mathematics.math;
 using static UnityEditor.EditorGUILayout;
+using int2 = Unity.Mathematics.int2;
 using Object = UnityEngine.Object;
 
 public class DatabaseInspector : EditorWindow
@@ -19,7 +20,7 @@ public class DatabaseInspector : EditorWindow
     
     // Singleton to avoid multiple instances of window.
     private static DatabaseInspector _instance;
-    public static DatabaseInspector Instance => _instance ?? GetWindow<DatabaseInspector>();
+    public static DatabaseInspector Instance => _instance ? _instance : GetWindow<DatabaseInspector>();
     
     private DatabaseListView _list;
     private GUIStyle _labelStyle;
@@ -31,9 +32,13 @@ public class DatabaseInspector : EditorWindow
     private string[] _hardpointTypes;
     private const int width = 150;
     private const int labelWidth = 20;
+    private const int toggleWidth = 18;
+    private const int arrowWidth = 22;
     private Material _galaxyMat;
     private Texture2D _white;
     private GUIStyle _warning;
+    private HashSet<int> _listItemFoldouts = new HashSet<int>();
+    private Material _schematicMat;
 
     public Color LabelColor => EditorGUIUtility.isProSkin ? Color.white : Color.black;
 
@@ -48,6 +53,7 @@ public class DatabaseInspector : EditorWindow
         wantsMouseMove = true;
         _hardpointTypes = Enum.GetNames(typeof(HardpointType));
         _galaxyMat = new Material(Shader.Find("Unlit/GalaxyMap"));
+        _schematicMat = new Material(Shader.Find("Legacy Shaders/Particles/Additive"));
         _white = Color.white.ToTexture();
         _warning = new GUIStyle(EditorStyles.boldLabel);
         _warning.normal.textColor = Color.red;
@@ -144,6 +150,10 @@ public class DatabaseInspector : EditorWindow
             else 
                 field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (int) value));
         }
+        else if (type == typeof(int2))
+        {
+            field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (int2) field.GetValue(obj)));
+        }
         else if (type.IsEnum)
         {
             var isflags = type.GetCustomAttributes<FlagsAttribute>().Any();
@@ -165,6 +175,7 @@ public class DatabaseInspector : EditorWindow
         else if (type == typeof(Type) && inspectable is InspectableTypeAttribute typeAttribute) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (Type) value, typeAttribute.Type));
         else if (type == typeof(GameObject)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (GameObject) value));
         else if (type == typeof(AnimationCurve)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (AnimationCurve) value));
+        else if (type == typeof(Shape)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (Shape) value, (obj is HullData hull) ? hull : null));
         else if (type == typeof(PerformanceStat)) field.SetValue(obj, Inspect(field.Name.SplitCamelCase(), (PerformanceStat) value, field.GetCustomAttribute<SimplePerformanceStatAttribute>() != null));
         else if (type == typeof(PerformanceStat[]))
         {
@@ -177,7 +188,7 @@ public class DatabaseInspector : EditorWindow
                     stats = new PerformanceStat[damageTypes.Length];
                 for (var i = 0; i < stats.Length; i++)
                 {
-                    stats[i] = Inspect(damageTypes[i].SplitCamelCase(), stats[i]);
+                    Inspect(damageTypes[i].SplitCamelCase(), stats[i]);
                 }
                 field.SetValue(obj, stats);
             }
@@ -336,12 +347,40 @@ public class DatabaseInspector : EditorWindow
                     }
                     foreach (var o in list)
                     {
+                        bool _tinted = false;
+                        var originalColor = GUI.backgroundColor;
+                        if (o is ITintInspector tint)
+                        {
+                            _tinted = true;
+                            GUI.backgroundColor = tint.TintColor.ToColor();
+                        }
+                        
                         using (new VerticalScope(_list.ListItemStyle))
                         {
                             using (new HorizontalScope())
                             {
                                 //if (listType.IsInterface)
-                                GUILayout.Label(o.GetType().Name.SplitCamelCase(), EditorStyles.boldLabel, GUILayout.ExpandWidth(true));
+                                if(Foldout(_listItemFoldouts.Contains(o.GetHashCode()), o.ToString(), true))
+                                    _listItemFoldouts.Add(o.GetHashCode());
+                                else
+                                    _listItemFoldouts.Remove(o.GetHashCode());
+                                // using (var h = new HorizontalScope())
+                                // {
+                                    // if (GUI.Button(h.rect, GUIContent.none, GUIStyle.none))
+                                    // {
+                                    //     if(_listItemFoldouts.Contains(o.GetHashCode()))
+                                    //         _listItemFoldouts.Remove(o.GetHashCode());
+                                    //     else
+                                    //         _listItemFoldouts.Add(o.GetHashCode());
+                                    // }
+                                    // var foldoutRect = GetControlRect(false, GUILayout.Width(EditorGUIUtility.singleLineHeight));
+                                    // if (Event.current.type == EventType.Repaint)
+                                    // {
+                                    //     var controlId = GUIUtility.GetControlID(1337, FocusType.Keyboard, position);
+                                    //     EditorStyles.foldout.Draw(foldoutRect, GUIContent.none, controlId, !_listItemFoldouts.Contains(o.GetHashCode()));
+                                    // }
+                                    // GUILayout.Label(o.ToString(), EditorStyles.boldLabel, GUILayout.Height(EditorGUIUtility.singleLineHeight), GUILayout.ExpandWidth(true));
+                                // }
 
                                 var rect = GetControlRect(false,
                                     GUILayout.Width(EditorGUIUtility.singleLineHeight));
@@ -353,11 +392,16 @@ public class DatabaseInspector : EditorWindow
                                     break;
                                 }
                             }
-                            
-                            Space();
+                            if(_listItemFoldouts.Contains(o.GetHashCode()))
+                            {
+                                Space();
 
-                            Inspect(o, inspectablesOnly);
+                                Inspect(o, inspectablesOnly);
+                            }
                         }
+                        
+                        if(_tinted)
+                            GUI.backgroundColor = originalColor;
                     }
                     using (new HorizontalScope(_list.ListItemStyle))
                     {
@@ -540,6 +584,27 @@ public class DatabaseInspector : EditorWindow
         }
     }
 
+    public int2 Inspect(string label, int2 value)
+    {
+        using (var h = new HorizontalScope())
+        {
+            GUILayout.Label(label, GUILayout.Width(width));
+            GUILayout.Label("X", GUILayout.Width(labelWidth));
+            value.x = DelayedIntField(value.x);
+            GUILayout.Label("Y", GUILayout.Width(labelWidth));
+            value.y = DelayedIntField(value.y);
+            if (GUILayout.Button("\u2190", GUILayout.Width(arrowWidth)))
+                value.x--;
+            if (GUILayout.Button("\u2192", GUILayout.Width(arrowWidth)))
+                value.x++;
+            if (GUILayout.Button("\u2191", GUILayout.Width(arrowWidth)))
+                value.y++;
+            if (GUILayout.Button("\u2193", GUILayout.Width(arrowWidth)))
+                value.y--;
+            return value;
+        }
+    }
+
     public int Inspect(string label, int value, int min, int max)
     {
         using (var h = new HorizontalScope())
@@ -951,9 +1016,83 @@ public class DatabaseInspector : EditorWindow
             }
         }
     }
+
+    public Shape Inspect(string label, Shape value, HullData hull = null)
+    {
+        if(value == null)
+        {
+            value = new Shape(1, 1);
+            value[int2.zero] = true;
+        }
+        using (new VerticalScope())
+        {
+            Texture2D schematic = null;
+            if(hull != null && !string.IsNullOrEmpty(hull.Schematic))
+                schematic = AssetDatabase.LoadAssetAtPath<Texture2D>(hull.Schematic);
+            using (new HorizontalScope())
+            {
+                GUILayout.Label(label, GUILayout.Width(width));
+                GUILayout.Label("Size", GUILayout.ExpandWidth(false));
+                if(schematic == null)
+                {
+                    GUILayout.Label("X", GUILayout.Width(labelWidth));
+                    value.Width = DelayedIntField(value.Width);
+                    GUILayout.Label("Y", GUILayout.Width(labelWidth));
+                    value.Height = DelayedIntField(value.Height);
+                }
+                else
+                {
+                    GUILayout.Label("X", GUILayout.Width(labelWidth));
+                    value.Width = DelayedIntField(value.Width);
+                    value.Height = Mathf.RoundToInt(value.Width * ((float)schematic.height / schematic.width));
+                    GUILayout.Label("Y", GUILayout.Width(labelWidth));
+                    LabelField($"{value.Height}");
+                }
+            }
+
+            using (new HorizontalScope())
+            {
+                GUILayout.Label("", GUILayout.Width(width));
+                using (var a = new VerticalScope())
+                {
+                    if(schematic != null)
+                    {
+                        EditorGUI.DrawPreviewTexture(a.rect, schematic, _schematicMat);
+                    }
+                    for (var y = value.Height - 1; y >= 0; y--)
+                    {
+                        using (new HorizontalScope())
+                        {
+                            for (var x = 0; x < value.Width; x++)
+                            {
+                                var oldColor = GUI.backgroundColor;
+                                if(hull != null)
+                                {
+                                    var hardpoint = hull.Hardpoints
+                                        .FirstOrDefault(hp =>
+                                            hp.Shape.Coordinates
+                                                .Select(v => v + hp.Position)
+                                                .Any(v => v.x == x && v.y == y));
+                                    if (hardpoint != null)
+                                        GUI.backgroundColor = hardpoint.TintColor.ToColor();
+                                }
+                                value[int2(x, y)] = Toggle(value[int2(x, y)], GUILayout.Width(toggleWidth));
+                                GUI.backgroundColor = oldColor;
+                            }
+                        }
+                    }
+                }
+                GUILayout.FlexibleSpace();
+            }
+        }
+
+        return value;
+    }
     
     public PerformanceStat Inspect(string label, PerformanceStat value, bool isSimple = false)
     {
+        if(value == null)
+            value = new PerformanceStat();
         using (new VerticalScope())
         {
             using (new HorizontalScope())
@@ -1004,9 +1143,9 @@ public class DatabaseInspector : EditorWindow
             // }
 
             Space();
-
-            return value;
         }
+
+        return value;
     }
 
     public void OnGUI()
@@ -1036,6 +1175,10 @@ public class DatabaseInspector : EditorWindow
             GUILayout.Width(EditorGUIUtility.currentViewWidth),
             GUILayout.ExpandHeight(true));
 
+        // Serialize inspected object so we can check whether it has actually changed
+        RegisterResolver.Register();
+        var previousBytes = MessagePackSerializer.Serialize(entry);
+        
         EditorGUI.BeginChangeCheck();
 
         var dataEntry = entry;
@@ -1164,7 +1307,8 @@ public class DatabaseInspector : EditorWindow
         
         if (EditorGUI.EndChangeCheck())
         {
-            DatabaseCache.Add(entry);
+            if(!previousBytes.ByteEquals(MessagePackSerializer.Serialize(entry)))
+                DatabaseCache.Add(entry);
         }
             
         EndScrollView();

Assets/Scripts/Editor/DatabaseView.cs

@@ -14,7 +14,7 @@ public class DatabaseListView : EditorWindow
 {
     // Singleton to avoid multiple instances of window. 
     private static DatabaseListView _instance;
-    public static DatabaseListView Instance => _instance ?? (DatabaseListView)GetWindow<DatabaseListView>();
+    public static DatabaseListView Instance => _instance ? _instance : GetWindow<DatabaseListView>();
     [MenuItem("Window/Aetheria Database Tools")]
     static void Init() => Instance.Show();
     private void Awake()

Assets/Scripts/ServerShared/Behaviors/Behaviors.cs

@@ -112,4 +112,11 @@ public abstract class BehaviorData
     public int Group;
     
     public abstract IBehavior CreateInstance(ItemManager context, Entity entity, EquippedItem item);
+
+    public override string ToString()
+    {
+        var className = base.ToString();
+        var dataIndex = className.IndexOf("data", StringComparison.InvariantCultureIgnoreCase);
+        return dataIndex>0 ? className.Substring(0,dataIndex).SplitCamelCase() : className;
+    }
 }

Assets/Scripts/ServerShared/Entity.cs

@@ -231,7 +231,8 @@ public abstract class Entity
                 if (!hardpoint.Shape[i]) return false;
             
                 // If there is any gear already occupying that space, it won't fit
-                var itemCoord = hardpoint.Position + i;
+                // Items placed in hardpoints are automatically aligned to hardpoint rotation
+                var itemCoord = hardpoint.Position + itemData.Shape.Rotate(i, hardpoint.Rotation);
                 if (_gearOccupancy[itemCoord.x, itemCoord.y] != null) return false;
             }
         }

Assets/Scripts/ServerShared/Enums.cs

@@ -1,5 +1,13 @@
 using System;
 
+public enum ItemRotation
+{
+    None = 0,
+    Clockwise = 1,
+    Reversed = 2,
+    CounterClockwise = 3
+}
+
 public enum LauncherCaliber
 {
     Micro,

Assets/Scripts/ServerShared/Extensions.cs

@@ -35,6 +35,31 @@ public static class Extensions
     //         (temperature - itemData.MinimumTemperature) /
     //         (itemData.MaximumTemperature - itemData.MinimumTemperature))));
     // }
+    
+    // Thanks, https://stackoverflow.com/a/48599119
+    public static bool ByteArrayCompare(ReadOnlySpan<byte> a1, ReadOnlySpan<byte> a2)
+    {
+        return a1.SequenceEqual(a2);
+    }
+
+    public static bool ByteEquals(this byte[] a, byte[] b) => ByteArrayCompare(a, b);
+
+    public static char Arrow(this ItemRotation rot)
+    {
+        switch (rot)
+        {
+            case ItemRotation.None:
+                return '\u2191';
+            case ItemRotation.Clockwise:
+                return '\u2192';
+            case ItemRotation.Reversed:
+                return '\u2193';
+            case ItemRotation.CounterClockwise:
+                return '\u2190';
+            default:
+                throw new ArgumentOutOfRangeException(nameof(rot), rot, null);
+        }
+    }
 	
     public static string SplitCamelCase( this string str )
     {

Assets/Scripts/ServerShared/ItemData.cs

@@ -9,35 +9,67 @@ using Unity.Mathematics;
 using static Unity.Mathematics.math;
 using int2 = Unity.Mathematics.int2;
 
+[InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class Shape
 {
     [JsonProperty("name"), Key(0)] public bool[,] Cells;
     
     private bool _dirty = true;
 
+    public Shape()
+    {
+        Cells = new bool[1,1];
+        Cells[0, 0] = true;
+    }
+
     public Shape(int width, int height)
     {
         Cells = new bool[width, height];
     }
     
-    public int Width => Cells.GetLength(0);
+    [IgnoreMember]
+    public int Width
+    {
+        get { return Cells.GetLength(0); }
+        set { Resize(value, Height); }
+    }
 
-    public int Height => Cells.GetLength(1);
+    [IgnoreMember]
+    public int Height
+    {
+        get { return Cells.GetLength(1); }
+        set { Resize(Width, value); }
+    }
+
+    public void Resize(int width, int height)
+    {
+        var newCells = new bool[width, height];
+        
+        for (int x = 0; x < width && x < Width; x++)
+        {
+            for (int y = 0; y < height && y < Height; y++)
+            {
+                newCells[x, y] = Cells[x, y];
+            }
+        }
+
+        Cells = newCells;
+    }
 
     private static int mod(int x, int m) {
         int r = x%m;
         return r<0 ? r+m : r;
     }
     
-    public int2 Rotate(int2 position, int rotation)
+    public int2 Rotate(int2 position, ItemRotation rotation)
     {
-        switch (mod(rotation, 4))
+        switch (rotation)
         {
-            case 1:
+            case ItemRotation.Clockwise:
                 return int2(position.y, Width - 1 - position.x);
-            case 2:
+            case ItemRotation.Reversed:
                 return int2(Width - 1 - position.x, Height - 1 - position.y);
-            case 3:
+            case ItemRotation.CounterClockwise:
                 return int2(Height - 1 - position.y, position.x);
             default:
                 return int2(position.x, position.y);
@@ -58,9 +90,9 @@ public class Shape
 
     private IEnumerable<int2> EnumerateShapeCoordinates()
     {
-        for(int x = 0; x < Cells.GetLength(0); x++)
+        for(int x = 0; x < Width; x++)
         {
-            for (int y = 0; y < Cells.GetLength(0); y++)
+            for (int y = 0; y < Height; y++)
             {
                 if(Cells[x,y]) yield return int2(x, y);
             }
@@ -141,7 +173,7 @@ public class SimpleCommodityData : ItemData
     // public float Floor = 5f;
 
     [InspectableField, JsonProperty("maxStackSize"), Key(6)]
-    public int MaxStack;
+    public int MaxStack = 10;
 
     [InspectableField, JsonProperty("category"), Key(7)]  
     public SimpleCommodityCategory Category;
@@ -174,19 +206,22 @@ public class CompoundCommodityData : CraftedItemData
  JsonObject(MemberSerialization.OptIn), JsonConverter(typeof(JsonKnownTypesConverter<EquippableItemData>))]
 public abstract class EquippableItemData : CraftedItemData
 {
-    [InspectableField, JsonProperty("behaviors"), Key(7)]  
+    [InspectableTexture, JsonProperty("schematic"), Key(7)]
+    public string Schematic;
+    
+    [InspectableField, JsonProperty("behaviors"), Key(8)]  
     public List<BehaviorData> Behaviors = new List<BehaviorData>();
 
-    [InspectableField, JsonProperty("durability"), Key(8)]
+    [InspectableField, JsonProperty("durability"), Key(9)]
     public float Durability;
     
-    [TemperatureInspectable, JsonProperty("minTemp"), Key(9)]
+    [TemperatureInspectable, JsonProperty("minTemp"), Key(10)]
     public float MinimumTemperature;
 
-    [TemperatureInspectable, JsonProperty("maxTemp"), Key(10)]
+    [TemperatureInspectable, JsonProperty("maxTemp"), Key(11)]
     public float MaximumTemperature;
 
-    [InspectableField, JsonProperty("durabilityExponent"), Key(11), SimplePerformanceStat]
+    [InspectableField, JsonProperty("durabilityExponent"), Key(12), SimplePerformanceStat]
     public PerformanceStat DurabilityExponent = new PerformanceStat();
     
     [IgnoreMember]
@@ -200,7 +235,7 @@ public abstract class EquippableItemData : CraftedItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class GearData : EquippableItemData
 {
-    [InspectableField, JsonProperty("hardpointType"), Key(12)]
+    [InspectableField, JsonProperty("hardpointType"), Key(13)]
     public HardpointType Hardpoint;
 
     [IgnoreMember] public override HardpointType HardpointType => Hardpoint;
@@ -209,7 +244,7 @@ public class GearData : EquippableItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class CargoBayData : EquippableItemData
 {
-    [InspectableField, JsonProperty("interiorShape"), Key(12)]
+    [InspectableField, JsonProperty("interiorShape"), Key(13)]
     public Shape InteriorShape;
     [IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool;
 }
@@ -217,13 +252,13 @@ public class CargoBayData : EquippableItemData
 [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
 public class HullData : EquippableItemData
 {
-    [InspectableField, JsonProperty("hardpoints"), Key(12)]  
+    [InspectableField, JsonProperty("hardpoints"), Key(13)]  
     public List<HardpointData> Hardpoints = new List<HardpointData>();
 
-    [InspectablePrefab, JsonProperty("prefab"), Key(13)]  
+    [InspectablePrefab, JsonProperty("prefab"), Key(14)]  
     public string Prefab;
 
-    [InspectableField, JsonProperty("hullType"), Key(14)]
+    [InspectableField, JsonProperty("hullType"), Key(15)]
     public HullType HullType;
 
     [IgnoreMember]
@@ -246,12 +281,35 @@ public class HullData : EquippableItemData
 }
 
 [InspectableField, MessagePackObject, JsonObject(MemberSerialization.OptIn)]
-public class HardpointData
+public class HardpointData : ITintInspector
 {
     [InspectableField, JsonProperty("type"), Key(0)] public HardpointType Type;
     [InspectableField, JsonProperty("position"), Key(1)] public int2 Position;
-    [InspectableField, JsonProperty("shape"), Key(2)] public Shape Shape;
+    [InspectableField, JsonProperty("shape"), Key(2)] public Shape Shape = new Shape();
     [InspectableField, JsonProperty("transform"), Key(3)] public string Transform;
+    [InspectableField, JsonProperty("rotation"), Key(4)] public ItemRotation Rotation;
+
+    public override string ToString()
+    {
+        return $"{Enum.GetName(typeof(HardpointType), Type)} Hardpoint {Rotation.Arrow()}";
+    }
+
+    [IgnoreMember]
+    public float3 TintColor
+    {
+        get
+        {
+            if (_tintColors == null)
+            {
+                var hardpointTypes = ((HardpointType[]) Enum.GetValues(typeof(HardpointType)));
+                _tintColors = hardpointTypes.ToDictionary(x => x,
+                    x => ColorMath.HsvToRgb(float3((float)(int)x/hardpointTypes.Length, 1, 1)));
+            }
+
+            return _tintColors[Type];
+        }
+    }
+    private static Dictionary<HardpointType, float3> _tintColors;
 }
 
 [MessagePackObject, JsonObject(MemberSerialization.OptIn)]
@@ -319,4 +377,9 @@ public class PersonalityAttribute : DatabaseEntry, INamedEntry
         get => Name;
         set => Name = value;
     }
+}
+
+public interface ITintInspector
+{
+    float3 TintColor { get; }
 }

Assets/Scripts/ServerShared/ItemInstance.cs

@@ -19,7 +19,7 @@ using static Unity.Mathematics.math;
 public abstract class ItemInstance
 {
     [JsonProperty("data"), Key(0)] public Guid Data;
-    [JsonProperty("rotation"), Key(1)] public int Rotation;
+    [JsonProperty("rotation"), Key(1)] public ItemRotation Rotation;
 }
 
 [Union(0, typeof(CompoundCommodity)), 

Assets/Scripts/ServerShared/JsonConverters.cs

@@ -32,6 +32,17 @@ public class MathJsonConverter : JsonConverter
             writer.WriteEndArray();
         };
 
+        writers[typeof(int2)] = (writer, o) =>
+        {
+            if (!(o is int2 v))
+                throw new JsonReaderException();
+
+            writer.WriteStartArray();
+            writer.WriteValue(v.x);
+            writer.WriteValue(v.y);
+            writer.WriteEndArray();
+        };
+
         writers[typeof(float3)] = (writer, o) =>
         {
             if (!(o is float3 v))
@@ -76,6 +87,19 @@ public class MathJsonConverter : JsonConverter
                 array[0].ToObject<float>(),
                 array[1].ToObject<float>());
         };
+        
+        readers[typeof(int2)] = array =>
+        {
+            if (array.Count < 2)
+            {
+                throw new JsonReaderException(
+                    $"Could not read {typeof(float2)} from json, expected a json array with 2 elements");
+            }
+
+            return int2(
+                array[0].ToObject<int>(),
+                array[1].ToObject<int>());
+        };
 
         readers[typeof(float3)] = array =>
         {

Assets/Scripts/UI/MapViewDragHandler.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using static Unity.Mathematics.math;
 
-public class DragHandler : MonoBehaviour
+public class MapViewDragHandler : MonoBehaviour
 {
     public Camera Camera;
     public float Scaling;