0.9

Added: Launcher Added: Animation Model Selector for Preview
rickomax · Apr 22, 2019 · b49f016 · b49f016
1 parent 99b0d5c
commit b49f016
Show file tree

Hide file tree

Showing 19 changed files with 4,293 additions and 592 deletions.
diff --git a/Classes/Animation.cs b/Classes/Animation.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Drawing.Design;
 
 namespace PSXPrev
 {
@@ -16,6 +17,10 @@ public class Animation
         [DisplayName("Children"), ReadOnly(true)]
         public int ObjectCount { get; set; }
 
+        [DisplayName("Preview Model")]
+        [Editor(typeof(RootEntitySelectorEditor), typeof(UITypeEditor))]
+        public RootEntity RootEntity { get; set; }
+
         [Browsable(false)]
         public AnimationObject RootAnimationObject { get; set; }
     }

diff --git a/Classes/AnimationBatch.cs b/Classes/AnimationBatch.cs
@@ -22,13 +22,13 @@ public void SetupAnimationBatch(Animation animation)
             //_scene.LineBatch.Reset();
         }
 
-        public void SetupAnimationFrame(int frame, EntityBase selectedEntity = null)
+        public void SetupAnimationFrame(int frame)
         {
             _animationProcessIndex = 0;
-            ProcessAnimationObject(_animation.RootAnimationObject, frame, null, selectedEntity);
+            ProcessAnimationObject(_animation.RootAnimationObject, frame, null);
         }
 
-        private void ProcessAnimationObject(AnimationObject animationObject, int frameIndex, Matrix4? parentMatrix, EntityBase selectedEntity = null)
+        private void ProcessAnimationObject(AnimationObject animationObject, int frameIndex, Matrix4? parentMatrix)
         {
             var animationFrames = animationObject.AnimationFrames;
             var totalFrames = animationFrames.Count;
@@ -101,19 +101,19 @@ private void ProcessAnimationObject(AnimationObject animationObject, int frameIn
                 worldMatrix = localMatrix;
             }
 
-            if (selectedEntity != null)
+            if (_animation.RootEntity != null)
             {
-                var childEntitiets = selectedEntity.ChildEntities;
-                if (animationObject.TMDID > 0 && animationObject.TMDID <= childEntitiets.Length)
+                var childEntities = _animation.RootEntity.ChildEntities;
+                if (animationObject.TMDID > 0 && animationObject.TMDID <= childEntities.Length)
                 {
-                    var model = (ModelEntity) childEntitiets[animationObject.TMDID - 1];
+                    var model = (ModelEntity) childEntities[animationObject.TMDID - 1];
                     _scene.MeshBatch.BindModelBatch(model, _animationProcessIndex++, worldMatrix);
                 }
             }
 
             foreach (var childObject in animationObject.Children)
             {
-                ProcessAnimationObject(childObject, frameIndex, worldMatrix, selectedEntity);
+                ProcessAnimationObject(childObject, frameIndex, worldMatrix);
             }
         }
     }

diff --git a/Classes/AnimationObject.cs b/Classes/AnimationObject.cs
@@ -1,5 +1,10 @@
+using PSXPrev.Forms;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
 
 namespace PSXPrev
 {

diff --git a/Classes/MeshBatch.cs b/Classes/MeshBatch.cs
@@ -135,6 +135,10 @@ public void BindTestMesh(Matrix4 matrix, int index, bool isSelected)
                 }
             }
             var mesh = GetMesh(index);
+            if (mesh == null)
+            {
+                return;
+            }
             mesh.WorldMatrix = matrix;
             mesh.Texture = _scene.TextureBinder.GetTexture(0);
             mesh.SetData(numTriangles * 3, positionList, normalList, colorList, uvList);
@@ -185,6 +189,10 @@ private void BindMesh(ModelEntity modelEntity, int index, Matrix4? matrix = null
                 }
             }
             var mesh = GetMesh(index);
+            if (mesh == null)
+            {
+                return;
+            }
             mesh.WorldMatrix = matrix ?? modelEntity.WorldMatrix;
             mesh.Visible = modelEntity.Visible;
             mesh.SetData(numTriangles * 3, positionList, normalList, colorList, uvList);
@@ -218,6 +226,10 @@ public void Reset(int nMeshes)
 
         private Mesh GetMesh(int index)
         {
+            if (index >= _meshes.Length)
+            {
+                return null;
+            }
             if (_meshes[index] == null)
             {
                 _meshes[index] = new Mesh(_ids[index]);

diff --git a/Classes/RootEntitySelectorEditor.cs b/Classes/RootEntitySelectorEditor.cs
@@ -0,0 +1,49 @@
+using PSXPrev.Forms;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace PSXPrev
+{
+    public class RootEntitySelectorEditor : UITypeEditor
+    {
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return UITypeEditorEditStyle.Modal;
+        }
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (Program.Scanning)
+            {
+                MessageBox.Show("Please wait until the scan finishes.");
+                return null;
+            }
+            var svc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+            if (svc != null)
+            {
+                using (var form = new SelectTMDForm())
+                {
+                    if (svc.ShowDialog(form) == DialogResult.OK)
+                    {
+                        return form.SelectedTMD;
+                    }
+                }
+            }
+            else
+            {
+                using (var form = new SelectTMDForm())
+                {
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        return form.SelectedTMD;
+                    }
+                }
+            }
+            return base.EditValue(context, provider, value);
+        }
+    }
+}