diff --git a/Assets/Editor/Select_hash.cs b/Assets/Editor/Select_hash.cs index ea7c361..bc7e225 100644 --- a/Assets/Editor/Select_hash.cs +++ b/Assets/Editor/Select_hash.cs @@ -4,9 +4,6 @@ using UnityEditor; class SelectAllOfTagHash : ScriptableWizard { - string tagName = "ExampleTag"; - - [MenuItem("Hash/Get Hash")] static void SelectAllOfTagHashWizard() { diff --git a/Assets/Editor/Select_single.cs b/Assets/Editor/Select_single.cs index 77af9b6..22fd20b 100644 --- a/Assets/Editor/Select_single.cs +++ b/Assets/Editor/Select_single.cs @@ -3,10 +3,6 @@ using UnityEditor; class SelectAllOfTagSingle : ScriptableWizard { - - string tagName = "ExampleTag"; - - [MenuItem("Example/Get")] static void SelectAllOfTagSingleWizard() { diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/Joint.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/MMDJoint.cs similarity index 92% rename from Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/Joint.cs rename to Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/MMDJoint.cs index 78a8569..81b4fe6 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/Joint.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/MMDJoint.cs @@ -2,9 +2,9 @@ namespace LibMMD.Model { - public class Joint + public class MMDJoint { - public Joint() + public MMDJoint() { AssociatedRigidBodyIndex = new int[2]; } diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/Joint.cs.meta b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/MMDJoint.cs.meta similarity index 100% rename from Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/Joint.cs.meta rename to Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/MMDJoint.cs.meta diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/RawMMDModel.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/RawMMDModel.cs index 3837f42..3c0c78a 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/RawMMDModel.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Model/RawMMDModel.cs @@ -15,7 +15,7 @@ namespace LibMMD.Model public Bone[] Bones { get; set; } public Morph[] Morphs { get; set; } public MMDRigidBody[] Rigidbodies { get; set; } - public Joint[] Joints { get; set; } + public MMDJoint[] Joints { get; set; } public void Normalize() { diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMDReader.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMDReader.cs index 6027059..a35ed41 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMDReader.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMDReader.cs @@ -64,10 +64,10 @@ namespace LibMMD.Reader private static void ReadConstraints(BinaryReader reader, RawMMDModel model) { var constraintNum = reader.ReadUInt32(); - model.Joints = new Model.Joint[constraintNum]; + model.Joints = new Model.MMDJoint[constraintNum]; for (var i = 0; i < constraintNum; ++i) { - var constraint = new Model.Joint(); + var constraint = new Model.MMDJoint(); constraint.Name = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding); constraint.AssociatedRigidBodyIndex[0] = reader.ReadInt32(); constraint.AssociatedRigidBodyIndex[1] = reader.ReadInt32(); diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMXReader.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMXReader.cs index f55b109..fd9d586 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMXReader.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Reader/PMXReader.cs @@ -49,10 +49,10 @@ namespace LibMMD.Reader private static void ReadJoints(BinaryReader reader, RawMMDModel model, PmxConfig pmxConfig) { var constraintNum = reader.ReadInt32(); - model.Joints = new Model.Joint[constraintNum]; + model.Joints = new Model.MMDJoint[constraintNum]; for (var i = 0; i < constraintNum; ++i) { - var joint = new Model.Joint + var joint = new Model.MMDJoint { Name = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding), NameEn = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding) diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Unity3D/MMDModel.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Unity3D/MMDModel.cs index 514f0bb..adfee8f 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Unity3D/MMDModel.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Unity3D/MMDModel.cs @@ -350,7 +350,7 @@ namespace LibMMD.Unity3D int jointCount = model.RawMMDModel.Joints.Length; for (int i = 0; i < jointCount; i++) { - LibMMD.Model.Joint mmdJoint = model.RawMMDModel.Joints[i]; + LibMMD.Model.MMDJoint mmdJoint = model.RawMMDModel.Joints[i]; int jointFromBoneIndex = model.RawMMDModel.Rigidbodies[mmdJoint.AssociatedRigidBodyIndex[0]].AssociatedBoneIndex; int jointToBoneIndex = model.RawMMDModel.Rigidbodies[mmdJoint.AssociatedRigidBodyIndex[1]].AssociatedBoneIndex; if (bonesCount <= jointFromBoneIndex || bonesCount <= jointToBoneIndex) { continue; } diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer.meta b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer.meta new file mode 100644 index 0000000..c813bff --- /dev/null +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5edb55cbe49fa3a469c01786155b6ebc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs new file mode 100644 index 0000000..1836017 --- /dev/null +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; +using LibMMD.Material; +using LibMMD.Model; +using LibMMD.Util; +using UnityEngine; + +namespace LibMMD.Writer +{ + public class PMXWriter + { + + } +} \ No newline at end of file diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs.meta b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs.meta new file mode 100644 index 0000000..f1b1dc8 --- /dev/null +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 640dfd217ee9f8344a2f6988e9ebcc52 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index bc217e5..394c480 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -1,7 +1,5 @@ -using CriWare; -using CriWareFormats; +using CriWareFormats; using Gallop; -using MiniJSON; using NAudio.Wave; using System; using System.Collections; @@ -12,8 +10,6 @@ using System.Linq; using UmaMusumeAudio; using UnityEngine; using UnityEngine.SceneManagement; -using static UnityEngine.Rendering.VirtualTexturing.Debugging; -using Random = UnityEngine.Random; public class UmaViewerBuilder : MonoBehaviour { @@ -1563,7 +1559,7 @@ public class UmaViewerBuilder : MonoBehaviour var firsehead = CurrentUMAContainer.Head; var origin_faceDriven = firsehead.GetComponent()._assetTable["facial_target"] as FaceDrivenKeyTarget; - var faceDriven = new FaceDrivenKeyTarget(); + var faceDriven = ScriptableObject.CreateInstance(); DeepCopy.CopyValues(origin_faceDriven, faceDriven); var earDriven = firsehead.GetComponent()._assetTable["ear_target"] as DrivenKeyTarget; var faceOverride = firsehead.GetComponent()._assetTable["face_override"] as FaceOverrideData;