Merge pull request #6 from radiatoryang/develop

lots of features, almost to v0.4
radiatoryang · Aug 31, 2018 · 41cb15d · 41cb15d
2 parents 36bf4d3 + fa8aef0
commit 41cb15d
Show file tree

Hide file tree

Showing 9 changed files with 419 additions and 388 deletions.
diff --git a/Assets/Merino/Editor/BackendData/MerinoTreeData.cs b/Assets/Merino/Editor/BackendData/MerinoTreeData.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor.TreeViewExamples;
+
+namespace Merino
+{
+
+	public class MerinoTreeData : ScriptableObject
+	{
+		public int editedID = -1;
+		public double timestamp;
+		[SerializeField] List<MerinoTreeElement> m_TreeElements = new List<MerinoTreeElement> ();
+
+		internal List<MerinoTreeElement> treeElements
+		{
+			get { return m_TreeElements; }
+			set { m_TreeElements = value; }
+		}
+
+	}
+}
diff --git a/...no/Editor/BackendData/MyTreeAsset.cs.meta → ...Editor/BackendData/MerinoTreeData.cs.meta b/...no/Editor/BackendData/MyTreeAsset.cs.meta → ...Editor/BackendData/MerinoTreeData.cs.meta
diff --git a/Assets/Merino/Editor/BackendData/MyTreeAsset.cs b/Assets/Merino/Editor/BackendData/MyTreeAsset.cs
diff --git a/Assets/Merino/Editor/BackendData/MyTreeAssetEditor.cs b/Assets/Merino/Editor/BackendData/MyTreeAssetEditor.cs
diff --git a/Assets/Merino/Editor/BackendData/MyTreeAssetEditor.cs.meta b/Assets/Merino/Editor/BackendData/MyTreeAssetEditor.cs.meta
diff --git a/Assets/Merino/Editor/BackendData/MyTreeElementGenerator.cs b/Assets/Merino/Editor/BackendData/MyTreeElementGenerator.cs
diff --git a/Assets/Merino/Editor/BackendData/MyTreeElementGenerator.cs.meta b/Assets/Merino/Editor/BackendData/MyTreeElementGenerator.cs.meta