Soullies/Cielonos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI调整

Browse Source
This commit is contained in:
SoulliesOfficial
2026-05-27 15:15:28 -04:00
parent 76f498ae2b
commit 72756712f7
669 changed files with 5361 additions and 12268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs
View File

@@ -518,7 +518,7 @@ namespace MagicaCloth2
{
// Mesh接続
// トランスフォームIDからインデックスへの辞書を作成
var idToIndexDict = new Dictionary<int, int>(vcnt);
var idToIndexDict = new Dictionary<MagicaObjectId, int>(vcnt);
for (int i = 0; i < vcnt; i++)
{
if (idToIndexDict.ContainsKey(rsetup.transformIdList[i]) == false)
@@ -533,7 +533,7 @@ namespace MagicaCloth2
|| rsetup.boneConnectionMode == RenderSetupData.BoneConnectionMode.SequentialNonLoopMesh;
// ルートリスト
var rootTransformIdList = new List<int>(rsetup.rootTransformIdList); // copy
var rootTransformIdList = new List<MagicaObjectId>(rsetup.rootTransformIdList); // copy
int rootCnt = rootTransformIdList.Count;
const int firstRootIndex = 0;
int lastRootIndex = rootCnt - 1;
@@ -541,24 +541,24 @@ namespace MagicaCloth2
// オート接続の場合はルート同士が最近接点になるように並べ替える
if (rsetup.boneConnectionMode == RenderSetupData.BoneConnectionMode.AutomaticMesh)
{
var tempRootIdList = new List<int>(rootTransformIdList);
var tempRootIdList = new List<MagicaObjectId>(rootTransformIdList);
rootTransformIdList.Clear();
rootTransformIdList.Add(tempRootIdList[0]);
float lastDist = 0;
while (tempRootIdList.Count > 0)
{
int rootId = rootTransformIdList[rootTransformIdList.Count - 1];
MagicaObjectId rootId = rootTransformIdList[rootTransformIdList.Count - 1];
tempRootIdList.Remove(rootId);
int vindex = idToIndexDict[rootId];
var pos = localPositions[vindex];
// next connection
float minDist = float.MaxValue;
int minId = 0;
MagicaObjectId minId = MagicaObjectId.Invalid;
for (int i = 0; i < tempRootIdList.Count; i++)
{
int rootId2 = tempRootIdList[i];
MagicaObjectId rootId2 = tempRootIdList[i];
int vindex2 = idToIndexDict[rootId2];
var pos2 = localPositions[vindex2];
@@ -570,7 +570,7 @@ namespace MagicaCloth2
}
}
if (minId != 0)
if (minId.IsValid())
{
if (lastDist == 0 || minDist < lastDist * 1.5f)
{
@@ -589,8 +589,8 @@ namespace MagicaCloth2
// 最初と最後のルート距離が平均以下ならばループ接続にする
if (rootTransformIdList.Count >= 3)
{
int rootId1 = rootTransformIdList[0];
int rootId2 = rootTransformIdList[rootTransformIdList.Count - 1];
MagicaObjectId rootId1 = rootTransformIdList[0];
MagicaObjectId rootId2 = rootTransformIdList[rootTransformIdList.Count - 1];
int vindex1 = idToIndexDict[rootId1];
int vindex2 = idToIndexDict[rootId2];
var pos1 = localPositions[vindex1];
@@ -619,7 +619,7 @@ namespace MagicaCloth2
var mainEdgeSet = new HashSet<uint>(); // メインエッジ
// まずトランスフォームの親子関係に接続
var stack = new Stack<int>(vcnt);
var stack = new Stack<MagicaObjectId>(vcnt);
var lvstack = new Stack<int>(vcnt);
for (int i = 0; i < rootCnt; i++)
{
@@ -630,7 +630,7 @@ namespace MagicaCloth2
while (stack.Count > 0)
{
int id = stack.Pop();
MagicaObjectId id = stack.Pop();
int lv = lvstack.Pop();
int vindex = idToIndexDict[id];
var pos = localPositions[vindex];
@@ -644,7 +644,7 @@ namespace MagicaCloth2
var link = new FixedList128Bytes<int>();
// parent
int pid = rsetup.transformParentIdList[vindex];
MagicaObjectId pid = rsetup.transformParentIdList[vindex];
if (idToIndexDict.ContainsKey(pid))
{
int vindex2 = idToIndexDict[pid];
@@ -661,7 +661,7 @@ namespace MagicaCloth2
{
for (int j = 0; j < clist.Length; j++)
{
int cid = clist[j];
MagicaObjectId cid = clist[j];
stack.Push(cid);
lvstack.Push(lv + 1);
@@ -1706,8 +1706,11 @@ namespace MagicaCloth2
/// メッシュの基準トランスフォームを設定する（メインスレッドのみ）
/// </summary>
/// <param name="center"></param>
/// <param name="skinRoot"></param>
public void SetTransform(Transform center, Transform skinRoot = null, int centerId = 0, int skinRootId = 0)
/// <param name="skinRoot">不要ならnull</param>
/// <param name="centerId">不要ならInvalid</param>
/// <param name="skinRootId">不要ならInvalid</param>
//public void SetTransform(Transform center, Transform skinRoot = null, int centerId = 0, int skinRootId = 0)
public void SetTransform(Transform center, Transform skinRoot, MagicaObjectId centerId, MagicaObjectId skinRootId)
{
SetCenterTransform(center, centerId);
if (skinRoot != null)
@@ -1729,9 +1732,9 @@ namespace MagicaCloth2
/// <param name="record"></param>
public void SetTransform(TransformRecord centerRecord, TransformRecord skinRootRecord = null)
{
centerTransformIndex = transformData.AddTransform(centerRecord);
centerTransformIndex = transformData.AddTransform(centerRecord, MagicaObjectId.Invalid);
if (skinRootRecord != null)
skinRootIndex = transformData.AddTransform(skinRootRecord);
skinRootIndex = transformData.AddTransform(skinRootRecord, MagicaObjectId.Invalid);
else
skinRootIndex = centerTransformIndex;
@@ -1743,34 +1746,36 @@ namespace MagicaCloth2
initScale = centerRecord.scale;
}
public void SetCenterTransform(Transform t, int tid = 0)
//public void SetCenterTransform(Transform t, int tid = 0)
public void SetCenterTransform(Transform t, MagicaObjectId tid)
{
if (t)
{
// すでに存在する場合は入れ替え
if (centerTransformIndex >= 0)
{
transformData.ReplaceTransform(centerTransformIndex, t, tid);
transformData.ReplaceTransform(centerTransformIndex, t, tid, MagicaObjectId.Invalid);
}
else
{
centerTransformIndex = transformData.AddTransform(t, tid);
centerTransformIndex = transformData.AddTransform(t, tid, MagicaObjectId.Invalid);
}
}
}
public void SetSkinRoot(Transform t, int tid = 0)
//public void SetSkinRoot(Transform t, int tid = 0)
public void SetSkinRoot(Transform t, MagicaObjectId tid)
{
if (t)
{
// すでに存在する場合は入れ替え
if (skinRootIndex >= 0)
{
transformData.ReplaceTransform(skinRootIndex, t, tid);
transformData.ReplaceTransform(skinRootIndex, t, tid, MagicaObjectId.Invalid);
}
else
{
skinRootIndex = transformData.AddTransform(t, tid);
skinRootIndex = transformData.AddTransform(t, tid, MagicaObjectId.Invalid);
}
}
}
@@ -1801,7 +1806,7 @@ namespace MagicaCloth2
// ボーンの登録。スキニング用ボーンとしても登録。
index = skinBoneTransformIndices.Count;
int tindex = transformData.AddTransform(rd, checkDuplicate: false); // 重複ありで最後に追加する
int tindex = transformData.AddTransform(rd, pid: MagicaObjectId.Invalid, checkDuplicate: false); // 重複ありで最後に追加する
skinBoneTransformIndices.Add(tindex);
var bindPose = math.mul(rd.worldToLocalMatrix, initLocalToWorld); // bind pose
skinBoneBindPoses.Add(bindPose);

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshInputOutput.cs
uploadId: 829902
uploadId: 893596

8
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs
View File

@@ -382,7 +382,7 @@ namespace MagicaCloth2
[Unity.Collections.ReadOnly]
public NativeArray<VirtualMeshBoneWeight> boneWeights;
[Unity.Collections.ReadOnly]
public NativeArray<int> transformIds;
public NativeArray<MagicaObjectId> transformIds;
[Unity.Collections.WriteOnly]
public NativeArray<VertexAttribute> attributes;
@@ -396,7 +396,7 @@ namespace MagicaCloth2
[Unity.Collections.ReadOnly]
public NativeArray<VirtualMeshBoneWeight> proxyBoneWeights;
[Unity.Collections.ReadOnly]
public NativeArray<int> proxyTransformIds;
public NativeArray<MagicaObjectId> proxyTransformIds;
// out
[Unity.Collections.WriteOnly]
@@ -414,7 +414,7 @@ namespace MagicaCloth2
Debug.Assert(bw.IsValid);
// もっともウエイトが重いボーンのハッシュ
int boneId = transformIds[bw.boneIndices[0]];
MagicaObjectId boneId = transformIds[bw.boneIndices[0]];
// グリッド範囲を検索する
@@ -441,7 +441,7 @@ namespace MagicaCloth2
bool hasBone = false;
for (int j = 0; j < tbw.Count && hasBone == false; j++)
{
int tboneId = proxyTransformIds[tbw.boneIndices[j]];
MagicaObjectId tboneId = proxyTransformIds[tbw.boneIndices[j]];
if (tboneId == boneId)
hasBone = true;
}

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshMapping.cs
uploadId: 829902
uploadId: 893596

7
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs
View File

@@ -94,8 +94,11 @@ namespace MagicaCloth2
if (edgeToTriangleList.ContainsKey(edge))
{
var tlist = edgeToTriangleList[edge];
tlist.MC2Set(i);
edgeToTriangleList[edge] = tlist;
if (tlist.Length < tlist.Capacity) // Capacity check
{
tlist.MC2Set(i);
edgeToTriangleList[edge] = tlist;
}
}
else
{

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshOptimization.cs
uploadId: 829902
uploadId: 893596

8
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs
View File

@@ -1937,7 +1937,7 @@ namespace MagicaCloth2
// トランスフォーム情報から親子関係を構築する
// parent
var idToIndexDict = new Dictionary<int, int>(vcnt);
var idToIndexDict = new Dictionary<MagicaObjectId, int>(vcnt);
var idArray = transformData.idArray.GetNativeArray();
var parentIdArray = transformData.parentIdArray.GetNativeArray();
for (int i = 0; i < vcnt; i++)
@@ -1946,7 +1946,7 @@ namespace MagicaCloth2
}
for (int index = 0; index < vcnt; index++)
{
int pid = parentIdArray[index];
MagicaObjectId pid = parentIdArray[index];
if (idToIndexDict.ContainsKey(pid))
vertexParentIndices[index] = idToIndexDict[pid];
else
@@ -1971,7 +1971,7 @@ namespace MagicaCloth2
var startIndices = new List<ushort>(rootCount);
var dataCounts = new List<ushort>(rootCount);
var indices = new List<ushort>(vcnt);
foreach (int id in transformData.rootIdList)
foreach (MagicaObjectId id in transformData.rootIdList)
{
// ルートからTransformを走査して最初の移動ポイントを持つ固定を起点とする
rootStack.Clear();
@@ -2153,7 +2153,7 @@ namespace MagicaCloth2
vertexLocalRotations[vindex] = lrot;
// 親とのゼロ距離判定。フラグを立てる
if(MathUtility.IsZeroDistance(lpos))
if (MathUtility.IsZeroDistance(lpos))
{
var flag = attributes[vindex];
flag.SetFlag(VertexAttribute.Flag_ZeroDistance, true);

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshProxy.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshReduction.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshReduction.cs
uploadId: 829902
uploadId: 893596

2
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs
View File

@@ -267,7 +267,7 @@ namespace MagicaCloth2
transformData?.GetUsedTransform(transformSet);
}
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
{
transformData?.ReplaceTransform(replaceDict);
}

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshSerialization.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshWork.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/Function/VirtualMeshWork.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VertexAttribute.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VertexAttribute.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMesh.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMesh.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshBoneWeight.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshBoneWeight.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshContainer.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshContainer.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshPrimitive.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshPrimitive.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshRaycastHit.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshRaycastHit.cs
uploadId: 829902
uploadId: 893596

4
Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshTransform.cs.meta
View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.17.0
packageVersion: 2.18.1
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/VirtualMesh/VirtualMeshTransform.cs
uploadId: 829902
uploadId: 893596