Cleanup.

2d-inc · Jan 29, 2017 · 0698dfc · 0698dfc
1 parent b9ed4ea
commit 0698dfc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 583 deletions.
diff --git a/Unity/ActorComponent.cs b/Unity/ActorComponent.cs
@@ -113,7 +113,7 @@ void OnDestroy()
 
 		public void InitializeFromAsset(ActorAsset actorAsset)
 		{
-			HideFlags hideFlags = HideFlags.DontSaveInEditor | HideFlags.DontSaveInBuild | HideFlags.DontUnloadUnusedAsset;
+			HideFlags hideFlags = HideFlags.DontSaveInEditor | HideFlags.DontSaveInBuild | HideFlags.DontUnloadUnusedAsset | HideFlags.HideInHierarchy | HideFlags.HideInInspector;
 
 			m_ActorAsset = actorAsset;
 
@@ -134,7 +134,7 @@ public void InitializeFromAsset(ActorAsset actorAsset)
 				m_Nodes = new ActorNodeComponent[allNodes.Length];
 				m_DefaultBone = new GameObject("Default Bone");
 				m_DefaultBone.transform.parent = gameObject.transform;
-				m_DefaultBone.hideFlags = hideFlags; //HideFlags.HideInHierarchy | HideFlags.HideInInspector;
+				m_DefaultBone.hideFlags = hideFlags;
 
 				int imgNodeIdx = 0;
 				for(int i = 0; i < allNodes.Length; i++)
@@ -241,101 +241,6 @@ public void InitializeFromAsset(ActorAsset actorAsset)
 					m_Nodes[i].Initialize(this, allNodes[i]);
 				}
 			}
-
-			/*m_ImageNodes = new ActorImageComponent[m_ActorInstance.ImageNodeCount];
-
-			int imgNodeIdx = 0;
-
-			foreach(ActorImage ai in m_ActorInstance.ImageNodes)
-			{
-				if(ai.VertexCount == 0)
-				{
-					imgNodeIdx++;
-					continue;
-				}
-				Mesh mesh = m_ActorAsset.GetMesh(imgNodeIdx);
-				bool hasBones = ai.ConnectedBoneCount > 0;
-
-				GameObject go = hasBones ? 
-									new GameObject(ai.Name, typeof(SkinnedMeshRenderer), typeof(ActorImageComponent)) : 
-									new GameObject(ai.Name, typeof(MeshFilter), typeof(MeshRenderer), typeof(ActorImageComponent));
-				//go.hideFlags = hideFlags;//hideFlags;
-				go.hideFlags = hideFlags;// | HideFlags.HideInHierarchy | HideFlags.HideInInspector;//hideFlags;
-
-				go.transform.parent = gameObject.transform;//m_Root.transform;
-
-				ActorImageComponent actorImage = go.GetComponent<ActorImageComponent>();
-				m_ImageNodes[imgNodeIdx] = actorImage;
-
-				if(ai.DoesAnimationVertexDeform)
- 				{
- 					// Clone the vertex array if we deform.
- 					Mesh clonedMesh = new Mesh();
- 					clonedMesh.vertices = (Vector3[]) mesh.vertices.Clone();
- 					clonedMesh.uv = mesh.uv;
- 					clonedMesh.boneWeights = mesh.boneWeights;
- 					clonedMesh.bindposes = mesh.bindposes;
- 					clonedMesh.triangles = mesh.triangles;
- 					clonedMesh.RecalculateNormals();
- 					mesh = clonedMesh;
- 				}
-				if(hasBones)
-				{
-					Mesh skinnedMesh = new Mesh();
- 					skinnedMesh.vertices = mesh.vertices;
- 					skinnedMesh.uv = mesh.uv;
- 					skinnedMesh.boneWeights = mesh.boneWeights;
- 					skinnedMesh.triangles = mesh.triangles;
- 					skinnedMesh.bindposes = mesh.bindposes;
- 
- 					go.GetComponent<SkinnedMeshRenderer>().sharedMesh = skinnedMesh;
-				}
-				else
-				{
-					MeshFilter meshFilter = go.GetComponent<MeshFilter>();
-					meshFilter.sharedMesh = mesh;
-				}
-
-				Renderer renderer = go.GetComponent<Renderer>();
-
-				Material material = m_ActorAsset.GetMaterial(ai.TextureIndex);
-				switch(ai.BlendMode)
-				{
-					case BlendModes.Screen:
-					{
-						Material overrideMaterial = new Material(Shader.Find("Nima/Screen"));
-						overrideMaterial.mainTexture = material.mainTexture;
-						material = overrideMaterial;
-						break;
-					}
-					case BlendModes.Additive:
-					{
-						Material overrideMaterial = new Material(Shader.Find("Nima/Additive"));
-						overrideMaterial.mainTexture = material.mainTexture;
-						material = overrideMaterial;
-						break;
-					}
-					case BlendModes.Multiply:
-					{
-						Material overrideMaterial = new Material(Shader.Find("Nima/Multiply"));
-						overrideMaterial.mainTexture = material.mainTexture;
-						material = overrideMaterial;
-						break;
-					}
-					default:
-					{
-						Material overrideMaterial = new Material(Shader.Find("Nima/Normal"));
-						overrideMaterial.mainTexture = material.mainTexture;
-						material = overrideMaterial;
-						break;
-					}
-				}
-				
-				renderer.sharedMaterial = material;
-
-				actorImage.Initialize(this, ai);
-				imgNodeIdx++;
-			}*/
 #if UNITY_EDITOR
 			UpdateEditorBounds();
 #endif
