UI调整
This commit is contained in:
@@ -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/Cloth/CheckSliderSerializeData.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/ClothBehaviour.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
// Magica Cloth 2.
|
||||
// Copyright (c) 2026 MagicaSoft.
|
||||
// https://magicasoft.jp
|
||||
|
||||
namespace MagicaCloth2
|
||||
{
|
||||
/// <summary>
|
||||
/// Simulation Disable Mode
|
||||
/// </summary>
|
||||
public enum ClothDisableMode
|
||||
{
|
||||
/// <summary>
|
||||
/// Reset the simulation.
|
||||
/// </summary>
|
||||
Reset = 0,
|
||||
|
||||
/// <summary>
|
||||
/// Maintain the simulation.
|
||||
/// </summary>
|
||||
Keep = 1,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b7f7df74e3431e84199fe50874a58668
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 242307
|
||||
packageName: Magica Cloth 2
|
||||
packageVersion: 2.18.1
|
||||
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothDisableMode.cs
|
||||
uploadId: 893596
|
||||
@@ -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/Cloth/ClothForceMode.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -167,7 +167,7 @@ namespace MagicaCloth2
|
||||
clothSetupDataList?.ForEach(x => x.GetUsedTransform(transformSet));
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
clothTransformRecord?.ReplaceTransform(replaceDict);
|
||||
normalAdjustmentTransformRecord?.ReplaceTransform(replaceDict);
|
||||
|
||||
@@ -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/Cloth/ClothInitSerializeData.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/ClothMeshWriteMode.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/ClothNormalAxis.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/ClothParameters.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -170,8 +170,8 @@ namespace MagicaCloth2
|
||||
// 初期化データの参照
|
||||
RenderSetupSerializeData initSetupData = useInitData ? sdata2.initData.clothSetupDataList[i] : null;
|
||||
|
||||
int handle = AddRenderer(ren, setup, uniquePreBuildSetupData, initSetupData);
|
||||
if (handle == 0)
|
||||
MagicaObjectId handle = AddRenderer(ren, setup, uniquePreBuildSetupData, initSetupData);
|
||||
if (handle.IsValid() == false)
|
||||
{
|
||||
result.SetError(Define.Result.ClothInit_FailedAddRenderer);
|
||||
throw new OperationCanceledException();
|
||||
@@ -221,7 +221,7 @@ namespace MagicaCloth2
|
||||
if (syncPartnerCloth)
|
||||
{
|
||||
// partner
|
||||
MagicaManager.Team.comp2SyncPartnerCompMap.Add(cloth.GetInstanceID(), syncPartnerCloth.GetInstanceID());
|
||||
MagicaManager.Team.comp2SyncPartnerCompMap.Add(cloth.GetMagicaId(), syncPartnerCloth.GetMagicaId());
|
||||
|
||||
// top
|
||||
// デッドロック対策
|
||||
@@ -237,7 +237,7 @@ namespace MagicaCloth2
|
||||
}
|
||||
Debug.Assert(c);
|
||||
SyncTopCloth = c;
|
||||
MagicaManager.Team.comp2SyncTopCompMap.Add(cloth.GetInstanceID(), SyncTopCloth.GetInstanceID());
|
||||
MagicaManager.Team.comp2SyncTopCompMap.Add(cloth.GetMagicaId(), SyncTopCloth.GetMagicaId());
|
||||
}
|
||||
|
||||
result.SetSuccess();
|
||||
@@ -275,7 +275,7 @@ namespace MagicaCloth2
|
||||
/// </summary>
|
||||
/// <param name="ren"></param>
|
||||
/// <returns>レンダー情報ハンドル</returns>
|
||||
int AddRenderer(
|
||||
MagicaObjectId AddRenderer(
|
||||
Renderer ren,
|
||||
RenderSetupData referenceSetupData,
|
||||
RenderSetupData.UniqueSerializationData referenceUniqueSetupData,
|
||||
@@ -283,16 +283,16 @@ namespace MagicaCloth2
|
||||
)
|
||||
{
|
||||
if (ren == null)
|
||||
return 0;
|
||||
return MagicaObjectId.Invalid;
|
||||
if (renderHandleList == null)
|
||||
return 0;
|
||||
return MagicaObjectId.Invalid;
|
||||
|
||||
int handle = ren.GetInstanceID();
|
||||
MagicaObjectId handle = ren.GetMagicaId();
|
||||
if (renderHandleList.Contains(handle) == false)
|
||||
{
|
||||
// レンダラーの利用開始
|
||||
handle = MagicaManager.Render.AddRenderer(ren, referenceSetupData, referenceUniqueSetupData, referenceInitSetupData);
|
||||
if (handle != 0)
|
||||
if (handle.IsValid())
|
||||
{
|
||||
lock (lockObject)
|
||||
{
|
||||
@@ -365,12 +365,12 @@ namespace MagicaCloth2
|
||||
SetState(State_Enable, now);
|
||||
|
||||
// チーム
|
||||
MagicaManager.Team.SetEnable(TeamId, now);
|
||||
MagicaManager.Team.SetEnable(this, TeamId, now);
|
||||
|
||||
// レンダラー
|
||||
if (renderHandleList != null)
|
||||
{
|
||||
foreach (int renderHandle in renderHandleList)
|
||||
foreach (MagicaObjectId renderHandle in renderHandleList)
|
||||
{
|
||||
if (now)
|
||||
MagicaManager.Render.StartUse(this, renderHandle);
|
||||
@@ -514,7 +514,7 @@ namespace MagicaCloth2
|
||||
result.SetError(Define.Result.CreateCloth_VertexAttributeListIsNull);
|
||||
throw new MagicaClothProcessingException();
|
||||
}
|
||||
int renderHandle = renderHandleList[i];
|
||||
MagicaObjectId renderHandle = renderHandleList[i];
|
||||
var renderData = MagicaManager.Render.GetRendererData(renderHandle);
|
||||
if (renderData.setupData.vertexCount != vertexAttributeArray.Length)
|
||||
{
|
||||
@@ -550,15 +550,15 @@ namespace MagicaCloth2
|
||||
SelectionData selectionData = (usePaintMap || useManualVertexAttribute) ? new SelectionData() : sdata2.selectionData.Clone();
|
||||
|
||||
// BoneCloth/BoneSpringでシリアライズ2にTransformと属性辞書がある場合はIDと属性の辞書に変換(スレッドではアクセスできないため)
|
||||
Dictionary<int, VertexAttribute> boneAttributeDict = null;
|
||||
Dictionary<MagicaObjectId, VertexAttribute> boneAttributeDict = null;
|
||||
if (sdata2.boneAttributeDict.Count > 0)
|
||||
{
|
||||
boneAttributeDict = new Dictionary<int, VertexAttribute>(sdata2.boneAttributeDict.Count);
|
||||
boneAttributeDict = new Dictionary<MagicaObjectId, VertexAttribute>(sdata2.boneAttributeDict.Count);
|
||||
foreach (var kv in sdata2.boneAttributeDict)
|
||||
{
|
||||
if (kv.Key)
|
||||
{
|
||||
boneAttributeDict.Add(kv.Key.GetInstanceID(), kv.Value);
|
||||
boneAttributeDict.Add(kv.Key.GetMagicaId(), kv.Value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -575,7 +575,7 @@ namespace MagicaCloth2
|
||||
ct.ThrowIfCancellationRequested();
|
||||
proxyMesh = new VirtualMesh("Proxy");
|
||||
proxyMesh.result.SetProcess();
|
||||
List<int> copyRenderHandleList = null;
|
||||
List<MagicaObjectId> copyRenderHandleList = null;
|
||||
if (clothType == ClothType.MeshCloth)
|
||||
{
|
||||
// MeshClothではクロストランスフォームを追加しておく
|
||||
@@ -583,7 +583,7 @@ namespace MagicaCloth2
|
||||
|
||||
lock (lockObject)
|
||||
{
|
||||
copyRenderHandleList = new List<int>(renderHandleList);
|
||||
copyRenderHandleList = new List<MagicaObjectId>(renderHandleList);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -606,7 +606,7 @@ namespace MagicaCloth2
|
||||
{
|
||||
ct.ThrowIfCancellationRequested();
|
||||
|
||||
int renderHandle = copyRenderHandleList[i];
|
||||
MagicaObjectId renderHandle = copyRenderHandleList[i];
|
||||
|
||||
// レンダーメッシュ作成
|
||||
var renderData = MagicaManager.Render.GetRendererData(renderHandle);
|
||||
@@ -719,7 +719,7 @@ namespace MagicaCloth2
|
||||
selectionData.Fill(VertexAttribute.Move);
|
||||
|
||||
// 次にルートのみ固定
|
||||
foreach (int id in boneClothSetupData.rootTransformIdList)
|
||||
foreach (MagicaObjectId id in boneClothSetupData.rootTransformIdList)
|
||||
{
|
||||
int rootIndex = boneClothSetupData.GetTransformIndexFromId(id);
|
||||
selectionData.attributes[rootIndex] = VertexAttribute.Fixed;
|
||||
@@ -1476,7 +1476,7 @@ namespace MagicaCloth2
|
||||
renderMeshContainerList[i] = null;
|
||||
|
||||
// レンダーハンドル
|
||||
int renderHandle = renderHandleList[i];
|
||||
MagicaObjectId renderHandle = renderHandleList[i];
|
||||
var renderData = MagicaManager.Render.GetRendererData(renderHandle);
|
||||
|
||||
// MappingMesh登録
|
||||
|
||||
@@ -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/Cloth/ClothProcess.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -57,7 +57,7 @@ namespace MagicaCloth2
|
||||
/// レンダー情報へのハンドル
|
||||
/// (レンダラーのセットアップデータ)
|
||||
/// </summary>
|
||||
internal List<int> renderHandleList = new List<int>();
|
||||
internal List<MagicaObjectId> renderHandleList = new List<MagicaObjectId>();
|
||||
|
||||
/// <summary>
|
||||
/// BoneClothのセットアップデータ
|
||||
@@ -69,7 +69,7 @@ namespace MagicaCloth2
|
||||
/// </summary>
|
||||
public class RenderMeshInfo
|
||||
{
|
||||
public int renderHandle;
|
||||
public MagicaObjectId renderHandle;
|
||||
public VirtualMeshContainer renderMeshContainer;
|
||||
public DataChunk mappingChunk;
|
||||
//public DataChunk renderMeshPositionAndNormalChunk;
|
||||
@@ -187,12 +187,12 @@ namespace MagicaCloth2
|
||||
/// <summary>
|
||||
/// 現在アンカーとして設定されているTransformのインスタンスID
|
||||
/// </summary>
|
||||
internal int anchorTransformId = 0;
|
||||
internal MagicaObjectId anchorTransformId = MagicaObjectId.Invalid;
|
||||
|
||||
/// <summary>
|
||||
/// 現在距離カリングの参照として設定されているオブジェクトのインスタンスID
|
||||
/// </summary>
|
||||
internal int distanceReferenceObjectId = 0;
|
||||
internal MagicaObjectId distanceReferenceObjectId = MagicaObjectId.Invalid;
|
||||
|
||||
/// <summary>
|
||||
/// コンポーネントの登録TransformIndex
|
||||
@@ -341,7 +341,7 @@ namespace MagicaCloth2
|
||||
renderMeshInfoList = null;
|
||||
|
||||
// レンダーデータの利用終了
|
||||
foreach (int renderHandle in renderHandleList)
|
||||
foreach (MagicaObjectId renderHandle in renderHandleList)
|
||||
{
|
||||
MagicaManager.Render?.RemoveRenderer(renderHandle);
|
||||
}
|
||||
@@ -366,7 +366,7 @@ namespace MagicaCloth2
|
||||
|
||||
// 作業バッファ破棄
|
||||
SyncTopCloth = null;
|
||||
int compId = cloth.GetInstanceID();
|
||||
MagicaObjectId compId = cloth.GetMagicaId();
|
||||
MagicaManager.Team?.comp2SuspendCounterMap.Remove(compId);
|
||||
MagicaManager.Team?.comp2TeamIdMap.Remove(compId);
|
||||
MagicaManager.Team?.comp2SyncPartnerCompMap.Remove(compId);
|
||||
@@ -385,7 +385,7 @@ namespace MagicaCloth2
|
||||
{
|
||||
//suspendCounter++;
|
||||
var tm = MagicaManager.Team;
|
||||
int compId = cloth.GetInstanceID();
|
||||
MagicaObjectId compId = cloth.GetMagicaId();
|
||||
if (tm.comp2SuspendCounterMap.TryGetValue(compId, out int cnt))
|
||||
{
|
||||
cnt++;
|
||||
@@ -400,12 +400,11 @@ namespace MagicaCloth2
|
||||
{
|
||||
//suspendCounter--;
|
||||
var tm = MagicaManager.Team;
|
||||
int compId = cloth.GetInstanceID();
|
||||
MagicaObjectId compId = cloth.GetMagicaId();
|
||||
if (tm.comp2SuspendCounterMap.TryGetValue(compId, out int cnt))
|
||||
{
|
||||
cnt--;
|
||||
if (cnt > 0)
|
||||
//tm.comp2SuspendCounterMap.Add(compId, cnt);
|
||||
tm.comp2SuspendCounterMap[compId] = cnt;
|
||||
else
|
||||
tm.comp2SuspendCounterMap.Remove(compId);
|
||||
@@ -416,7 +415,7 @@ namespace MagicaCloth2
|
||||
{
|
||||
//return suspendCounter;
|
||||
var tm = MagicaManager.Team;
|
||||
int compId = cloth.GetInstanceID();
|
||||
MagicaObjectId compId = cloth.GetMagicaId();
|
||||
if (tm.comp2SuspendCounterMap.TryGetValue(compId, out int cnt))
|
||||
return cnt;
|
||||
else
|
||||
@@ -451,7 +450,7 @@ namespace MagicaCloth2
|
||||
transformSet.Remove(null);
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
cloth.SerializeData.ReplaceTransform(replaceDict);
|
||||
cloth.serializeData2.ReplaceTransform(replaceDict);
|
||||
|
||||
@@ -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/Cloth/ClothProcessData.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -106,7 +106,7 @@ namespace MagicaCloth2
|
||||
{
|
||||
if (rt)
|
||||
{
|
||||
int index = setupData.GetTransformIndexFromId(rt.GetInstanceID());
|
||||
int index = setupData.GetTransformIndexFromId(rt.GetMagicaId());
|
||||
selectionData.attributes[index] = VertexAttribute.Fixed;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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/Cloth/ClothProcessGeneration.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -109,6 +109,14 @@ namespace MagicaCloth2
|
||||
/// </summary>
|
||||
public ClothUpdateMode updateMode = ClothUpdateMode.AnimatorLinkage;
|
||||
|
||||
/// <summary>
|
||||
/// Set the disable mode.
|
||||
/// Component inactive behavior.
|
||||
/// [OK] Runtime changes.
|
||||
/// [NG] Export/Import with Presets
|
||||
/// </summary>
|
||||
public ClothDisableMode disableMode = ClothDisableMode.Reset;
|
||||
|
||||
/// <summary>
|
||||
/// Blend ratio between initial pose and animation pose.
|
||||
/// [OK] Runtime changes.
|
||||
|
||||
@@ -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/Cloth/ClothSerializeData.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -85,7 +85,7 @@ namespace MagicaCloth2
|
||||
preBuildData.GetUsedTransform(transformSet);
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
initData.ReplaceTransform(replaceDict);
|
||||
preBuildData.ReplaceTransform(replaceDict);
|
||||
|
||||
@@ -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/Cloth/ClothSerializeData2.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -122,7 +122,7 @@ namespace MagicaCloth2
|
||||
int hash = 0;
|
||||
hash += (int)clothType;
|
||||
foreach (var ren in sourceRenderers)
|
||||
hash += ren != null ? ren.GetInstanceID() : NullHash;
|
||||
hash += ren != null ? ren.GetMagicaId().GetHashCode() : NullHash;
|
||||
foreach (var t in rootBones)
|
||||
{
|
||||
var stack = new Stack<Transform>(30);
|
||||
@@ -135,7 +135,7 @@ namespace MagicaCloth2
|
||||
hash += NullHash;
|
||||
continue;
|
||||
}
|
||||
hash += t2.GetInstanceID();
|
||||
hash += t2.GetMagicaId().GetHashCode();
|
||||
hash += t2.localPosition.GetHashCode();
|
||||
hash += t2.localRotation.GetHashCode();
|
||||
int cnt = t2.childCount;
|
||||
@@ -153,7 +153,7 @@ namespace MagicaCloth2
|
||||
{
|
||||
if (map)
|
||||
{
|
||||
hash += map.GetInstanceID();
|
||||
hash += map.GetMagicaId().GetHashCode();
|
||||
hash += map.isReadable ? 1 : 0;
|
||||
}
|
||||
}
|
||||
@@ -213,6 +213,7 @@ namespace MagicaCloth2
|
||||
float rotationalInterpolation;
|
||||
float rootRotation;
|
||||
ClothUpdateMode updateMode;
|
||||
ClothDisableMode disableMode;
|
||||
float animationPoseRatio;
|
||||
ReductionSettings reductionSetting;
|
||||
CustomSkinningSettings customSkinningSetting;
|
||||
@@ -245,6 +246,7 @@ namespace MagicaCloth2
|
||||
rotationalInterpolation = sdata.rotationalInterpolation;
|
||||
rootRotation = sdata.rootRotation;
|
||||
updateMode = sdata.updateMode;
|
||||
disableMode = sdata.disableMode;
|
||||
animationPoseRatio = sdata.animationPoseRatio;
|
||||
reductionSetting = sdata.reductionSetting.Clone();
|
||||
customSkinningSetting = sdata.customSkinningSetting.Clone();
|
||||
@@ -273,6 +275,7 @@ namespace MagicaCloth2
|
||||
sdata.rotationalInterpolation = rotationalInterpolation;
|
||||
sdata.rootRotation = rootRotation;
|
||||
sdata.updateMode = updateMode;
|
||||
sdata.disableMode = disableMode;
|
||||
sdata.animationPoseRatio = animationPoseRatio;
|
||||
sdata.reductionSetting = reductionSetting;
|
||||
sdata.customSkinningSetting = customSkinningSetting;
|
||||
@@ -354,6 +357,7 @@ namespace MagicaCloth2
|
||||
rotationalInterpolation = sdata.rotationalInterpolation;
|
||||
rootRotation = sdata.rootRotation;
|
||||
updateMode = sdata.updateMode;
|
||||
disableMode = sdata.disableMode;
|
||||
animationPoseRatio = sdata.animationPoseRatio;
|
||||
reductionSetting = sdata.reductionSetting.Clone();
|
||||
customSkinningSetting = sdata.customSkinningSetting.Clone();
|
||||
@@ -408,14 +412,14 @@ namespace MagicaCloth2
|
||||
colliderCollisionConstraint.GetUsedTransform(transformSet);
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
for (int i = 0; i < rootBones.Count; i++)
|
||||
{
|
||||
var t = rootBones[i];
|
||||
if (t && replaceDict.ContainsKey(t.GetInstanceID()))
|
||||
if (t && replaceDict.ContainsKey(t.GetMagicaId()))
|
||||
{
|
||||
rootBones[i] = replaceDict[t.GetInstanceID()];
|
||||
rootBones[i] = replaceDict[t.GetMagicaId()];
|
||||
}
|
||||
}
|
||||
customSkinningSetting.ReplaceTransform(replaceDict);
|
||||
|
||||
@@ -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/Cloth/ClothSerializeDataFunction.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/ClothUpdateMode.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -378,12 +378,12 @@ namespace MagicaCloth2
|
||||
transformSet.Add(symmetryTarget);
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
if (symmetryTarget)
|
||||
{
|
||||
int id = symmetryTarget.GetInstanceID();
|
||||
if (id != 0 && replaceDict.ContainsKey(id))
|
||||
MagicaObjectId id = symmetryTarget.GetMagicaId();
|
||||
if (id.IsValid() && replaceDict.ContainsKey(id))
|
||||
symmetryTarget = replaceDict[id];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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/Cloth/Collider/ColliderComponent.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Collider/ColliderSymmetryMode.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Collider/MagicaCapsuleCollider.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Collider/MagicaPlaneCollider.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Collider/MagicaSphereCollider.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/AngleConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -103,7 +103,7 @@ namespace MagicaCloth2
|
||||
foreach (var t in collisionBones)
|
||||
{
|
||||
if (t)
|
||||
hash += t.GetInstanceID();
|
||||
hash += t.GetMagicaId().GetHashCode();
|
||||
}
|
||||
|
||||
return hash;
|
||||
@@ -123,7 +123,7 @@ namespace MagicaCloth2
|
||||
}
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
colliderList.ForEach(x =>
|
||||
{
|
||||
@@ -133,9 +133,9 @@ namespace MagicaCloth2
|
||||
for (int i = 0; i < collisionBones.Count; i++)
|
||||
{
|
||||
var t = collisionBones[i];
|
||||
if (t && replaceDict.ContainsKey(t.GetInstanceID()))
|
||||
if (t && replaceDict.ContainsKey(t.GetMagicaId()))
|
||||
{
|
||||
collisionBones[i] = replaceDict[t.GetInstanceID()];
|
||||
collisionBones[i] = replaceDict[t.GetMagicaId()];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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/Cloth/Constraints/ColliderCollisionConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/DistanceConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/InertiaConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/MotionConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/SelfCollisionConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/SpringConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/TetherConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Constraints/TriangleBendingConstraint.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/CullingSettings.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/CurveSerializeData.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -85,14 +85,14 @@ namespace MagicaCloth2
|
||||
}
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
for (int i = 0; i < skinningBones.Count; i++)
|
||||
{
|
||||
var t = skinningBones[i];
|
||||
if (t && replaceDict.ContainsKey(t.GetInstanceID()))
|
||||
if (t && replaceDict.ContainsKey(t.GetMagicaId()))
|
||||
{
|
||||
skinningBones[i] = replaceDict[t.GetInstanceID()];
|
||||
skinningBones[i] = replaceDict[t.GetMagicaId()];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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/Cloth/CustomSkinningSettings.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/GizmoSerializeData.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -135,7 +135,7 @@ namespace MagicaCloth2
|
||||
public override int GetMagicaHashCode()
|
||||
{
|
||||
int hash = SerializeData.GetHashCode() + serializeData2.GetHashCode();
|
||||
hash += isActiveAndEnabled ? GetInstanceID() : 0; // component active.
|
||||
hash += isActiveAndEnabled ? this.GetMagicaId().GetHashCode() : 0; // component active.
|
||||
return hash;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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/Cloth/MagicaCloth.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -159,12 +159,12 @@ namespace MagicaCloth2
|
||||
// 置換処理用の辞書を作成
|
||||
// key:置換対象トランスフォームのインスタンスID
|
||||
// value:入れ替えるトランスフォーム
|
||||
var replaceDict = new Dictionary<int, Transform>();
|
||||
var replaceDict = new Dictionary<MagicaObjectId, Transform>();
|
||||
foreach (var t in useTransformSet)
|
||||
{
|
||||
if (t && targetTransformDict.ContainsKey(t.name))
|
||||
{
|
||||
replaceDict.Add(t.GetInstanceID(), targetTransformDict[t.name]);
|
||||
replaceDict.Add(t.GetMagicaId(), targetTransformDict[t.name]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -307,7 +307,7 @@ namespace MagicaCloth2
|
||||
{
|
||||
if (IsValid() == false || ren == null)
|
||||
return null;
|
||||
int handle = ren.GetInstanceID();
|
||||
MagicaObjectId handle = ren.GetMagicaId();
|
||||
return MagicaManager.Render.GetRendererData(handle);
|
||||
}
|
||||
|
||||
|
||||
@@ -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/Cloth/MagicaClothAPI.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/MagicaClothAnimationProperty.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace MagicaCloth2
|
||||
hash += (int)alignmentMode * 105;
|
||||
if (adjustmentTransform)
|
||||
{
|
||||
hash += adjustmentTransform.GetInstanceID();
|
||||
hash += adjustmentTransform.GetMagicaId().GetHashCode();
|
||||
hash += adjustmentTransform.position.GetHashCode();
|
||||
}
|
||||
|
||||
@@ -96,11 +96,11 @@ namespace MagicaCloth2
|
||||
transformSet.Add(adjustmentTransform);
|
||||
}
|
||||
|
||||
public void ReplaceTransform(Dictionary<int, Transform> replaceDict)
|
||||
public void ReplaceTransform(Dictionary<MagicaObjectId, Transform> replaceDict)
|
||||
{
|
||||
if (adjustmentTransform && replaceDict.ContainsKey(adjustmentTransform.GetInstanceID()))
|
||||
if (adjustmentTransform && replaceDict.ContainsKey(adjustmentTransform.GetMagicaId()))
|
||||
{
|
||||
adjustmentTransform = replaceDict[adjustmentTransform.GetInstanceID()];
|
||||
adjustmentTransform = replaceDict[adjustmentTransform.GetMagicaId()];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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/Cloth/NormalAlignmentSettings.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/SelectionData.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Wind/MagicaWindZone.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Wind/WindParams.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
@@ -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/Cloth/Wind/WindSettings.cs
|
||||
uploadId: 829902
|
||||
uploadId: 893596
|
||||
|
||||
Reference in New Issue
Block a user