🚧 Improving the content editor editing

Allowed EditorSession editing of properties.

src/RPGCore.Behaviour/Manifest/FieldInformation.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using System;
 using System.Collections;
 using System.Reflection;
 
@@ -13,17 +14,78 @@ public sealed class FieldInformation
 		public FieldFormat Format;
 		public FieldInformation ValueFormat;
 
+		public abstract class ModelMember
+		{
+			public abstract Type ValueType { get; }
+			public abstract object[] GetCustomAttributes(bool inherit);
+			public abstract object GetValue(object instance);
+		}
+
+		public class ModelField : ModelMember
+		{
+			public FieldInfo Field { get; }
+
+			public override Type ValueType => Field.FieldType;
+
+			public ModelField(FieldInfo field)
+			{
+				Field = field;
+			}
+
+			public override object[] GetCustomAttributes(bool inherit)
+			{
+				return Field.GetCustomAttributes(inherit);
+			}
+
+			public override object GetValue(object instance)
+			{
+				return Field.GetValue(instance);
+			}
+		}
+
+		public class ModelProperty : ModelMember
+		{
+			public PropertyInfo Property { get; }
+
+			public override Type ValueType => Property.PropertyType;
+
+			public ModelProperty(PropertyInfo property)
+			{
+				Property = property;
+			}
+
+			public override object[] GetCustomAttributes(bool inherit)
+			{
+				return Property.GetCustomAttributes(inherit);
+			}
+
+			public override object GetValue(object instance)
+			{
+				return Property.GetValue(instance);
+			}
+		}
+
 		public static FieldInformation ConstructFieldInformation(FieldInfo field, object defaultInstance)
 		{
-			object[] attributes = field.GetCustomAttributes(false);
+			return ConstructFieldInformation(new ModelField(field), defaultInstance);
+		}
+
+		public static FieldInformation ConstructFieldInformation(PropertyInfo property, object defaultInstance)
+		{
+			return ConstructFieldInformation(new ModelProperty(property), defaultInstance);
+		}
+
+		public static FieldInformation ConstructFieldInformation(ModelMember member, object defaultInstance)
+		{
+			object[] attributes = member.GetCustomAttributes(false);
 			string[] attributeIds = new string[attributes.Length];
 			for (int i = 0; i < attributes.Length; i++)
 			{
 				attributeIds[i] = attributes.GetType().Name;
 			}
 
 			FieldInformation fieldInformation;
-			if (typeof(InputSocket).IsAssignableFrom(field.FieldType))
+			if (typeof(InputSocket).IsAssignableFrom(member.ValueType))
 			{
 				fieldInformation = new FieldInformation()
 				{
@@ -39,10 +101,10 @@ public static FieldInformation ConstructFieldInformation(FieldInfo field, object
 
 				if (defaultInstance != null)
 				{
-					defaultValue = field.GetValue(defaultInstance);
+					defaultValue = member.GetValue(defaultInstance);
 				}
 
-				string typeName = field.FieldType.Name;
+				string typeName = member.ValueType.Name;
 
 				try
 				{
@@ -65,20 +127,20 @@ public static FieldInformation ConstructFieldInformation(FieldInfo field, object
 					};
 				}
 
-				if (typeof(IDictionary).IsAssignableFrom(field.FieldType))
+				if (typeof(IDictionary).IsAssignableFrom(member.ValueType))
 				{
 					fieldInformation.Format = FieldFormat.Dictionary;
-					fieldInformation.Type = field.FieldType.GetGenericArguments()[1].Name;
+					fieldInformation.Type = member.ValueType.GetGenericArguments()[1].Name;
 
 					fieldInformation.ValueFormat = new FieldInformation()
 					{
-						Type = field.FieldType.GetGenericArguments()[1].Name,
+						Type = member.ValueType.GetGenericArguments()[1].Name,
 						Format = FieldFormat.Object
 					};
 				}
-				else if (field.FieldType.IsArray)
+				else if (member.ValueType.IsArray)
 				{
-					var elementType = field.FieldType.GetElementType();
+					var elementType = member.ValueType.GetElementType();
 
 					fieldInformation.Format = FieldFormat.List;
 					fieldInformation.Type = elementType.Name;

src/RPGCore.Behaviour/Manifest/TypeInformation.cs

@@ -75,6 +75,30 @@ protected static void ConstructTypeInformation(Type type, TypeInformation typeIn
 
 					fieldInfos.Add(field.Name, FieldInformation.ConstructFieldInformation(field, defaultInstance));
 				}
+				foreach (var field in type.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))
+				{
+					if (field.PropertyType == typeof(OutputSocket))
+					{
+						continue;
+					}
+
+					if (field.GetCustomAttribute<JsonIgnoreAttribute>() != null)
+					{
+						continue;
+					}
+
+					var getter = field.GetGetMethod();
+					var setter = field.GetSetMethod();
+
+					if (getter == null
+						|| getter.IsPrivate
+						|| setter == null)
+					{
+						continue;
+					}
+
+					fieldInfos.Add(field.Name, FieldInformation.ConstructFieldInformation(field, defaultInstance));
+				}
 				typeInformation.Fields = fieldInfos;
 			}
 		}

src/RPGCore.Demo.BoardGame/GamePlayer.cs

@@ -4,7 +4,6 @@
 
 namespace RPGCore.Demo.BoardGame
 {
-
 	public class GamePlayer
 	{
 		public LocalId OwnerId;

src/RPGCore.Demo.BoardGame/GameView.cs

@@ -1,5 +1,4 @@
 using RPGCore.Behaviour;
-using RPGCore.Demo.BoardGame.Models;
 using RPGCore.Packages;
 using RPGCore.Traits;
 using System.Collections.Generic;

src/RPGCore.Demo.BoardGame/Models/BuildingTemplate.cs

@@ -1,20 +1,26 @@
-using RPGCore.Behaviour;
+using Newtonsoft.Json;
+using RPGCore.Behaviour;
 using System.Collections.Generic;
 
 namespace RPGCore.Demo.BoardGame.Models
 {
 	public class BuildingTemplate
 	{
-		public string DisplayName;
+		public string DisplayName { get; set; }
+		public string BodyText { get; set; }
 
-		public string[,] Recipe;
+		public string[,] Recipe { get; set; }
 
-		public SerializedGraph GlobalEffectGraph;
-		public SerializedGraph LocalEffectGraph;
+		public SerializedGraph GlobalEffectGraph { get; set; }
+		public SerializedGraph LocalEffectGraph { get; set; }
 
+		[JsonIgnore]
 		public int Width => Recipe?.GetLength(0) ?? 0;
+
+		[JsonIgnore]
 		public int Height => Recipe?.GetLength(1) ?? 0;
 
+		[JsonIgnore]
 		public bool IsHorizontallySymmetric
 		{
 			get
@@ -42,6 +48,7 @@ public bool IsHorizontallySymmetric
 			}
 		}
 
+		[JsonIgnore]
 		public bool IsVerticallySymmetric
 		{
 			get
@@ -69,6 +76,7 @@ public bool IsVerticallySymmetric
 			}
 		}
 
+		[JsonIgnore]
 		public bool IsRotating
 		{
 			get
@@ -85,6 +93,7 @@ public bool IsRotating
 			}
 		}
 
+		[JsonIgnore]
 		private bool IsTheSameWhenRotated
 		{
 			get
@@ -116,6 +125,7 @@ private bool IsTheSameWhenRotated
 			}
 		}
 
+		[JsonIgnore]
 		private bool IsRotatedSameAsMirror
 		{
 			get

src/RPGCore.Demo.BoardGame/Models/ResourceTemplate.cs

@@ -2,6 +2,7 @@
 {
 	public class ResourceTemplate
 	{
-		public string DisplayName;
+		public string DisplayName { get; set; }
+		public VoxelColour Colour { get; set; }
 	}
 }

src/RPGCore.Demo.BoardGame/Models/VoxelColour.cs

@@ -0,0 +1,9 @@
+namespace RPGCore.Demo.BoardGame.Models
+{
+	public struct VoxelColour
+	{
+		public float Red { get; set; }
+		public float Green { get; set; }
+		public float Blue { get; set; }
+	}
+}

src/RPGCore.Demo.BoardGame/SpecialCardSlot.cs

@@ -2,7 +2,7 @@
 {
 	public class SpecialCardSlot
 	{
-		public string BuildingIdentifier;
+		public string BuildingIdentifier { get; set; }
 
 	}
 }

src/RPGCoreUnity/Assets/RPGCore/Scripts/Editors/Behaviour/RPGCoreEditor.cs

@@ -8,6 +8,8 @@ namespace RPGCore.Unity.Editors
 {
 	public static class RPGCoreEditor
 	{
+		const int FoldoutIndent = -10;
+
 		public static void DrawEditor(EditorSession editor)
 		{
 			if (editor == null)
@@ -30,9 +32,11 @@ public static void DrawField(EditorField field)
 			{
 				var fieldFeature = field.GetOrCreateFeature<FieldFeature>();
 
-				EditorGUI.indentLevel--;
-				fieldFeature.Expanded = EditorGUILayout.Foldout(fieldFeature.Expanded, field.Name, true);
-				EditorGUI.indentLevel++;
+				var fieldRect = GUILayoutUtility.GetRect(0, EditorGUIUtility.singleLineHeight, GUILayout.ExpandWidth(true));
+				GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
+				fieldRect.xMin += FoldoutIndent;
+
+				fieldFeature.Expanded = EditorGUI.Foldout(fieldRect, fieldFeature.Expanded, field.Name, true);
 
 				if (fieldFeature.Expanded)
 				{
@@ -64,6 +68,26 @@ public static void DrawField(EditorField field)
 						field.ApplyModifiedProperties();
 					}
 				}
+				else if (field.Field.Type == "Single")
+				{
+					EditorGUI.BeginChangeCheck();
+					float newValue = EditorGUILayout.FloatField(field.Name, field.GetValue<float>());
+					if (EditorGUI.EndChangeCheck())
+					{
+						field.SetValue(newValue);
+						field.ApplyModifiedProperties();
+					}
+				}
+				else if(field.Field.Type == "Double")
+				{
+					EditorGUI.BeginChangeCheck();
+					double newValue = EditorGUILayout.DoubleField(field.Name, field.GetValue<double>());
+					if (EditorGUI.EndChangeCheck())
+					{
+						field.SetValue(newValue);
+						field.ApplyModifiedProperties();
+					}
+				}
 				else if (field.Field.Type == "String")
 				{
 					EditorGUI.BeginChangeCheck();
@@ -110,12 +134,13 @@ public static void DrawField(EditorField field)
 					}
 
 					var fieldRect = GUILayoutUtility.GetRect(0, EditorGUIUtility.singleLineHeight, GUILayout.ExpandWidth(true));
-					PrefixLable(fieldRect, out var lable, out var content);
-					content.width = 140;
+					GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
+					fieldRect.xMin += 4;
+					var buttonRect = EditorGUI.PrefixLabel(fieldRect, new GUIContent(field.Name));
 
-					EditorGUI.LabelField(lable, field.Name);
+					buttonRect.width = 160;
 
-					if (GUI.Button(content, $"Edit Graph"))
+					if (GUI.Button(buttonRect, $"Edit Graph"))
 					{
 						BehaviourEditor.Open(field.Session, field);
 					}
@@ -138,9 +163,11 @@ public static void DrawField(EditorField field)
 				{
 					var fieldFeature = field.GetOrCreateFeature<FieldFeature>();
 
-					EditorGUI.indentLevel--;
-					fieldFeature.Expanded = EditorGUILayout.Foldout(fieldFeature.Expanded, field.Name, true);
-					EditorGUI.indentLevel++;
+					var fieldRect = GUILayoutUtility.GetRect(0, EditorGUIUtility.singleLineHeight, GUILayout.ExpandWidth(true));
+					fieldRect.xMin += FoldoutIndent;
+					GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
+
+					fieldFeature.Expanded = EditorGUI.Foldout(fieldRect, fieldFeature.Expanded, field.Name, true);
 
 					if (fieldFeature.Expanded)
 					{
@@ -158,18 +185,5 @@ public static void DrawField(EditorField field)
 				EditorGUILayout.LabelField(field.Name, "Unknown Type");
 			}
 		}
-
-		public static void PrefixLable (Rect position, out Rect lable, out Rect content)
-		{
-			content = EditorGUI.PrefixLabel (position, new GUIContent (" "));
-
-			float indent = EditorGUI.indentLevel * 15.0f;
-			position.xMin += indent;
-
-			lable = new Rect (position)
-			{
-				xMax = content.xMin
-			};
-		}
 	}
 }

src/RPGCoreUnity/Assets/RPGCore/Scripts/Editors/Packages/EditorSessionFrame.cs

@@ -76,6 +76,7 @@ public EditorSessionFrame(IResource resource)
 					typeof(PackageNodeEditor),
 					typeof(PackageNodePosition),
 					typeof(ExtraData),
+					typeof(VoxelColour),
 
 					typeof(ResourceTemplate),
 					typeof(BuildingTemplate),
@@ -109,6 +110,7 @@ public override void OnGUI()
 		{
 			if (Resource is ProjectResource projectResource)
 			{
+				EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
 				if (GUILayout.Button("Save", EditorStyles.toolbarButton, GUILayout.Width(100)))
 				{
 					using (var file = projectResource.WriteStream())
@@ -122,6 +124,12 @@ public override void OnGUI()
 						);
 					}
 				}
+
+				if (GUILayout.Button("View Manifest", EditorStyles.toolbarButton, GUILayout.Width(120)))
+				{
+					GenericWindow.Open(new GUIContent("Manifest"), new JsonTextWindowFrame(EditorSession.Manifest.ToString()));
+				}
+				EditorGUILayout.EndHorizontal();
 			}
 
 			RPGCoreEditor.DrawEditor(EditorSession);