This commit is contained in:
左右看
2023-07-09 16:15:01 +08:00
26 changed files with 1036 additions and 321 deletions
+1
View File
@@ -66,3 +66,4 @@ crashlytics-build.properties
/umamusume
Config.json
/gltf
/Assets/Plugins/RootMotion/FinalIK/_Integration
-3
View File
@@ -4,9 +4,6 @@ using UnityEditor;
class SelectAllOfTagHash : ScriptableWizard
{
string tagName = "ExampleTag";
[MenuItem("Hash/Get Hash")]
static void SelectAllOfTagHashWizard()
{
-4
View File
@@ -3,10 +3,6 @@ using UnityEditor;
class SelectAllOfTagSingle : ScriptableWizard
{
string tagName = "ExampleTag";
[MenuItem("Example/Get")]
static void SelectAllOfTagSingleWizard()
{
+6 -6
View File
@@ -22595,18 +22595,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801393420}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 755865959}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -18.999908, y: 0.00010681152}
m_AnchoredPosition: {x: -44.000244, y: -25}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &801393422
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -22695,7 +22695,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8fac55fff4ce5fa40a7b2efefc0e617a, type: 3}
m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -32722,7 +32722,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1882365343}
m_HandleRect: {fileID: 1882365342}
m_Direction: 2
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -1,9 +1,11 @@
namespace LibMMD.Material
using System;
namespace LibMMD.Material
{
public class MMDTexture
{
public string TexturePath { get; set; }
public bool IsGlobalToon;
public MMDTexture(string texturePath)
{
TexturePath = texturePath;
@@ -31,5 +33,6 @@
{
}
}
}
@@ -2,9 +2,9 @@
namespace LibMMD.Model
{
public class Joint
public class MMDJoint
{
public Joint()
public MMDJoint()
{
AssociatedRigidBodyIndex = new int[2];
}
@@ -1,4 +1,7 @@
using System;
using LibMMD.Material;
using System;
using System.Collections.Generic;
using static LibMMD.Reader.PMXReader;
namespace LibMMD.Model
{
@@ -15,7 +18,11 @@ 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 PmxConfig PmxConfig;
public List<MMDTexture> TextureList = new List<MMDTexture>();
public List<PMXEntryItem> Entrys = new List<PMXEntryItem>();
public void Normalize()
{
@@ -80,4 +87,19 @@ namespace LibMMD.Model
}
}
}
public class PMXEntryItem
{
public string EntryItemName;
public string EntryItemNameEn;
public bool IsSpecial;
public List<Element> Elements;
public class Element
{
public bool IsMorph;
public int MorphIndex;
public int BoneIndex;
}
}
}
@@ -1,6 +1,6 @@
namespace LibMMD.Reader
{
public class ModelReadConfig
public class ModelConfig
{
public string GlobalToonPath { get; set; }
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: beb1a7fbb7deca44c9cf8f9f4b0c2b10
guid: 47b7ff9576429e84bbec4d2b3d5c2776
MonoImporter:
externalObjects: {}
serializedVersion: 2
@@ -5,7 +5,7 @@ namespace LibMMD.Reader
{
public abstract class ModelReader
{
public RawMMDModel Read(string path, ModelReadConfig config)
public RawMMDModel Read(string path, ModelConfig config)
{
using (var fileStream = new FileStream(path, FileMode.Open))
{
@@ -18,9 +18,9 @@ namespace LibMMD.Reader
}
}
public abstract RawMMDModel Read(BinaryReader reader, ModelReadConfig config);
public abstract RawMMDModel Read(BinaryReader reader, ModelConfig config);
public static RawMMDModel LoadMmdModel(string path, ModelReadConfig config)
public static RawMMDModel LoadMmdModel(string path, ModelConfig config)
{
var fileExt = new FileInfo(path).Extension.ToLower();
if (".pmd".Equals(fileExt))
@@ -11,7 +11,7 @@ namespace LibMMD.Reader
{
public class PMDReader : ModelReader
{
public override RawMMDModel Read(BinaryReader reader, ModelReadConfig config)
public override RawMMDModel Read(BinaryReader reader, ModelConfig config)
{
var model = new RawMMDModel();
var context = new PmdReadContext();
@@ -30,17 +30,17 @@ namespace LibMMD.Reader
ReadFacdDisplayListNames(reader);
ReadBoneNameList(reader, context);
ReadBoneDisp(reader);
if (MMDReaderUtil.Eof(reader))
if (MMDReaderWriteUtil.Eof(reader))
{
goto PMD_READER_READ_LEGACY_30;
}
ReadInfoEn(reader, model, context);
if (MMDReaderUtil.Eof(reader))
if (MMDReaderWriteUtil.Eof(reader))
{
goto PMD_READER_READ_LEGACY_30;
}
ReadCustomTextures(reader, config, model, toonTextureIds);
if (MMDReaderUtil.Eof(reader))
if (MMDReaderWriteUtil.Eof(reader))
{
goto PMD_READER_READ_LEGACY_50;
}
@@ -53,7 +53,7 @@ namespace LibMMD.Reader
for (var i = 0; i < model.Parts.Length; ++i)
{
var material = model.Parts[i].Material;
material.Toon = MMDTextureUtil.GetGlobalToon(toonTextureIds[i], config.GlobalToonPath);
material.Toon = MMDTextureUtil.GetGlobalToon(toonTextureIds[i]);
}
PMD_READER_READ_LEGACY_50:
PMD_READER_READ_SUCCEED:
@@ -64,21 +64,21 @@ 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();
constraint.Name = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
var constraint = new Model.MMDJoint();
constraint.Name = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
constraint.AssociatedRigidBodyIndex[0] = reader.ReadInt32();
constraint.AssociatedRigidBodyIndex[1] = reader.ReadInt32();
constraint.Position = MMDReaderUtil.ReadVector3(reader);
constraint.Rotation = MMDReaderUtil.ReadAmpVector3(reader, Mathf.Rad2Deg);
constraint.PositionLowLimit = MMDReaderUtil.ReadVector3(reader);
constraint.PositionHiLimit = MMDReaderUtil.ReadVector3(reader);
constraint.RotationLowLimit = MMDReaderUtil.ReadVector3(reader);
constraint.RotationHiLimit = MMDReaderUtil.ReadVector3(reader);
constraint.SpringTranslate = MMDReaderUtil.ReadVector3(reader);
constraint.SpringRotate = MMDReaderUtil.ReadVector3(reader);
constraint.Position = MMDReaderWriteUtil.ReadVector3(reader);
constraint.Rotation = MMDReaderWriteUtil.ReadAmpVector3(reader, Mathf.Rad2Deg);
constraint.PositionLowLimit = MMDReaderWriteUtil.ReadVector3(reader);
constraint.PositionHiLimit = MMDReaderWriteUtil.ReadVector3(reader);
constraint.RotationLowLimit = MMDReaderWriteUtil.ReadVector3(reader);
constraint.RotationHiLimit = MMDReaderWriteUtil.ReadVector3(reader);
constraint.SpringTranslate = MMDReaderWriteUtil.ReadVector3(reader);
constraint.SpringRotate = MMDReaderWriteUtil.ReadVector3(reader);
model.Joints[i] = constraint;
}
}
@@ -91,7 +91,7 @@ namespace LibMMD.Reader
{
var rigidBody = new MMDRigidBody();
rigidBody.Name = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding).Trim();
rigidBody.Name = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding).Trim();
var boneIndex = reader.ReadUInt16();
if (boneIndex < context.BoneNum)
{
@@ -111,10 +111,10 @@ namespace LibMMD.Reader
rigidBody.CollisionGroup = reader.ReadSByte();
rigidBody.CollisionMask = reader.ReadUInt16();
rigidBody.Shape = (MMDRigidBody.RigidBodyShape) reader.ReadByte();
rigidBody.Dimemsions = MMDReaderUtil.ReadVector3(reader);
var rbPosition = MMDReaderUtil.ReadVector3(reader);
rigidBody.Dimemsions = MMDReaderWriteUtil.ReadVector3(reader);
var rbPosition = MMDReaderWriteUtil.ReadVector3(reader);
rigidBody.Position = model.Bones[rigidBody.AssociatedBoneIndex].Position + rbPosition;
rigidBody.Rotation = MMDReaderUtil.ReadVector3(reader);
rigidBody.Rotation = MMDReaderWriteUtil.ReadVector3(reader);
rigidBody.Mass = reader.ReadSingle();
rigidBody.TranslateDamp = reader.ReadSingle();
rigidBody.RotateDamp = reader.ReadSingle();
@@ -134,14 +134,14 @@ namespace LibMMD.Reader
}
}
private static void ReadCustomTextures(BinaryReader reader, ModelReadConfig config, RawMMDModel model,
private static void ReadCustomTextures(BinaryReader reader, ModelConfig config, RawMMDModel model,
List<int> toonTextureIds)
{
var customTextures = new MMDTexture[10];
for (var i = 0; i < 10; ++i)
{
customTextures[i] =
new MMDTexture(MMDReaderUtil.ReadStringFixedLength(reader, 100, Tools.JapaneseEncoding));
new MMDTexture(MMDReaderWriteUtil.ReadStringFixedLength(reader, 100, Tools.JapaneseEncoding));
}
for (var i = 0; i < model.Parts.Length; ++i)
@@ -153,7 +153,7 @@ namespace LibMMD.Reader
}
else
{
material.Toon = MMDTextureUtil.GetGlobalToon(0, config.GlobalToonPath);
material.Toon = MMDTextureUtil.GetGlobalToon(0);
}
}
}
@@ -162,13 +162,13 @@ namespace LibMMD.Reader
{
var hasInfoEn = reader.ReadSByte() == 1;
if (!hasInfoEn) return;
model.NameEn = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
model.DescriptionEn = MMDReaderUtil.ReadStringFixedLength(reader, 256, Tools.JapaneseEncoding);
model.NameEn = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
model.DescriptionEn = MMDReaderWriteUtil.ReadStringFixedLength(reader, 256, Tools.JapaneseEncoding);
for (var i = 0; i < context.BoneNum; ++i)
{
var bone = model.Bones[i];
bone.NameEn = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
bone.NameEn = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
}
if (model.Morphs.Length > 0)
@@ -178,13 +178,13 @@ namespace LibMMD.Reader
for (var i = 1; i < model.Morphs.Length; ++i)
{
var morph = model.Morphs[i];
morph.NameEn = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
morph.NameEn = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
}
// UNDONE
for (var i = 0; i < context.BoneNameListNum; ++i)
{
MMDReaderUtil.ReadStringFixedLength(reader, 50, Tools.JapaneseEncoding);
MMDReaderWriteUtil.ReadStringFixedLength(reader, 50, Tools.JapaneseEncoding);
}
}
@@ -204,7 +204,7 @@ namespace LibMMD.Reader
context.BoneNameListNum = boneNameListNum;
for (var i = 0; i < boneNameListNum; ++i)
{
MMDReaderUtil.ReadStringFixedLength(reader, 50, Tools.JapaneseEncoding);
MMDReaderWriteUtil.ReadStringFixedLength(reader, 50, Tools.JapaneseEncoding);
}
}
@@ -238,7 +238,7 @@ namespace LibMMD.Reader
{
var vertexMorphData = new Morph.VertexMorphData();
vertexMorphData.VertexIndex = reader.ReadInt32();
vertexMorphData.Offset = MMDReaderUtil.ReadVector3(reader);
vertexMorphData.Offset = MMDReaderWriteUtil.ReadVector3(reader);
morph.MorphDatas[j] = vertexMorphData;
}
model.Morphs[i] = morph;
@@ -269,7 +269,7 @@ namespace LibMMD.Reader
{
return new PmdFacePreamble
{
Name = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding),
Name = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding),
VertexNum = reader.ReadInt32(),
FaceType = reader.ReadSByte()
};
@@ -507,14 +507,14 @@ namespace LibMMD.Reader
for (var i = 0; i < partNum; ++i)
{
var material = new MMDMaterial();
material.DiffuseColor = MMDReaderUtil.ReadColor(reader, true);
material.DiffuseColor = MMDReaderWriteUtil.ReadColor(reader, true);
material.Shiness = reader.ReadSingle();
material.SpecularColor = MMDReaderUtil.ReadColor(reader, false);
material.AmbientColor = MMDReaderUtil.ReadColor(reader, false);
material.SpecularColor = MMDReaderWriteUtil.ReadColor(reader, false);
material.AmbientColor = MMDReaderWriteUtil.ReadColor(reader, false);
var toonId = reader.ReadByte();
var edgeFlag = reader.ReadSByte();
var vertexNum = reader.ReadInt32();
var textureName = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
var textureName = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
material.DrawDoubleFace = material.DiffuseColor.a < 0.9999f;
material.DrawGroundShadow = edgeFlag != 0;
material.CastSelfShadow = true;
@@ -608,9 +608,9 @@ namespace LibMMD.Reader
{
var vertex = new Vertex
{
Coordinate = MMDReaderUtil.ReadVector3(reader),
Normal = MMDReaderUtil.ReadVector3(reader),
UvCoordinate = MMDReaderUtil.ReadVector2(reader)
Coordinate = MMDReaderWriteUtil.ReadVector3(reader),
Normal = MMDReaderWriteUtil.ReadVector3(reader),
UvCoordinate = MMDReaderWriteUtil.ReadVector2(reader)
};
var skinningOperator = new SkinningOperator();
var bdef2 = new SkinningOperator.Bdef2();
@@ -630,14 +630,14 @@ namespace LibMMD.Reader
private static void ReadDescription(BinaryReader reader, RawMMDModel model)
{
model.Name = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
model.Description = MMDReaderUtil.ReadStringFixedLength(reader, 256, Tools.JapaneseEncoding);
model.Name = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding);
model.Description = MMDReaderWriteUtil.ReadStringFixedLength(reader, 256, Tools.JapaneseEncoding);
}
private static PmdMeta ReadMeta(BinaryReader reader)
{
PmdMeta ret;
ret.Magic = MMDReaderUtil.ReadStringFixedLength(reader, 3, Encoding.ASCII);
ret.Magic = MMDReaderWriteUtil.ReadStringFixedLength(reader, 3, Encoding.ASCII);
ret.Version = reader.ReadSingle();
return ret;
}
@@ -652,12 +652,12 @@ namespace LibMMD.Reader
{
return new PmdBone
{
Name = MMDReaderUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding),
Name = MMDReaderWriteUtil.ReadStringFixedLength(reader, 20, Tools.JapaneseEncoding),
ParentId = reader.ReadUInt16(),
ChildId = reader.ReadUInt16(),
Type = reader.ReadSByte(),
IkNumber = reader.ReadUInt16(),
Position = MMDReaderUtil.ReadVector3(reader)
Position = MMDReaderWriteUtil.ReadVector3(reader)
};
}
@@ -13,7 +13,7 @@ namespace LibMMD.Reader
const float JointSplingAmp = 0.08f;
const float JointDampAmp = 0.08f;
public override RawMMDModel Read(BinaryReader reader, ModelReadConfig config)
public override RawMMDModel Read(BinaryReader reader, ModelConfig config)
{
PmxMeta pmxHeader;
try
@@ -31,11 +31,12 @@ namespace LibMMD.Reader
}
var model = new RawMMDModel();
var pmxConfig = ReadPmxConfig(reader, model);
var pmxConfig = model.PmxConfig = ReadPmxConfig(reader, model);
ReadModelNameAndDescription(reader, model, pmxConfig);
ReadVertices(reader, model, pmxConfig);
ReadTriangles(reader, model, pmxConfig);
var textureList = ReadTextureList(reader, pmxConfig);
model.TextureList.AddRange(textureList);
ReadParts(reader, config, model, pmxConfig, textureList);
ReadBones(reader, model, pmxConfig);
ReadMorphs(reader, model, pmxConfig);
@@ -49,29 +50,29 @@ 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)
Name = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding),
NameEn = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding)
};
var dofType = reader.ReadByte();
if (dofType == 0)
{
joint.AssociatedRigidBodyIndex[0] =
MMDReaderUtil.ReadIndex(reader, pmxConfig.RigidBodyIndexSize);
MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.RigidBodyIndexSize);
joint.AssociatedRigidBodyIndex[1] =
MMDReaderUtil.ReadIndex(reader, pmxConfig.RigidBodyIndexSize);
joint.Position = MMDReaderUtil.ReadVector3(reader);
joint.Rotation = MMDReaderUtil.ReadAmpVector3(reader, Mathf.Rad2Deg);
joint.PositionLowLimit = MMDReaderUtil.ReadVector3(reader);
joint.PositionHiLimit = MMDReaderUtil.ReadVector3(reader);
joint.RotationLowLimit = MMDReaderUtil.ReadVector3(reader);
joint.RotationHiLimit = MMDReaderUtil.ReadVector3(reader);
joint.SpringTranslate = MMDReaderUtil.ReadVector3(reader);
joint.SpringRotate = MMDReaderUtil.ReadVector3(reader);
MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.RigidBodyIndexSize);
joint.Position = MMDReaderWriteUtil.ReadVector3(reader);
joint.Rotation = MMDReaderWriteUtil.ReadAmpVector3(reader, Mathf.Rad2Deg);
joint.PositionLowLimit = MMDReaderWriteUtil.ReadVector3(reader);
joint.PositionHiLimit = MMDReaderWriteUtil.ReadVector3(reader);
joint.RotationLowLimit = MMDReaderWriteUtil.ReadVector3(reader);
joint.RotationHiLimit = MMDReaderWriteUtil.ReadVector3(reader);
joint.SpringTranslate = MMDReaderWriteUtil.ReadVector3(reader);
joint.SpringRotate = MMDReaderWriteUtil.ReadVector3(reader);
}
else
{
@@ -107,15 +108,15 @@ namespace LibMMD.Reader
{
var rigidBody = new MMDRigidBody
{
Name = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding),
NameEn = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding),
AssociatedBoneIndex = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize),
Name = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding),
NameEn = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding),
AssociatedBoneIndex = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize),
CollisionGroup = reader.ReadByte(),
CollisionMask = reader.ReadUInt16(),
Shape = (MMDRigidBody.RigidBodyShape) reader.ReadByte(),
Dimemsions = MMDReaderUtil.ReadRawCoordinateVector3(reader),
Position = MMDReaderUtil.ReadVector3(reader),
Rotation = MMDReaderUtil.ReadAmpVector3(reader, Mathf.Rad2Deg),
Dimemsions = MMDReaderWriteUtil.ReadRawCoordinateVector3(reader),
Position = MMDReaderWriteUtil.ReadVector3(reader),
Rotation = MMDReaderWriteUtil.ReadAmpVector3(reader, Mathf.Rad2Deg),
Mass = reader.ReadSingle(),
TranslateDamp = reader.ReadSingle(),
RotateDamp = reader.ReadSingle(),
@@ -133,8 +134,8 @@ namespace LibMMD.Reader
var entryItemNum = reader.ReadInt32();
for (var i = 0; i < entryItemNum; ++i)
{
MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding); //entryItemName
MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding); //entryItemNameEn
MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding); //entryItemName
MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding); //entryItemNameEn
reader.ReadByte(); //isSpecial
var elementNum = reader.ReadInt32();
for (var j = 0; j < elementNum; ++j)
@@ -142,11 +143,11 @@ namespace LibMMD.Reader
var isMorph = reader.ReadByte() == 1;
if (isMorph)
{
MMDReaderUtil.ReadIndex(reader, pmxConfig.MorphIndexSize); //morphIndex
MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.MorphIndexSize); //morphIndex
}
else
{
MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize); //boneIndex
MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize); //boneIndex
}
}
}
@@ -161,8 +162,8 @@ namespace LibMMD.Reader
{
var morph = new Morph
{
Name = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding),
NameEn = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding),
Name = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding),
NameEn = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding),
Category = (Morph.MorphCategory) reader.ReadByte()
};
if (morph.Category == Morph.MorphCategory.MorphCatSystem)
@@ -180,7 +181,7 @@ namespace LibMMD.Reader
var morphData =
new Morph.GroupMorphData
{
MorphIndex = MMDReaderUtil.ReadIndex(reader, pmxConfig.MorphIndexSize),
MorphIndex = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.MorphIndexSize),
MorphRate = reader.ReadSingle()
};
morph.MorphDatas[j] = morphData;
@@ -192,8 +193,8 @@ namespace LibMMD.Reader
var morphData =
new Morph.VertexMorphData
{
VertexIndex = MMDReaderUtil.ReadIndex(reader, pmxConfig.VertexIndexSize),
Offset = MMDReaderUtil.ReadVector3(reader)
VertexIndex = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.VertexIndexSize),
Offset = MMDReaderWriteUtil.ReadVector3(reader)
};
morph.MorphDatas[j] = morphData;
}
@@ -204,9 +205,9 @@ namespace LibMMD.Reader
var morphData =
new Morph.BoneMorphData
{
BoneIndex = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize),
Translation = MMDReaderUtil.ReadVector3(reader),
Rotation = MMDReaderUtil.ReadQuaternion(reader)
BoneIndex = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize),
Translation = MMDReaderWriteUtil.ReadVector3(reader),
Rotation = MMDReaderWriteUtil.ReadQuaternion(reader)
};
morph.MorphDatas[j] = morphData;
}
@@ -222,8 +223,8 @@ namespace LibMMD.Reader
var morphData =
new Morph.UvMorphData
{
VertexIndex = MMDReaderUtil.ReadIndex(reader, pmxConfig.VertexIndexSize),
Offset = MMDReaderUtil.ReadVector4(reader)
VertexIndex = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.VertexIndexSize),
Offset = MMDReaderWriteUtil.ReadVector4(reader)
};
morph.MorphDatas[j] = morphData;
}
@@ -233,7 +234,7 @@ namespace LibMMD.Reader
for (var j = 0; j < morphDataNum; j++)
{
var morphData = new Morph.MaterialMorphData();
var mmIndex = MMDReaderUtil.ReadIndex(reader, pmxConfig.MaterialIndexSize);
var mmIndex = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.MaterialIndexSize);
if (mmIndex < model.Parts.Length && mmIndex > 0) //TODO mmdlib的代码里是和bone数比较。确认这个逻辑
{
morphData.MaterialIndex = mmIndex;
@@ -245,15 +246,15 @@ namespace LibMMD.Reader
morphData.Global = true;
}
morphData.Method = (Morph.MaterialMorphData.MaterialMorphMethod) reader.ReadByte();
morphData.Diffuse = MMDReaderUtil.ReadColor(reader, true);
morphData.Specular = MMDReaderUtil.ReadColor(reader, false);
morphData.Diffuse = MMDReaderWriteUtil.ReadColor(reader, true);
morphData.Specular = MMDReaderWriteUtil.ReadColor(reader, false);
morphData.Shiness = reader.ReadSingle();
morphData.Ambient = MMDReaderUtil.ReadColor(reader, false);
morphData.EdgeColor = MMDReaderUtil.ReadColor(reader, true);
morphData.Ambient = MMDReaderWriteUtil.ReadColor(reader, false);
morphData.EdgeColor = MMDReaderWriteUtil.ReadColor(reader, true);
morphData.EdgeSize = reader.ReadSingle();
morphData.Texture = MMDReaderUtil.ReadVector4(reader);
morphData.SubTexture = MMDReaderUtil.ReadVector4(reader);
morphData.ToonTexture = MMDReaderUtil.ReadVector4(reader);
morphData.Texture = MMDReaderWriteUtil.ReadVector4(reader);
morphData.SubTexture = MMDReaderWriteUtil.ReadVector4(reader);
morphData.ToonTexture = MMDReaderWriteUtil.ReadVector4(reader);
morph.MorphDatas[j] = morphData;
}
break;
@@ -277,11 +278,11 @@ namespace LibMMD.Reader
{
var bone = new Bone
{
Name = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding),
NameEn = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding),
Position = MMDReaderUtil.ReadVector3(reader)
Name = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding),
NameEn = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding),
Position = MMDReaderWriteUtil.ReadVector3(reader)
};
var parentIndex = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
var parentIndex = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
if (parentIndex < boneNum && parentIndex >= 0)
{
bone.ParentIndex = parentIndex;
@@ -306,25 +307,25 @@ namespace LibMMD.Reader
bone.ReceiveTransform = (flag & PmxBoneFlags.PmxBoneReceiveTransform) != 0;
if (bone.ChildBoneVal.ChildUseId)
{
bone.ChildBoneVal.Index = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bone.ChildBoneVal.Index = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
}
else
{
bone.ChildBoneVal.Offset = MMDReaderUtil.ReadVector3(reader);
bone.ChildBoneVal.Offset = MMDReaderWriteUtil.ReadVector3(reader);
}
if (bone.RotAxisFixed)
{
bone.RotAxis = MMDReaderUtil.ReadVector3(reader);
bone.RotAxis = MMDReaderWriteUtil.ReadVector3(reader);
}
if (bone.AppendRotate || bone.AppendTranslate)
{
bone.AppendBoneVal.Index = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bone.AppendBoneVal.Index = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bone.AppendBoneVal.Ratio = reader.ReadSingle();
}
if (bone.UseLocalAxis)
{
var localX = MMDReaderUtil.ReadVector3(reader);
var localZ = MMDReaderUtil.ReadVector3(reader);
var localX = MMDReaderWriteUtil.ReadVector3(reader);
var localZ = MMDReaderWriteUtil.ReadVector3(reader);
var localY = Vector3.Cross(localX, localZ);
localZ = Vector3.Cross(localX, localY);
localX.Normalize();
@@ -350,7 +351,7 @@ namespace LibMMD.Reader
private static void ReadBoneIk(BinaryReader reader, Bone bone, int boneIndexSize)
{
bone.IkInfoVal = new Bone.IkInfo();
bone.IkInfoVal.IkTargetIndex = MMDReaderUtil.ReadIndex(reader, boneIndexSize);
bone.IkInfoVal.IkTargetIndex = MMDReaderWriteUtil.ReadIndex(reader, boneIndexSize);
bone.IkInfoVal.CcdIterateLimit = reader.ReadInt32();
bone.IkInfoVal.CcdAngleLimit = reader.ReadSingle();
var ikLinkNum = reader.ReadInt32();
@@ -358,18 +359,18 @@ namespace LibMMD.Reader
for (var j = 0; j < ikLinkNum; ++j)
{
var link = new Bone.IkLink();
link.LinkIndex = MMDReaderUtil.ReadIndex(reader, boneIndexSize);
link.LinkIndex = MMDReaderWriteUtil.ReadIndex(reader, boneIndexSize);
link.HasLimit = reader.ReadByte() != 0;
if (link.HasLimit)
{
link.LoLimit = MMDReaderUtil.ReadVector3(reader);
link.HiLimit = MMDReaderUtil.ReadVector3(reader);
link.LoLimit = MMDReaderWriteUtil.ReadVector3(reader);
link.HiLimit = MMDReaderWriteUtil.ReadVector3(reader);
}
bone.IkInfoVal.IkLinks[j] = link;
}
}
private static void ReadParts(BinaryReader reader, ModelReadConfig config, RawMMDModel model, PmxConfig pmxConfig, MMDTexture[] textureList)
private static void ReadParts(BinaryReader reader, ModelConfig config, RawMMDModel model, PmxConfig pmxConfig, MMDTexture[] textureList)
{
var partNum = reader.ReadInt32();
var partBaseShift = 0;
@@ -399,7 +400,7 @@ namespace LibMMD.Reader
for (var i = 0; i < textureNum; ++i)
{
var texturePathEncoding = pmxConfig.Utf8Encoding ? Encoding.UTF8 : Encoding.Unicode;
var texturePath = MMDReaderUtil.ReadSizedString(reader, texturePathEncoding);
var texturePath = MMDReaderWriteUtil.ReadSizedString(reader, texturePathEncoding);
textureList[i] = new MMDTexture(texturePath);
}
return textureList;
@@ -415,7 +416,7 @@ namespace LibMMD.Reader
}
for (var i = 0; i < triangleIndexCount; ++i)
{
model.TriangleIndexes[i] = MMDReaderUtil.ReadIndex(reader, pmxConfig.VertexIndexSize);
model.TriangleIndexes[i] = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.VertexIndexSize);
}
}
@@ -432,10 +433,10 @@ namespace LibMMD.Reader
private static void ReadModelNameAndDescription(BinaryReader reader, RawMMDModel model, PmxConfig pmxConfig)
{
model.Name = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding);
model.NameEn = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding);
model.Description = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding);
model.DescriptionEn = MMDReaderUtil.ReadSizedString(reader, pmxConfig.Encoding);
model.Name = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding);
model.NameEn = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding);
model.Description = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding);
model.DescriptionEn = MMDReaderWriteUtil.ReadSizedString(reader, pmxConfig.Encoding);
}
private static Vertex ReadVertex(BinaryReader reader, PmxConfig pmxConfig)
@@ -453,7 +454,7 @@ namespace LibMMD.Reader
var extraUv = new Vector4[pmxConfig.ExtraUvNumber];
for (var ei = 0; ei < pmxConfig.ExtraUvNumber; ++ei)
{
extraUv[ei] = MMDReaderUtil.ReadVector4(reader);
extraUv[ei] = MMDReaderWriteUtil.ReadVector4(reader);
}
vertex.ExtraUvCoordinate = extraUv;
}
@@ -466,13 +467,13 @@ namespace LibMMD.Reader
{
case SkinningOperator.SkinningType.SkinningBdef1:
var bdef1 = new SkinningOperator.Bdef1();
bdef1.BoneId = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bdef1.BoneId = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
op.Param = bdef1;
break;
case SkinningOperator.SkinningType.SkinningBdef2:
var bdef2 = new SkinningOperator.Bdef2();
bdef2.BoneId[0] = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bdef2.BoneId[1] = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bdef2.BoneId[0] = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bdef2.BoneId[1] = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bdef2.BoneWeight = reader.ReadSingle();
op.Param = bdef2;
break;
@@ -480,7 +481,7 @@ namespace LibMMD.Reader
var bdef4 = new SkinningOperator.Bdef4();
for (var j = 0; j < 4; ++j)
{
bdef4.BoneId[j] = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
bdef4.BoneId[j] = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
}
for (var j = 0; j < 4; ++j)
{
@@ -490,12 +491,12 @@ namespace LibMMD.Reader
break;
case SkinningOperator.SkinningType.SkinningSdef:
var sdef = new SkinningOperator.Sdef();
sdef.BoneId[0] = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
sdef.BoneId[1] = MMDReaderUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
sdef.BoneId[0] = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
sdef.BoneId[1] = MMDReaderWriteUtil.ReadIndex(reader, pmxConfig.BoneIndexSize);
sdef.BoneWeight = reader.ReadSingle();
sdef.C = MMDReaderUtil.ReadVector3(reader);
sdef.R0 = MMDReaderUtil.ReadVector3(reader);
sdef.R1 = MMDReaderUtil.ReadVector3(reader);
sdef.C = MMDReaderWriteUtil.ReadVector3(reader);
sdef.R0 = MMDReaderWriteUtil.ReadVector3(reader);
sdef.R1 = MMDReaderWriteUtil.ReadVector3(reader);
op.Param = sdef;
break;
default:
@@ -506,30 +507,30 @@ namespace LibMMD.Reader
return vertex;
}
private static MMDMaterial ReadMaterial(BinaryReader reader, ModelReadConfig config, Encoding encoding,
private static MMDMaterial ReadMaterial(BinaryReader reader, ModelConfig config, Encoding encoding,
int textureIndexSize, MMDTexture[] textureList)
{
var material = new MMDMaterial();
material.Name = MMDReaderUtil.ReadSizedString(reader, encoding);
material.NameEn = MMDReaderUtil.ReadSizedString(reader, encoding);
material.DiffuseColor = MMDReaderUtil.ReadColor(reader, true);
material.SpecularColor = MMDReaderUtil.ReadColor(reader, false);
material.Name = MMDReaderWriteUtil.ReadSizedString(reader, encoding);
material.NameEn = MMDReaderWriteUtil.ReadSizedString(reader, encoding);
material.DiffuseColor = MMDReaderWriteUtil.ReadColor(reader, true);
material.SpecularColor = MMDReaderWriteUtil.ReadColor(reader, false);
material.Shiness = reader.ReadSingle();
material.AmbientColor = MMDReaderUtil.ReadColor(reader, false);
material.AmbientColor = MMDReaderWriteUtil.ReadColor(reader, false);
var drawFlag = reader.ReadByte();
material.DrawDoubleFace = (drawFlag & PmxMaterialDrawFlags.PmxMaterialDrawDoubleFace) != 0;
material.DrawGroundShadow = (drawFlag & PmxMaterialDrawFlags.PmxMaterialDrawGroundShadow) != 0;
material.CastSelfShadow = (drawFlag & PmxMaterialDrawFlags.PmxMaterialCastSelfShadow) != 0;
material.DrawSelfShadow = (drawFlag & PmxMaterialDrawFlags.PmxMaterialDrawSelfShadow) != 0;
material.DrawEdge = (drawFlag & PmxMaterialDrawFlags.PmxMaterialDrawEdge) != 0;
material.EdgeColor = MMDReaderUtil.ReadColor(reader, true);
material.EdgeColor = MMDReaderWriteUtil.ReadColor(reader, true);
material.EdgeSize = reader.ReadSingle();
var textureIndex = MMDReaderUtil.ReadIndex(reader, textureIndexSize);
var textureIndex = MMDReaderWriteUtil.ReadIndex(reader, textureIndexSize);
if (textureIndex < textureList.Length && textureIndex >= 0)
{
material.Texture = textureList[textureIndex];
}
var subTextureIndex = MMDReaderUtil.ReadIndex(reader, textureIndexSize);
var subTextureIndex = MMDReaderWriteUtil.ReadIndex(reader, textureIndexSize);
if (subTextureIndex < textureList.Length && subTextureIndex >= 0)
{
material.SubTexture = textureList[subTextureIndex];
@@ -539,24 +540,24 @@ namespace LibMMD.Reader
if (useGlobalToon)
{
int globalToonIndex = reader.ReadByte();
material.Toon = MMDTextureUtil.GetGlobalToon(globalToonIndex, config.GlobalToonPath);
material.Toon = MMDTextureUtil.GetGlobalToon(globalToonIndex);
}
else
{
var toonIndex = MMDReaderUtil.ReadIndex(reader, textureIndexSize);
var toonIndex = MMDReaderWriteUtil.ReadIndex(reader, textureIndexSize);
if (toonIndex < textureList.Length && toonIndex >= 0)
{
material.Toon = textureList[toonIndex];
}
}
material.MetaInfo = MMDReaderUtil.ReadSizedString(reader, encoding);
material.MetaInfo = MMDReaderWriteUtil.ReadSizedString(reader, encoding);
return material;
}
private static PmxMeta ReadMeta(BinaryReader reader)
{
PmxMeta ret;
ret.Magic = MMDReaderUtil.ReadStringFixedLength(reader, 4, Encoding.ASCII);
ret.Magic = MMDReaderWriteUtil.ReadStringFixedLength(reader, 4, Encoding.ASCII);
ret.Version = reader.ReadSingle();
ret.FileFlagSize = reader.ReadByte();
return ret;
@@ -565,28 +566,28 @@ namespace LibMMD.Reader
private static PmxVertexBasic ReadVertexBasic(BinaryReader reader)
{
PmxVertexBasic ret;
ret.Coordinate = MMDReaderUtil.ReadVector3(reader);
ret.Normal = MMDReaderUtil.ReadVector3(reader);
ret.UvCoordinate = MMDReaderUtil.ReadVector2(reader);
ret.Coordinate = MMDReaderWriteUtil.ReadVector3(reader);
ret.Normal = MMDReaderWriteUtil.ReadVector3(reader);
ret.UvCoordinate = MMDReaderWriteUtil.ReadVector2(reader);
return ret;
}
private struct PmxMeta
public struct PmxMeta
{
public string Magic;
public float Version;
public byte FileFlagSize;
}
private struct PmxVertexBasic
public struct PmxVertexBasic
{
public Vector3 Coordinate;
public Vector3 Normal;
public Vector2 UvCoordinate;
}
private class PmxConfig
public class PmxConfig
{
public bool Utf8Encoding { get; set; }
public Encoding Encoding { get; set; }
@@ -599,7 +600,7 @@ namespace LibMMD.Reader
public int RigidBodyIndexSize { get; set; }
}
private abstract class PmxMaterialDrawFlags
public abstract class PmxMaterialDrawFlags
{
public const byte PmxMaterialDrawDoubleFace = 0x01;
public const byte PmxMaterialDrawGroundShadow = 0x02;
@@ -608,7 +609,7 @@ namespace LibMMD.Reader
public const byte PmxMaterialDrawEdge = 0x10;
}
private abstract class PmxBoneFlags
public abstract class PmxBoneFlags
{
public const ushort PmxBoneChildUseId = 0x0001;
public const ushort PmxBoneRotatable = 0x0002;
@@ -138,7 +138,7 @@ namespace LibMMD.Unity3D
private const string ColliderNameTail = "Collider";
private const float HalfPIDeg = Mathf.PI * Mathf.Rad2Deg / 2;
private const int MaxTextureSize = 1024;
private readonly ModelReadConfig modelReadConfig = new ModelReadConfig { GlobalToonPath = "" };
private readonly ModelConfig modelReadConfig = new ModelConfig { GlobalToonPath = "" };
public static async Task<MMDModel> ImportModel(string filePath, bool autoShowModel = true)
{
@@ -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; }
@@ -508,7 +508,7 @@ namespace LibMMD.Unity3D
switch (op.Type)
{
case SkinningOperator.SkinningType.SkinningBdef1:
var bdef1 = (SkinningOperator.Bdef1)op.Param;
var b def1 = (SkinningOperator.Bdef1)op.Param;
ret.boneIndex0 = bdef1.BoneId;
ret.weight0 = 1.0f;
break;
@@ -6,7 +6,7 @@ using UnityEngine;
namespace LibMMD.Util
{
public static class MMDReaderUtil
public static class MMDReaderWriteUtil
{
const float WorldSizeAmplifier = 0.08f;
@@ -30,12 +30,41 @@ namespace LibMMD.Util
return str;
}
public static void WriteStringFixedLength(BinaryWriter writer, string str, int length, Encoding encoding)
{
if (length < 0)
{
throw new MMDFileParseException("pmx string length is negative");
}
if (str.Length > length)
{
str = str.Substring(0, length);
}
else if (str.Length < length)
{
str = str.PadRight(length, '\0');
}
var bytes = encoding.GetBytes(str);
writer.Write(bytes);
}
public static string ReadSizedString(BinaryReader reader, Encoding encoding)
{
var length = reader.ReadInt32();
return ReadStringFixedLength(reader, length, encoding);
}
public static void WriteSizedString(BinaryWriter writer, string str, Encoding encoding)
{
var length = encoding.GetByteCount(str);
writer.Write(length);
WriteStringFixedLength(writer, str, length, encoding);
}
public static Vector4 ReadVector4(BinaryReader reader)
{
var ret = new Vector4();
@@ -46,6 +75,15 @@ namespace LibMMD.Util
return ret;
}
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));
}
public static Quaternion ReadQuaternion(BinaryReader reader)
{
var ret = new Quaternion();
@@ -55,6 +93,13 @@ namespace LibMMD.Util
ret.w = MathUtil.NanToZero(reader.ReadSingle());
return ret;
}
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));
}
public static Vector3 ReadVector3(BinaryReader reader)
{
@@ -70,6 +115,19 @@ namespace LibMMD.Util
return ret;
}
public static void WriteVector3(BinaryWriter writer, Vector3 vector)
{
WriteAmpVector3(writer, vector, WorldSizeAmplifier);
}
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));
}
public static Vector3 ReadRawCoordinateVector3(BinaryReader reader)
{
var ret = new Vector3();
@@ -79,6 +137,13 @@ namespace LibMMD.Util
return ret;
}
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
}
public static Vector2 ReadVector2(BinaryReader reader)
{
@@ -88,6 +153,13 @@ namespace LibMMD.Util
return ret;
}
public static void WriteVector2(BinaryWriter writer, Vector2 vector)
{
writer.Write(MathUtil.ZeroToNaN(vector.x));
writer.Write(MathUtil.ZeroToNaN(vector.y));
}
public static int ReadIndex(BinaryReader reader, int size)
{
switch (size)
@@ -103,6 +175,25 @@ namespace LibMMD.Util
}
}
public static void WriteIndex(BinaryWriter writer, int index, int size)
{
switch (size)
{
case 1:
writer.Write((sbyte)index);
break;
case 2:
writer.Write((ushort)index);
break;
case 4:
writer.Write(index);
break;
default:
throw new MMDFileParseException("invalid index size: " + size);
}
}
public static Color ReadColor(BinaryReader reader, bool readA)
{
var ret = new Color
@@ -115,6 +206,17 @@ namespace LibMMD.Util
return ret;
}
public static void WriteColor(BinaryWriter writer, Color color, bool writeA)
{
writer.Write(color.r);
writer.Write(color.g);
writer.Write(color.b);
if (writeA)
{
writer.Write(color.a);
}
}
public static bool Eof(BinaryReader binaryReader)
{
var bs = binaryReader.BaseStream;
@@ -1,4 +1,6 @@
using LibMMD.Material;
using System;
using System.IO;
namespace LibMMD.Util
{
@@ -19,7 +21,7 @@ namespace LibMMD.Util
"toon10.bmp"
};
public static MMDTexture GetGlobalToon(int index, string rootPath)
public static MMDTexture GetGlobalToon(int index)
{
if (index >= 0 && index < GlobalToonNames.Length - 1)
{
@@ -27,5 +29,22 @@ namespace LibMMD.Util
}
return null;
}
public static int GetGlobalToonIndex(string texturePath, string globalToonPath)
{
string globalToonName = Path.GetFileName(texturePath);
if (!string.IsNullOrEmpty(globalToonName))
{
for (int i = 1; i < GlobalToonNames.Length; i++)
{
string globalToon = Path.Combine(globalToonPath, GlobalToonNames[i]);
if (string.Equals(globalToonName, Path.GetFileName(globalToon), StringComparison.OrdinalIgnoreCase))
{
return i - 1;
}
}
}
return -1;
}
}
}
@@ -273,5 +273,10 @@ 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;
}
}
}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5edb55cbe49fa3a469c01786155b6ebc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,555 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using LibMMD.Material;
using LibMMD.Model;
using LibMMD.Reader;
using LibMMD.Util;
using UnityEngine;
using static LibMMD.Reader.PMXReader;
namespace LibMMD.Writer
{
public class PMXWriter
{
public void Write(BinaryWriter writer, RawMMDModel model, ModelConfig config)
{
var pmxHeader = new PmxMeta
{
Magic = "PMX ",
Version = 2,
FileFlagSize = 8
};
WriteMeta(writer, pmxHeader);
WritePmxConfig(writer, model.PmxConfig);
WriteModelNameAndDescription(writer, model, model.PmxConfig);
WriteVertices(writer, model, model.PmxConfig);
WriteTriangles(writer, model, model.PmxConfig);
WriteTextureList(writer, model.TextureList, model.PmxConfig);
WriteParts(writer, config, model, model.PmxConfig);
WriteBones(writer, model, model.PmxConfig);
WriteMorphs(writer, model, model.PmxConfig);
WriteEntries(writer, model.Entrys, model.PmxConfig);
WriteRigidBodies(writer, model.Rigidbodies, model.PmxConfig);
WriteJoints(writer, model, model.PmxConfig);
}
private static void WriteJoints(BinaryWriter writer, RawMMDModel model, PmxConfig pmxConfig)
{
writer.Write(model.Joints.Length); // constraintNum
foreach (var joint in model.Joints)
{
MMDReaderWriteUtil.WriteSizedString(writer, joint.Name, pmxConfig.Encoding);
MMDReaderWriteUtil.WriteSizedString(writer, joint.NameEn, pmxConfig.Encoding);
writer.Write((byte)0); // dofType
MMDReaderWriteUtil.WriteIndex(writer, joint.AssociatedRigidBodyIndex[0], pmxConfig.RigidBodyIndexSize);
MMDReaderWriteUtil.WriteIndex(writer, joint.AssociatedRigidBodyIndex[1], pmxConfig.RigidBodyIndexSize);
MMDReaderWriteUtil.WriteVector3(writer, joint.Position);
MMDReaderWriteUtil.WriteAmpVector3(writer, joint.Rotation, Mathf.Rad2Deg);
MMDReaderWriteUtil.WriteVector3(writer, joint.PositionLowLimit);
MMDReaderWriteUtil.WriteVector3(writer, joint.PositionHiLimit);
MMDReaderWriteUtil.WriteVector3(writer, joint.RotationLowLimit);
MMDReaderWriteUtil.WriteVector3(writer, joint.RotationHiLimit);
MMDReaderWriteUtil.WriteVector3(writer, joint.SpringTranslate);
MMDReaderWriteUtil.WriteVector3(writer, joint.SpringRotate);
}
}
private static void WriteRigidBodies(BinaryWriter writer, MMDRigidBody[] rigidBodies, PmxConfig pmxConfig)
{
writer.Write(rigidBodies.Length); // rigidBodyNum
foreach (var rigidBody in rigidBodies)
{
MMDReaderWriteUtil.WriteSizedString(writer, rigidBody.Name, pmxConfig.Encoding); // Name
MMDReaderWriteUtil.WriteSizedString(writer, rigidBody.NameEn, pmxConfig.Encoding); // NameEn
MMDReaderWriteUtil.WriteIndex(writer, rigidBody.AssociatedBoneIndex, pmxConfig.BoneIndexSize); // AssociatedBoneIndex
writer.Write(rigidBody.CollisionGroup); // CollisionGroup
writer.Write(rigidBody.CollisionMask); // CollisionMask
writer.Write((byte)rigidBody.Shape); // Shape
MMDReaderWriteUtil.WriteRawCoordinateVector3(writer, rigidBody.Dimemsions); // Dimemsions
MMDReaderWriteUtil.WriteVector3(writer, rigidBody.Position); // Position
MMDReaderWriteUtil.WriteAmpVector3(writer, rigidBody.Rotation, Mathf.Deg2Rad); // Rotation
writer.Write(rigidBody.Mass); // Mass
writer.Write(rigidBody.TranslateDamp); // TranslateDamp
writer.Write(rigidBody.RotateDamp); // RotateDamp
writer.Write(rigidBody.Restitution); // Restitution
writer.Write(rigidBody.Friction); // Friction
writer.Write((byte)rigidBody.Type); // Type
}
}
private static void WriteEntries(BinaryWriter writer, List<PMXEntryItem> entryItems, PmxConfig pmxConfig)
{
writer.Write(entryItems.Count); // entryItemNum
foreach (var entryItem in entryItems)
{
MMDReaderWriteUtil.WriteSizedString(writer, entryItem.EntryItemName, pmxConfig.Encoding); // entryItemName
MMDReaderWriteUtil.WriteSizedString(writer, entryItem.EntryItemNameEn, pmxConfig.Encoding); // entryItemNameEn
writer.Write((byte)(entryItem.IsSpecial ? 1 : 0)); // isSpecial
writer.Write(entryItem.Elements.Count); // elementNum
foreach (var element in entryItem.Elements)
{
writer.Write((byte)(element.IsMorph ? 1 : 0)); // isMorph
if (element.IsMorph)
{
MMDReaderWriteUtil.WriteIndex(writer, element.MorphIndex, pmxConfig.MorphIndexSize); // morphIndex
}
else
{
MMDReaderWriteUtil.WriteIndex(writer, element.BoneIndex, pmxConfig.BoneIndexSize); // boneIndex
}
}
}
}
private static void WriteMorphs(BinaryWriter writer, RawMMDModel model, PmxConfig pmxConfig)
{
var morphNum = model.Morphs.Length;
writer.Write(morphNum);
int? baseMorphIndex = null;
for (var i = 0; i < morphNum; ++i)
{
var morph = model.Morphs[i];
MMDReaderWriteUtil.WriteSizedString(writer, morph.Name, pmxConfig.Encoding);
MMDReaderWriteUtil.WriteSizedString(writer, morph.NameEn, pmxConfig.Encoding);
writer.Write((byte)morph.Category);
if (morph.Category == Morph.MorphCategory.MorphCatSystem)
{
baseMorphIndex = i;
}
writer.Write((byte)morph.Type);
var morphDataNum = morph.MorphDatas.Length;
writer.Write(morphDataNum);
switch (morph.Type)
{
case Morph.MorphType.MorphTypeGroup:
for (var j = 0; j < morphDataNum; ++j)
{
var morphData = (Morph.GroupMorphData)morph.MorphDatas[j];
MMDReaderWriteUtil.WriteIndex(writer, morphData.MorphIndex, pmxConfig.MorphIndexSize);
writer.Write(morphData.MorphRate);
}
break;
case Morph.MorphType.MorphTypeVertex:
for (var j = 0; j < morphDataNum; ++j)
{
var morphData = (Morph.VertexMorphData)morph.MorphDatas[j];
MMDReaderWriteUtil.WriteIndex(writer, morphData.VertexIndex, pmxConfig.VertexIndexSize);
MMDReaderWriteUtil.WriteVector3(writer, morphData.Offset);
}
break;
case Morph.MorphType.MorphTypeBone:
for (var j = 0; j < morphDataNum; ++j)
{
var morphData = (Morph.BoneMorphData)morph.MorphDatas[j];
MMDReaderWriteUtil.WriteIndex(writer, morphData.BoneIndex, pmxConfig.BoneIndexSize);
MMDReaderWriteUtil.WriteVector3(writer, morphData.Translation);
MMDReaderWriteUtil.WriteQuaternion(writer, morphData.Rotation);
}
break;
case Morph.MorphType.MorphTypeUv:
case Morph.MorphType.MorphTypeExtUv1:
case Morph.MorphType.MorphTypeExtUv2:
case Morph.MorphType.MorphTypeExtUv3:
case Morph.MorphType.MorphTypeExtUv4:
for (var j = 0; j < morphDataNum; ++j)
{
var morphData = (Morph.UvMorphData)morph.MorphDatas[j];
MMDReaderWriteUtil.WriteIndex(writer, morphData.VertexIndex, pmxConfig.VertexIndexSize);
MMDReaderWriteUtil.WriteVector4(writer, morphData.Offset);
}
break;
case Morph.MorphType.MorphTypeMaterial:
for (var j = 0; j < morphDataNum; j++)
{
var morphData = (Morph.MaterialMorphData)morph.MorphDatas[j];
if (morphData.Global)
{
MMDReaderWriteUtil.WriteIndex(writer, 0, pmxConfig.MaterialIndexSize);
}
else
{
MMDReaderWriteUtil.WriteIndex(writer, morphData.MaterialIndex, pmxConfig.MaterialIndexSize);
}
writer.Write((byte)morphData.Method);
MMDReaderWriteUtil.WriteColor(writer, morphData.Diffuse, true);
MMDReaderWriteUtil.WriteColor(writer, morphData.Specular, false);
writer.Write(morphData.Shiness);
MMDReaderWriteUtil.WriteColor(writer, morphData.Ambient, false);
MMDReaderWriteUtil.WriteColor(writer, morphData.EdgeColor, true);
writer.Write(morphData.EdgeSize);
MMDReaderWriteUtil.WriteVector4(writer, morphData.Texture);
MMDReaderWriteUtil.WriteVector4(writer, morphData.SubTexture);
MMDReaderWriteUtil.WriteVector4(writer, morphData.ToonTexture);
}
break;
default:
throw new MMDFileParseException("invalid morph type " + morph.Type);
}
if (baseMorphIndex != null)
{
// TODO: rectify system-reserved category
}
}
}
private static void WriteBones(BinaryWriter writer, RawMMDModel model, PmxConfig pmxConfig)
{
var boneNum = model.Bones.Length;
writer.Write(boneNum);
for (var i = 0; i < boneNum; ++i)
{
var bone = model.Bones[i];
MMDReaderWriteUtil.WriteSizedString(writer, bone.Name, pmxConfig.Encoding);
MMDReaderWriteUtil.WriteSizedString(writer, bone.NameEn, pmxConfig.Encoding);
MMDReaderWriteUtil.WriteVector3(writer, bone.Position);
MMDReaderWriteUtil.WriteIndex(writer, bone.ParentIndex, pmxConfig.BoneIndexSize);
writer.Write(bone.TransformLevel);
ushort flag = 0;
if (bone.ChildBoneVal.ChildUseId)
flag |= PmxBoneFlags.PmxBoneChildUseId;
if (bone.Rotatable)
flag |= PmxBoneFlags.PmxBoneRotatable;
if (bone.Movable)
flag |= PmxBoneFlags.PmxBoneMovable;
if (bone.Visible)
flag |= PmxBoneFlags.PmxBoneVisible;
if (bone.Controllable)
flag |= PmxBoneFlags.PmxBoneControllable;
if (bone.HasIk)
flag |= PmxBoneFlags.PmxBoneHasIk;
if (bone.AppendRotate)
flag |= PmxBoneFlags.PmxBoneAcquireRotate;
if (bone.AppendTranslate)
flag |= PmxBoneFlags.PmxBoneAcquireTranslate;
if (bone.RotAxisFixed)
flag |= PmxBoneFlags.PmxBoneRotAxisFixed;
if (bone.UseLocalAxis)
flag |= PmxBoneFlags.PmxBoneUseLocalAxis;
if (bone.PostPhysics)
flag |= PmxBoneFlags.PmxBonePostPhysics;
if (bone.ReceiveTransform)
flag |= PmxBoneFlags.PmxBoneReceiveTransform;
writer.Write(flag);
if (bone.ChildBoneVal.ChildUseId)
{
MMDReaderWriteUtil.WriteIndex(writer, bone.ChildBoneVal.Index, pmxConfig.BoneIndexSize);
}
else
{
MMDReaderWriteUtil.WriteVector3(writer, bone.ChildBoneVal.Offset);
}
if (bone.RotAxisFixed)
{
MMDReaderWriteUtil.WriteVector3(writer, bone.RotAxis);
}
if (bone.AppendRotate || bone.AppendTranslate)
{
MMDReaderWriteUtil.WriteIndex(writer, bone.AppendBoneVal.Index, pmxConfig.BoneIndexSize);
writer.Write(bone.AppendBoneVal.Ratio);
}
if (bone.UseLocalAxis)
{
MMDReaderWriteUtil.WriteVector3(writer, bone.LocalAxisVal.AxisX);
MMDReaderWriteUtil.WriteVector3(writer, bone.LocalAxisVal.AxisZ);
}
if (bone.ReceiveTransform)
{
writer.Write(bone.ExportKey);
}
if (bone.HasIk)
{
WriteBoneIk(writer, bone, pmxConfig.BoneIndexSize);
}
}
}
private static void WriteBoneIk(BinaryWriter writer, Bone bone, int boneIndexSize)
{
MMDReaderWriteUtil.WriteIndex(writer, bone.IkInfoVal.IkTargetIndex, boneIndexSize);
writer.Write(bone.IkInfoVal.CcdIterateLimit);
writer.Write(bone.IkInfoVal.CcdAngleLimit);
var ikLinkNum = bone.IkInfoVal.IkLinks.Length;
writer.Write(ikLinkNum);
for (var j = 0; j < ikLinkNum; ++j)
{
var link = bone.IkInfoVal.IkLinks[j];
MMDReaderWriteUtil.WriteIndex(writer, link.LinkIndex, boneIndexSize);
writer.Write(link.HasLimit ? (byte)1 : (byte)0);
if (link.HasLimit)
{
MMDReaderWriteUtil.WriteVector3(writer, link.LoLimit);
MMDReaderWriteUtil.WriteVector3(writer, link.HiLimit);
}
}
}
private static void WriteParts(BinaryWriter writer, ModelConfig config, RawMMDModel model, PmxConfig pmxConfig)
{
var partNum = model.Parts.Length;
writer.Write(partNum);
var partBaseShift = 0;
for (var i = 0; i < partNum; i++)
{
var part = model.Parts[i];
WriteMaterial(writer, part.Material, config, pmxConfig.Encoding, pmxConfig.TextureIndexSize, model.TextureList);
writer.Write(part.TriangleIndexNum);
if (part.TriangleIndexNum % 3 != 0)
{
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<MMDTexture> textureList)
{
MMDReaderWriteUtil.WriteSizedString(writer, material.Name, encoding);
MMDReaderWriteUtil.WriteSizedString(writer, material.NameEn, encoding);
MMDReaderWriteUtil.WriteColor(writer, material.DiffuseColor, true);
MMDReaderWriteUtil.WriteColor(writer, material.SpecularColor, false);
writer.Write(material.Shiness);
MMDReaderWriteUtil.WriteColor(writer, material.AmbientColor, false);
byte drawFlag = 0;
if (material.DrawDoubleFace)
drawFlag |= PmxMaterialDrawFlags.PmxMaterialDrawDoubleFace;
if (material.DrawGroundShadow)
drawFlag |= PmxMaterialDrawFlags.PmxMaterialDrawGroundShadow;
if (material.CastSelfShadow)
drawFlag |= PmxMaterialDrawFlags.PmxMaterialCastSelfShadow;
if (material.DrawSelfShadow)
drawFlag |= PmxMaterialDrawFlags.PmxMaterialDrawSelfShadow;
if (material.DrawEdge)
drawFlag |= PmxMaterialDrawFlags.PmxMaterialDrawEdge;
writer.Write(drawFlag);
MMDReaderWriteUtil.WriteColor(writer, material.EdgeColor, true);
writer.Write(material.EdgeSize);
int textureIndex = GetTextureIndex(material.Texture, textureList);
MMDReaderWriteUtil.WriteIndex(writer, textureIndex, textureIndexSize);
int subTextureIndex = GetTextureIndex(material.SubTexture, textureList);
MMDReaderWriteUtil.WriteIndex(writer, subTextureIndex, textureIndexSize);
writer.Write((byte)material.SubTextureType);
bool useGlobalToon = false;
int globalToonIndex = 0;
if (material.Toon != null)
{
if (material.Toon.IsGlobalToon)
{
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);
}
MMDReaderWriteUtil.WriteSizedString(writer, material.MetaInfo, encoding);
}
private static int GetTextureIndex(MMDTexture texture, List<MMDTexture> textureList)
{
if (texture != null)
{
int index = textureList.IndexOf(texture);
if (index >= 0)
{
return index;
}
}
return -1;
}
private static void WriteParts(BinaryWriter writer, RawMMDModel model, ModelConfig config, PmxConfig pmxConfig, MMDTexture[] textureList)
{
var partNum = model.Parts.Length;
writer.Write(partNum);
var partBaseShift = 0;
for (var i = 0; i < partNum; i++)
{
var part = model.Parts[i];
var material = part.Material;
WriteMaterial(writer, material, config, pmxConfig.Encoding, pmxConfig.TextureIndexSize, new List<MMDTexture>(textureList));
var partTriangleIndexNum = part.TriangleIndexNum;
writer.Write(partTriangleIndexNum);
if (partTriangleIndexNum % 3 != 0)
{
throw new MMDFileParseException("part" + i + " triangle index count " + partTriangleIndexNum + " is not a multiple of 3");
}
part.BaseShift = partBaseShift;
partBaseShift += partTriangleIndexNum;
}
}
private static void WriteTextureList(BinaryWriter writer, List<MMDTexture> textureList, PmxConfig pmxConfig)
{
var textureNum = textureList.Count;
writer.Write(textureNum);
for (var i = 0; i < textureNum; ++i)
{
var texturePathEncoding = pmxConfig.Utf8Encoding ? Encoding.UTF8 : Encoding.Unicode;
var texturePath = textureList[i].TexturePath;
MMDReaderWriteUtil.WriteSizedString(writer, texturePath, texturePathEncoding);
}
}
private static void WriteTriangles(BinaryWriter writer, RawMMDModel model, PmxConfig pmxConfig)
{
var triangleIndexCount = model.TriangleIndexes.Length;
writer.Write(triangleIndexCount);
if (triangleIndexCount % 3 != 0)
{
throw new MMDFileParseException("triangle index count " + triangleIndexCount + " is not a multiple of 3");
}
for (var i = 0; i < triangleIndexCount; ++i)
{
MMDReaderWriteUtil.WriteIndex(writer, model.TriangleIndexes[i], pmxConfig.VertexIndexSize);
}
}
private static void WriteModelNameAndDescription(BinaryWriter writer, RawMMDModel model, PmxConfig pmxConfig)
{
MMDReaderWriteUtil.WriteSizedString(writer, model.Name, pmxConfig.Encoding);
MMDReaderWriteUtil.WriteSizedString(writer, model.NameEn, pmxConfig.Encoding);
MMDReaderWriteUtil.WriteSizedString(writer, model.Description, pmxConfig.Encoding);
MMDReaderWriteUtil.WriteSizedString(writer, model.DescriptionEn, pmxConfig.Encoding);
}
private static void WriteVertices(BinaryWriter writer, RawMMDModel model, PmxConfig pmxConfig)
{
var vertexNum = model.Vertices.Length;
writer.Write(vertexNum);
for (uint i = 0; i < vertexNum; ++i)
{
var vertex = model.Vertices[i];
WriteVertex(writer, vertex, pmxConfig);
}
}
private static void WriteVertex(BinaryWriter writer, Vertex vertex, PmxConfig pmxConfig)
{
WriteVertexBasic(writer, vertex.Coordinate, vertex.Normal, vertex.UvCoordinate);
if (pmxConfig.ExtraUvNumber > 0)
{
for (var ei = 0; ei < pmxConfig.ExtraUvNumber; ++ei)
{
MMDReaderWriteUtil.WriteVector4(writer, vertex.ExtraUvCoordinate[ei]);
}
}
var skinningType = (byte)vertex.SkinningOperator.Type;
writer.Write(skinningType);
switch ((SkinningOperator.SkinningType)skinningType)
{
case SkinningOperator.SkinningType.SkinningBdef1:
var bdef1 = (SkinningOperator.Bdef1)vertex.SkinningOperator.Param;
MMDReaderWriteUtil.WriteIndex(writer, bdef1.BoneId, pmxConfig.BoneIndexSize);
break;
case SkinningOperator.SkinningType.SkinningBdef2:
var bdef2 = (SkinningOperator.Bdef2)vertex.SkinningOperator.Param;
MMDReaderWriteUtil.WriteIndex(writer, bdef2.BoneId[0], pmxConfig.BoneIndexSize);
MMDReaderWriteUtil.WriteIndex(writer, bdef2.BoneId[1], pmxConfig.BoneIndexSize);
writer.Write(bdef2.BoneWeight);
break;
case SkinningOperator.SkinningType.SkinningBdef4:
var bdef4 = (SkinningOperator.Bdef4)vertex.SkinningOperator.Param;
for (var j = 0; j < 4; ++j)
{
MMDReaderWriteUtil.WriteIndex(writer, bdef4.BoneId[j], pmxConfig.BoneIndexSize);
}
for (var j = 0; j < 4; ++j)
{
writer.Write(bdef4.BoneWeight[j]);
}
break;
case SkinningOperator.SkinningType.SkinningSdef:
var sdef = (SkinningOperator.Sdef)vertex.SkinningOperator.Param;
MMDReaderWriteUtil.WriteIndex(writer, sdef.BoneId[0], pmxConfig.BoneIndexSize);
MMDReaderWriteUtil.WriteIndex(writer, sdef.BoneId[1], pmxConfig.BoneIndexSize);
writer.Write(sdef.BoneWeight);
MMDReaderWriteUtil.WriteVector3(writer, sdef.C);
MMDReaderWriteUtil.WriteVector3(writer, sdef.R0);
MMDReaderWriteUtil.WriteVector3(writer, sdef.R1);
break;
default:
throw new MMDFileParseException("invalid skinning type: " + skinningType);
}
writer.Write(vertex.EdgeScale);
}
private static void WriteVertexBasic(BinaryWriter writer, Vector3 coordinate, Vector3 normal, Vector2 uvCoordinate)
{
MMDReaderWriteUtil.WriteVector3(writer, coordinate);
MMDReaderWriteUtil.WriteVector3(writer, normal);
MMDReaderWriteUtil.WriteVector2(writer, uvCoordinate);
}
private void WritePmxConfig(object reader, object model)
{
throw new NotImplementedException();
}
private static void WriteMeta(BinaryWriter writer, PmxMeta meta)
{
MMDReaderWriteUtil.WriteStringFixedLength(writer, meta.Magic, 4, Encoding.ASCII);
writer.Write(meta.Version);
writer.Write(meta.FileFlagSize);
}
private static void WritePmxConfig(BinaryWriter writer, PmxConfig pmxConfig)
{
writer.Write(pmxConfig.Utf8Encoding ? (byte)1 : (byte)0);
writer.Write((byte)pmxConfig.ExtraUvNumber);
writer.Write((byte)pmxConfig.VertexIndexSize);
writer.Write((byte)pmxConfig.TextureIndexSize);
writer.Write((byte)pmxConfig.MaterialIndexSize);
writer.Write((byte)pmxConfig.BoneIndexSize);
writer.Write((byte)pmxConfig.MorphIndexSize);
writer.Write((byte)pmxConfig.RigidBodyIndexSize);
}
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 640dfd217ee9f8344a2f6988e9ebcc52
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+2 -2
View File
@@ -44,13 +44,13 @@ public class UmaSceneController:MonoBehaviour
// Wait until the last operation fully loads to return anything
yield return new WaitUntil(()=> asyncLoad.isDone);
OnSceneloaded.Invoke();
OnSceneloaded();
// Unload the previous Scene
AsyncOperation asyncUnLoad = SceneManager.UnloadSceneAsync(currentScene);
yield return new WaitUntil(() => asyncUnLoad.isDone);
OnLastSceneUnloaded.Invoke();
OnLastSceneUnloaded();
animation.Play("SceneTransition_e");
yield return new WaitUntil(() => !animation.isPlaying);
+2 -6
View File
@@ -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
{
@@ -1573,7 +1569,7 @@ public class UmaViewerBuilder : MonoBehaviour
var firsehead = CurrentUMAContainer.Head;
var origin_faceDriven = firsehead.GetComponent<AssetHolder>()._assetTable["facial_target"] as FaceDrivenKeyTarget;
var faceDriven = new FaceDrivenKeyTarget();
var faceDriven = ScriptableObject.CreateInstance<FaceDrivenKeyTarget>();
DeepCopy.CopyValues(origin_faceDriven, faceDriven);
var earDriven = firsehead.GetComponent<AssetHolder>()._assetTable["ear_target"] as DrivenKeyTarget;
var faceOverride = firsehead.GetComponent<AssetHolder>()._assetTable["face_override"] as FaceOverrideData;
+142 -143
View File
@@ -8,6 +8,7 @@ using System.IO;
using System.Linq;
using TMPro;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.UI;
using static UnityEditor.SceneView;
using Debug = UnityEngine.Debug;
@@ -409,69 +410,6 @@ public class UmaViewerUI : MonoBehaviour
}
}
public void InstantiateFacialPart(GameObject UmaContainerSliderPrefab, FaceDrivenKeyTarget target, List<FacialMorph> targetMorph, ScrollRect TargetList)
{
foreach (FacialMorph morph in targetMorph)
{
if (morph is FacialOtherMorph extraMorph)
{
foreach (var prop in extraMorph.BindProperties)
{
var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent<UmaUIContainer>();
Debug.Log(morph.name);
container.Name = $"{morph.locator.name}({prop.Type})";
container.Slider.value = prop.Value;
switch (prop.Type)
{
case BindProperty.BindType.Shader:
case BindProperty.BindType.Texture:
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.Select:
container.Slider.wholeNumbers = true;
container.Slider.maxValue = prop.BindPrefab.Count - 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.EyeSelect:
container.Slider.wholeNumbers = true;
container.Slider.maxValue = prop.BindPrefab.Count / 2 - 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.Enable:
case BindProperty.BindType.TearSelect:
case BindProperty.BindType.TearSide:
container.Slider.wholeNumbers = true;
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.TearWeight:
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.TearSpeed:
container.Slider.maxValue = 2;
container.Slider.minValue = 0;
break;
}
container.Slider.onValueChanged.AddListener((a) =>
{
target.ChangeMorphWeight(prop, a, morph);
});
}
}
else
{
var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent<UmaUIContainer>();
container.Name = $"{morph.name}({morph.tag})";
container.Slider.value = morph.weight;
container.Slider.maxValue = 1;
container.Slider.minValue = morph.tag.Contains("Range") ? -1 : 0;
container.Slider.onValueChanged.AddListener((a) => { target.ChangeMorphWeight(morph, a); });
}
}
}
public void LoadFacialPanels(FaceDrivenKeyTarget target)
{
currentFaceDrivenKeyTarget = target;
@@ -482,14 +420,74 @@ public class UmaViewerUI : MonoBehaviour
}
if (target == null) return;
InstantiateFacialPart(UmaContainerSliderPrefab, target, target.EarMorphs, EarList);
InstantiateFacialPart(UmaContainerSliderPrefab, target, target.EyeBrowMorphs, EyeBrowList);
InstantiateFacialPart(UmaContainerSliderPrefab, target, target.EyeMorphs, EyeList);
InstantiateFacialPart(UmaContainerSliderPrefab, target, target.MouthMorphs, MouthList);
List<FacialMorph> targetMorph = new List<FacialMorph>(target.OtherMorphs);
InstantiateFacialPart(UmaContainerSliderPrefab, target, targetMorph, OtherList);
Action<GameObject, FaceDrivenKeyTarget, List<FacialMorph>, ScrollRect> action = (UmaContainerSliderPrefab, target, targetMorph, TargetList) =>
{
foreach (FacialMorph morph in targetMorph)
{
if (morph is FacialOtherMorph extraMorph)
{
foreach (var prop in extraMorph.BindProperties)
{
var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent<UmaUIContainer>();
Debug.Log(morph.name);
container.Name = $"{morph.locator.name}({prop.Type})";
container.Slider.value = prop.Value;
switch (prop.Type)
{
case BindProperty.BindType.Shader:
case BindProperty.BindType.Texture:
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.Select:
container.Slider.wholeNumbers = true;
container.Slider.maxValue = prop.BindPrefab.Count - 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.EyeSelect:
container.Slider.wholeNumbers = true;
container.Slider.maxValue = prop.BindPrefab.Count / 2 - 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.Enable:
case BindProperty.BindType.TearSelect:
case BindProperty.BindType.TearSide:
container.Slider.wholeNumbers = true;
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.TearWeight:
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
break;
case BindProperty.BindType.TearSpeed:
container.Slider.maxValue = 2;
container.Slider.minValue = 0;
break;
}
container.Slider.onValueChanged.AddListener((a) =>
{
target.ChangeMorphWeight(prop, a, morph);
});
}
}
else
{
var container = Instantiate(UmaContainerSliderPrefab, TargetList.content).GetComponent<UmaUIContainer>();
container.Name = $"{morph.name}({morph.tag})";
container.Slider.value = morph.weight;
container.Slider.maxValue = 1;
container.Slider.minValue = morph.tag.Contains("Range") ? -1 : 0;
container.Slider.onValueChanged.AddListener((a) => { target.ChangeMorphWeight(morph, a); });
}
}
};
action(UmaContainerSliderPrefab, target, target.EarMorphs, EarList);
action(UmaContainerSliderPrefab, target, target.EyeBrowMorphs, EyeBrowList);
action(UmaContainerSliderPrefab, target, target.EyeMorphs, EyeList);
action(UmaContainerSliderPrefab, target, target.MouthMorphs, MouthList);
action(UmaContainerSliderPrefab, target, targetMorph, OtherList);
}
public void LoadFacialPanelsMini(Material Eye, Material MayuL, Material MayuR, Material Mouth)
@@ -568,31 +566,27 @@ public class UmaViewerUI : MonoBehaviour
public void LoadLivePanels()
{
foreach (var live in Main.Lives.OrderBy(c => c.MusicId))
Action<LiveEntry, GameObject, ScrollRect, UnityAction> createContainer = (live, containerPrefab, parent, onClickAction) =>
{
var liveInstance = live;
var container = Instantiate(UmaContainerLivePrefab, LiveList.content).GetComponent<UmaUIContainer>();
var container = Instantiate(containerPrefab, parent.content).GetComponent<UmaUIContainer>();
container.Name = " " + live.MusicId + " " + live.SongName;
container.Image.sprite = live.Icon;
container.Image.enabled = container.Image.sprite;
container.Button.onClick.AddListener(() =>
{
HighlightChildImage(LiveList.content, container);
ShowLiveSelectPannel(live);
HighlightChildImage(parent.content, container);
onClickAction.Invoke();
});
};
var CharaContainer = Instantiate(UmaContainerLivePrefab, LiveSoundList.content).GetComponent<UmaUIContainer>();
CharaContainer.Name = " " + live.MusicId + " " + live.SongName;
CharaContainer.Image.sprite = live.Icon;
CharaContainer.Image.enabled = CharaContainer.Image.sprite;
CharaContainer.Button.onClick.AddListener(() =>
{
HighlightChildImage(LiveSoundList.content, container);
ListLiveSounds(live.MusicId);
});
foreach (var live in Main.Lives.OrderBy(c => c.MusicId))
{
createContainer(live, UmaContainerLivePrefab, LiveList, () => ShowLiveSelectPannel(live));
createContainer(live, UmaContainerLivePrefab, LiveSoundList, () => ListLiveSounds(live.MusicId));
}
}
public void LoadNormalSoundPanels()
{
NormalSoundCtrl.Clear();
@@ -1044,13 +1038,14 @@ public class UmaViewerUI : MonoBehaviour
public void LoadedAnimation()
{
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
var container = Builder.CurrentUMAContainer;
if (!container || !container.UmaAnimator) return;
AnimationSlider.SetValueWithoutNotify(0);
// Reset settings by Panel
Builder.CurrentUMAContainer.UmaAnimator.speed = AnimationSpeedSlider.value;
container.UmaAnimator.speed = AnimationSpeedSlider.value;
Builder.AnimationCameraAnimator.speed = AnimationSpeedSlider.value;
if (Builder.CurrentUMAContainer.UmaFaceAnimator)
Builder.CurrentUMAContainer.UmaFaceAnimator.speed = AnimationSpeedSlider.value;
if (container.UmaFaceAnimator)
container.UmaFaceAnimator.speed = AnimationSpeedSlider.value;
}
/// <summary> Toggles one object ON and all others from UI.TogglablePanels list OFF </summary>
@@ -1134,19 +1129,21 @@ public class UmaViewerUI : MonoBehaviour
public void SetFaceOverrideEnable(bool isOn)
{
EnableFaceOverride = isOn;
if (Builder.CurrentUMAContainer && Builder.CurrentUMAContainer.FaceOverrideData)
var container = Builder.CurrentUMAContainer;
if (container && container.FaceOverrideData)
{
Builder.CurrentUMAContainer.FaceOverrideData.Enable = isOn;
container.FaceOverrideData.Enable = isOn;
}
}
public void AudioPause()
{
if (Builder.CurrentAudioSources.Count > 0)
var sources = Builder.CurrentAudioSources;
if (sources.Count > 0)
{
AudioSource MainSource = Builder.CurrentAudioSources[0];
AudioSource MainSource = sources[0];
var state = MainSource.isPlaying;
foreach (AudioSource source in Builder.CurrentAudioSources)
foreach (AudioSource source in sources)
{
if (state)
{
@@ -1180,51 +1177,51 @@ public class UmaViewerUI : MonoBehaviour
public void AnimationPause()
{
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
if (Builder.OverrideController.animationClips.Length > 0)
{
var animator = Builder.CurrentUMAContainer.UmaAnimator;
var animator_face = Builder.CurrentUMAContainer.UmaFaceAnimator;
var animator_cam = Builder.AnimationCameraAnimator;
var AnimeState = animator.GetCurrentAnimatorStateInfo(0);
var state = animator.speed > 0f;
if (state)
{
animator.speed = 0;
if (animator_face)
animator_face.speed = 0;
animator_cam.speed = 0;
}
else if (AnimeState.normalizedTime < 1f)
{
animator.speed = AnimationSpeedSlider.value;
animator_cam.speed = AnimationSpeedSlider.value;
if (animator_face)
animator_face.speed = AnimationSpeedSlider.value;
}
else
{
animator.speed = AnimationSpeedSlider.value;
animator.Play(0, 0, 0);
animator.Play(0, 2, 0);
animator_cam.speed = AnimationSpeedSlider.value;
animator_cam.Play(0, -1, 0);
if (animator_face)
{
animator_face.speed = AnimationSpeedSlider.value;
animator_face.Play(0, 0, 0);
animator_face.Play(0, 1, 0);
}
}
var container = Builder.CurrentUMAContainer;
if (!container || !container.UmaAnimator) return;
if (Builder.OverrideController.animationClips.Length == 0) return;
var animator = container.UmaAnimator;
var animator_face = container.UmaFaceAnimator;
var animator_cam = Builder.AnimationCameraAnimator;
var AnimeState = animator.GetCurrentAnimatorStateInfo(0);
var state = animator.speed > 0f;
if (state)
{
animator.speed = 0;
if (animator_face)
animator_face.speed = 0;
animator_cam.speed = 0;
}
else if (AnimeState.normalizedTime < 1f)
{
animator.speed = AnimationSpeedSlider.value;
animator_cam.speed = AnimationSpeedSlider.value;
if (animator_face)
animator_face.speed = AnimationSpeedSlider.value;
}
else
{
animator.speed = AnimationSpeedSlider.value;
animator.Play(0, 0, 0);
animator.Play(0, 2, 0);
animator_cam.speed = AnimationSpeedSlider.value;
animator_cam.Play(0, -1, 0);
if (animator_face)
{
animator_face.speed = AnimationSpeedSlider.value;
animator_face.Play(0, 0, 0);
animator_face.Play(0, 1, 0);
}
}
}
public void AnimationProgressChange(float val)
{
if (!Builder.CurrentUMAContainer) return;
var animator = Builder.CurrentUMAContainer.UmaAnimator;
var animator_face = Builder.CurrentUMAContainer.UmaFaceAnimator;
var container = Builder.CurrentUMAContainer;
if (!container) return;
var animator = container.UmaAnimator;
var animator_face = container.UmaFaceAnimator;
var animator_cam = Builder.AnimationCameraAnimator;
if (animator != null)
{
@@ -1252,13 +1249,16 @@ public class UmaViewerUI : MonoBehaviour
public void AnimationSpeedChange(float val)
{
var container = Builder.CurrentUMAContainer;
AnimationSpeedText.text = string.Format("Speed: {0:F2}", val);
if (!Builder.CurrentUMAContainer || !Builder.CurrentUMAContainer.UmaAnimator) return;
Builder.CurrentUMAContainer.UmaAnimator.speed = val;
if (!container || !container.UmaAnimator) return;
container.UmaAnimator.speed = val;
Builder.AnimationCameraAnimator.speed = val;
if (Builder.CurrentUMAContainer.UmaFaceAnimator)
if (container.UmaFaceAnimator)
{
Builder.CurrentUMAContainer.UmaFaceAnimator.speed = val;
container.UmaFaceAnimator.speed = val;
}
}
@@ -1272,7 +1272,6 @@ public class UmaViewerUI : MonoBehaviour
public static string ToTimeFormat(float time)
{
int seconds = (int)time;
int hour = seconds / 3600;
int minute = seconds % 3600 / 60;
@@ -1303,16 +1302,16 @@ public class UmaViewerUI : MonoBehaviour
public void RecordVMD()
{
var container = Builder.CurrentUMAContainer;
var camera = Builder.AnimationCamera;
var buttonText = VMDButton.GetComponentInChildren<TextMeshProUGUI>();
if (!UmaViewerBuilder.Instance.CurrentUMAContainer || UmaViewerBuilder.Instance.CurrentUMAContainer.IsMini)
if (!container || container.IsMini)
{
buttonText.text = string.Format("<color=#FF0000>{0}</color>", "Need Normal UMA");
return;
}
var container = UmaViewerBuilder.Instance.CurrentUMAContainer;
var camera = UmaViewerBuilder.Instance.AnimationCamera;
var rootbone = container.transform.Find("Position");
if (rootbone.gameObject.TryGetComponent(out UnityHumanoidVMDRecorder recorder))
{
@@ -1409,9 +1408,9 @@ public class UmaViewerUI : MonoBehaviour
public void ExportModel()
{
if (Builder.CurrentUMAContainer)
var container = Builder.CurrentUMAContainer;
if (container)
{
var container = Builder.CurrentUMAContainer;
var path = StandaloneFileBrowser.SaveFilePanel("Save PMX File", Config.Instance.MainPath, container.gameObject.name, "pmx");
if (!string.IsNullOrEmpty(path))
{
@@ -789,7 +789,7 @@ namespace Gallop
srcmorph.weight = 0;
}
}
targetMorph.ForEach(a => a.Invoke());
targetMorph.ForEach(a => a());
}
}
};
+1 -1
View File
@@ -21,7 +21,7 @@ Unity application that makes it easy to view assets from Uma Musume: Pretty Derb
------------
- For Developers/Contributors
1. [Unity Hub](https://unity3d.com/get-unity/download) with [Unity Engine Version 2020.3.28f1](unityhub://2020.3.28f1/f5400f52e03f) is recommended. It should be possible to run it on newer 2020.3.X versions.
1. [Unity Hub](https://unity3d.com/get-unity/download) with [Unity Engine Version 2020.3.24f1](unityhub://2020.3.28f1/f5400f52e03f) is recommended. It should be possible to run it on newer 2020.3.X versions.
1. Clone or download and extract this repository.
1. Import and Open the project in Unity Hub, missing files should be automatically repaired.
1. Open the Assets/Scenes/Version2 scene.