@@ -391,6 +296,11 @@ public ActorAsset Asset
 			{
 				return m_ActorAsset;
 			}
+			set
+			{
+				m_ActorAsset = value;
+				Reload();
+			}
 		}
 
 		public Nima.Actor ActorInstance
@@ -401,36 +311,6 @@ public Nima.Actor ActorInstance
 			}
 		}
 
-		/*public void TestUpdate()
-		{
-			m_TestAnimationTime += 0.01f;//Time.deltaTime*0.1f;
-			if(m_TestAnimationTime > 1.82f)
-			{
-				m_TestAnimationTime = 0.0f;
-			}
-			//m_TestAnimationTime = 19.0f/60.0f;
-			if(m_TestAnimation != null)
-			{
-				m_TestAnimation.Apply(m_TestAnimationTime, m_ActorInstance.AllNodes, 1.0f);
-				foreach(ActorNodeComponent n in m_SkinnedBoneNodes)
-				{
-					if(n == null)
-					{
-						continue;
-					}
-					n.Update();
-				}
-				foreach(ActorImageComponent n in m_ImageNodes)
-				{
-					if(n == null)
-					{
-						continue;
-					}
-					n.Update();
-				}
-			}
-		}*/
-
 		public void LateUpdate()
 		{
 			if(m_ActorInstance != null)

diff --git a/Unity/Editor/ActorAssetInspector.cs b/Unity/Editor/ActorAssetInspector.cs
diff --git a/Unity/Editor/ActorComponentInspector.cs b/Unity/Editor/ActorComponentInspector.cs
@@ -9,37 +9,28 @@ public class ActorComponentInspector : UnityEditor.Editor
 	{
 		void OnEnable () 
 		{
-			// Setup the SerializedProperties.
-			//testProp = serializedObject.FindProperty ("test");
 
 		}
 
 		public override void OnInspectorGUI() 
 		{
 			ActorComponent actor = serializedObject.targetObject as ActorComponent;
+
+			ActorAsset asset = EditorGUILayout.ObjectField(actor.Asset, typeof(ActorAsset), false) as ActorAsset;
+			if(asset != actor.Asset)
+			{
+				actor.Asset = asset;
+			}
 			if(GUILayout.Button("Reload"))
 			{
 				actor.Reload();
-				Debug.Log("REINIT");
 			}
 			int order = EditorGUILayout.IntField("Render Queue Offset:", actor.RenderQueueOffset);
 			if(order != actor.RenderQueueOffset)
 			{
 				actor.RenderQueueOffset = order;
 				actor.Reload();
 			}
-
-			/*if(testProp == null)
-			{
-				Debug.Log("NULL!?");
-			}
-			serializedObject.Update ();
-		
-			// Show the custom GUI controls.
-			EditorGUILayout.IntSlider (testProp, 0, 100, new GUIContent ("Damage"));
-
-			// Apply changes to the serializedProperty - always do this in the end of OnInspectorGUI.
-			serializedObject.ApplyModifiedProperties ();*/
 		}
 	}
 }
diff --git a/Unity/Editor/PlayActorAnimationInspector.cs b/Unity/Editor/PlayActorAnimationInspector.cs