diff --git a/Assets/Scripts/Exporters/ModelExporter.cs b/Assets/Scripts/Exporters/ModelExporter.cs index d6ae18d..d4681ad 100644 --- a/Assets/Scripts/Exporters/ModelExporter.cs +++ b/Assets/Scripts/Exporters/ModelExporter.cs @@ -1,6 +1,7 @@ using LibMMD.Material; using LibMMD.Model; using LibMMD.Reader; +using LibMMD.Unity3D; using LibMMD.Writer; using System.Collections.Generic; using System.IO; @@ -32,13 +33,7 @@ public class ModelExporter writer.Close(); fileStream.Close(); - fileStream = new FileStream(path, FileMode.Open); - BinaryReader reader = new BinaryReader(fileStream); - - new PMXReader().Read(reader, config); - - reader.Close(); - fileStream.Close(); + UmaViewerUI.Instance.ShowMessage($"PMX Save at {path}", UIMessageType.Success); } public static RawMMDModel ReadPMXModel(CharaEntry entry, UmaContainer container, string[] textures) @@ -102,6 +97,7 @@ public class ModelExporter { List parts = new List(); int baseShift = 0; + foreach (Renderer renderer in renderers) { Mesh mesh; @@ -115,8 +111,10 @@ public class ModelExporter mesh = ((SkinnedMeshRenderer)renderer).sharedMesh; } - foreach (var material in renderer.sharedMaterials) + var materials = new List(renderer.sharedMaterials); + for (int i = 0; i < mesh.subMeshCount; i++) { + var material = (i < materials.Count ? materials[i] : materials[materials.Count - 1]); var part = new Part(); var mat = new MMDMaterial(); part.Material = mat; @@ -133,29 +131,20 @@ public class ModelExporter var tex = model.TextureList.Find(t => t.TexturePath.Contains($"/{material.mainTexture.name}.png")); mat.Texture = (tex ?? model.TextureList[0]); mat.MetaInfo = ""; - if (mesh.subMeshCount > 0) - { - var index = new List(renderer.sharedMaterials).IndexOf(material); - part.BaseShift = baseShift + (int)mesh.GetIndexStart(index); - part.TriangleIndexNum = (int)mesh.GetIndexCount(index); - } - else - { - part.BaseShift = baseShift; - part.TriangleIndexNum = mesh.triangles.Length; - } + part.BaseShift = baseShift + mesh.GetSubMesh(i).indexStart; + part.TriangleIndexNum = mesh.GetSubMesh(i).indexCount; parts.Add(part); } baseShift += mesh.triangles.Length; } - return parts.ToArray(); } private static Vertex[] ReadVerticesAndTriangles(List renderers, List bones, ref List triangleList) { List verticesList = new List(); - + int vertexOffset = 0; + foreach (Renderer renderer in renderers) { if (renderer is MeshRenderer mr) @@ -191,11 +180,12 @@ public class ModelExporter verticesList.Add(vertex); } - int vertexOffset = verticesList.Count; + foreach (var triangle in mesh.triangles) { triangleList.Add(triangle + vertexOffset); } + vertexOffset += vertices.Length; } else if (renderer is SkinnedMeshRenderer smr) { @@ -207,16 +197,17 @@ public class ModelExporter var uv2 = mesh.uv3; var colors = mesh.colors; var weights = mesh.boneWeights; + var bindpose = mesh.bindposes; var boneCounts = mesh.GetBonesPerVertex(); var skinbone = smr.bones; - + var isBody = smr.name.Equals("M_Body")|| smr.name.Equals("M_Mayu"); for (int i = 0; i < vertices.Length; i++) { Vertex vertex = new Vertex(); - vertex.Coordinate = smr.transform.TransformPoint(vertices[i]); + var rootbone = isBody ? smr.rootBone.parent : smr.rootBone; + vertex.Coordinate = rootbone.TransformPoint(vertices[i]); vertex.Normal = normals[i]; - vertex.UvCoordinate = uv[i]; - + vertex.UvCoordinate = new Vector2(uv[i].x, 1 - uv[i].y); vertex.ExtraUvCoordinate = new Vector4[3] { uv1.Length > 0 ? uv1[i] : Vector2.zero, @@ -276,11 +267,11 @@ public class ModelExporter verticesList.Add(vertex); } - int vertexOffset = verticesList.Count; foreach (var triangle in mesh.triangles) { triangleList.Add(triangle + vertexOffset); } + vertexOffset += vertices.Length; } } return verticesList.ToArray(); diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MMDReaderWriteUtil.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MMDReaderWriteUtil.cs index 84c6fea..511864e 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MMDReaderWriteUtil.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MMDReaderWriteUtil.cs @@ -71,10 +71,10 @@ namespace LibMMD.Util public static void WriteVector4(BinaryWriter writer, Vector4 vector) { - writer.Write(MathUtil.ZeroToNaN(vector.x)); - writer.Write(MathUtil.ZeroToNaN(vector.y)); - writer.Write(MathUtil.ZeroToNaN(vector.z)); - writer.Write(MathUtil.ZeroToNaN(vector.w)); + writer.Write(vector.x); + writer.Write(vector.y); + writer.Write(vector.z); + writer.Write(vector.w); } @@ -89,10 +89,10 @@ namespace LibMMD.Util } public static void WriteQuaternion(BinaryWriter writer, Quaternion quaternion) { - writer.Write(-MathUtil.ZeroToNaN(quaternion.x)); - writer.Write(MathUtil.ZeroToNaN(quaternion.y)); - writer.Write(-MathUtil.ZeroToNaN(quaternion.z)); - writer.Write(MathUtil.ZeroToNaN(quaternion.w)); + writer.Write(-quaternion.x); + writer.Write(quaternion.y); + writer.Write(-quaternion.z); + writer.Write(quaternion.w); } public static Vector3 ReadVector3(BinaryReader reader) @@ -116,9 +116,9 @@ namespace LibMMD.Util public static void WriteAmpVector3(BinaryWriter writer, Vector3 vector, float amp) { - writer.Write(MathUtil.ZeroToNaN(-vector.x / amp)); - writer.Write(MathUtil.ZeroToNaN(vector.y / amp)); - writer.Write(MathUtil.ZeroToNaN(-vector.z / amp)); + writer.Write(-vector.x / amp); + writer.Write(vector.y / amp); + writer.Write(-vector.z / amp); } @@ -133,9 +133,9 @@ namespace LibMMD.Util public static void WriteRawCoordinateVector3(BinaryWriter writer, Vector3 vector) { - writer.Write(MathUtil.ZeroToNaN(vector.x / WorldSizeAmplifier)); // x - writer.Write(MathUtil.ZeroToNaN(vector.y / WorldSizeAmplifier)); // y - writer.Write(MathUtil.ZeroToNaN(vector.z / WorldSizeAmplifier)); // z + writer.Write(vector.x / WorldSizeAmplifier); // x + writer.Write(vector.y / WorldSizeAmplifier); // y + writer.Write(vector.z / WorldSizeAmplifier); // z } @@ -149,8 +149,8 @@ namespace LibMMD.Util public static void WriteVector2(BinaryWriter writer, Vector2 vector) { - writer.Write(MathUtil.ZeroToNaN(vector.x)); - writer.Write(MathUtil.ZeroToNaN(vector.y)); + writer.Write(vector.x); + writer.Write(vector.y); } diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MathUtil.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MathUtil.cs index 2216103..447c998 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MathUtil.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Util/MathUtil.cs @@ -272,11 +272,5 @@ namespace LibMMD.Util { return float.IsNaN(f) ? 0.0f : f; } - - public static float ZeroToNaN(float f) - { - return Math.Abs(f) < float.Epsilon ? float.NaN : f; - } - } } \ No newline at end of file diff --git a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs index f8a82d5..6590207 100644 --- a/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs +++ b/Assets/Scripts/Exporters/UnityPMXRuntimeLoader/LibMMD/Writer/PMXWriter.cs @@ -24,8 +24,8 @@ namespace LibMMD.Writer PmxConfig PmxConfig = new PmxConfig() { - Utf8Encoding = true, - Encoding = Encoding.UTF8, + Utf8Encoding = false, + Encoding = Encoding.Unicode, ExtraUvNumber = 3, //include uv2 and color VertexIndexSize = 2, TextureIndexSize = 1, @@ -72,7 +72,6 @@ namespace LibMMD.Writer } } - private static void WriteRigidBodies(BinaryWriter writer, MMDRigidBody[] rigidBodies, PmxConfig pmxConfig) { writer.Write(rigidBodies.Length); // rigidBodyNum @@ -336,12 +335,10 @@ namespace LibMMD.Writer { throw new MMDFileParseException($"part{i} triangle index count {part.TriangleIndexNum} is not a multiple of 3"); } - part.BaseShift = partBaseShift; partBaseShift += part.TriangleIndexNum; } } - private static void WriteMaterial(BinaryWriter writer, MMDMaterial material, ModelConfig config, Encoding encoding, int textureIndexSize, List textureList) { @@ -378,6 +375,7 @@ namespace LibMMD.Writer bool useGlobalToon = false; int globalToonIndex = 0; + if (material.Toon != null) { if (material.Toon.IsGlobalToon) @@ -385,18 +383,20 @@ namespace LibMMD.Writer useGlobalToon = true; globalToonIndex = MMDTextureUtil.GetGlobalToonIndex(material.Toon.TexturePath, config.GlobalToonPath); } - else - { - int toonIndex = GetTextureIndex(material.Toon, textureList); - MMDReaderWriteUtil.WriteIndex(writer, toonIndex, textureIndexSize); - } } - writer.Write((byte)(useGlobalToon ? 1 : 0)); + + + if (useGlobalToon) { writer.Write((byte)globalToonIndex); } + else + { + int toonIndex = GetTextureIndex(material.Toon, textureList); + MMDReaderWriteUtil.WriteIndex(writer, toonIndex, textureIndexSize); + } MMDReaderWriteUtil.WriteSizedString(writer, material.MetaInfo, encoding); }