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

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/Utility/Data/DataUtility.cs
uploadId: 829902
uploadId: 893596

View File

@@ -0,0 +1,98 @@
// Magica Cloth 2.
// Copyright (c) 2026 MagicaSoft.
// https://magicasoft.jp
using System;
using UnityEngine;
namespace MagicaCloth2
{
/// <summary>
/// Unityのバージョン差異InstanceID vs EntityIdを吸収するID構造体。
/// 現在はUnity6.4以上でEntityIdに切り替え
/// </summary>
public readonly struct MagicaObjectId : IEquatable<MagicaObjectId>
{
// -------------------------------------------------------
// 内部データ保持
// -------------------------------------------------------
#if UNITY_6000_4_OR_NEWER
private readonly EntityId _value;
public MagicaObjectId(EntityId id)
{
_value = id;
}
// 無効なIDの定義EntityIdの仕様に合わせる
public static readonly MagicaObjectId Invalid = new(EntityId.None);
public bool IsValid() => _value.IsValid();
#else
private readonly int _value;
public MagicaObjectId(int id)
{
_value = id;
}
// 従来のInstanceIDでは0が事実上の無効値として扱われることが多い
public static readonly MagicaObjectId Invalid = new MagicaObjectId(0);
public bool IsValid() => _value != 0;
#endif
public bool Equals(MagicaObjectId other)
{
return _value.Equals(other._value);
}
public override bool Equals(object obj)
{
return obj is MagicaObjectId other && Equals(other);
}
public override int GetHashCode()
{
return _value.GetHashCode();
}
public static bool operator ==(MagicaObjectId left, MagicaObjectId right)
{
return left.Equals(right);
}
public static bool operator !=(MagicaObjectId left, MagicaObjectId right)
{
return !left.Equals(right);
}
// これはデバッグ用途以外では使わない
public override string ToString()
{
return _value.ToString();
}
}
// -------------------------------------------------------
// 拡張メソッド
// -------------------------------------------------------
public static class MagicaObjectIdExtensions
{
/// <summary>
/// GameObjectやComponentからバージョンに合わせたIDを取得する
/// </summary>
public static MagicaObjectId GetMagicaId(this UnityEngine.Object obj)
{
if (obj == null) return MagicaObjectId.Invalid;
#if UNITY_6000_4_OR_NEWER
// Unity 6.4 API
return new MagicaObjectId(obj.GetEntityId());
#else
// 従来の API
return new MagicaObjectId(obj.GetInstanceID());
#endif
}
}
}

View File

@@ -0,0 +1,18 @@
fileFormatVersion: 2
guid: 527929c5c74a0224b91228de398467f3
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/Utility/Data/MagicaObjectId.cs
uploadId: 893596

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/Utility/Data/MultiDataBuilder.cs
uploadId: 829902
uploadId: 893596

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/Utility/Grid/GridMap.cs
uploadId: 829902
uploadId: 893596

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/Utility/Jobs/InterlockUtility.cs
uploadId: 829902
uploadId: 893596

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/Utility/Jobs/JobUtility.cs
uploadId: 829902
uploadId: 893596

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/Utility/Math/AABB.cs
uploadId: 829902
uploadId: 893596

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/Utility/Math/IntAABB.cs
uploadId: 829902
uploadId: 893596

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/Utility/Math/MathExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/Math/MathUtility.cs
uploadId: 829902
uploadId: 893596

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/Utility/Math/MinimumData.cs
uploadId: 829902
uploadId: 893596

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/Utility/Mesh/MeshUtility.cs
uploadId: 829902
uploadId: 893596

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/Utility/Misc/Develop.cs
uploadId: 829902
uploadId: 893596

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/Utility/Misc/StaticStringBuilder.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/DataChunk.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/ExBitFlag16.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/ExBitFlag8.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/ExCostSortedList1.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/ExCostSortedList4.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/ExNativeArray.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/ExProcessingList.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/ExSimpleNativeArray.cs
uploadId: 829902
uploadId: 893596

View File

@@ -31,17 +31,17 @@ namespace MagicaCloth2
/// <summary>
/// 使用インデックス辞書
/// </summary>
Dictionary<int, int> useIndexDict;
Dictionary<int, MagicaObjectId> useIndexDict;
/// <summary>
/// トランスフォームインデックス辞書
/// </summary>
Dictionary<int, int> indexDict;
Dictionary<MagicaObjectId, int> indexDict;
/// <summary>
/// トランスフォーム参照カウンタ辞書
/// </summary>
Dictionary<int, int> referenceDict;
Dictionary<MagicaObjectId, int> referenceDict;
//=========================================================================================
public ExTransformAccessArray(int capacity, int desiredJobCount = -1)
@@ -50,9 +50,9 @@ namespace MagicaCloth2
nativeLength = transformArray.length;
emptyStack = new Queue<int>(capacity);
useIndexDict = new Dictionary<int, int>(capacity);
indexDict = new Dictionary<int, int>(capacity);
referenceDict = new Dictionary<int, int>(capacity);
useIndexDict = new Dictionary<int, MagicaObjectId>(capacity);
indexDict = new Dictionary<MagicaObjectId, int>(capacity);
referenceDict = new Dictionary<MagicaObjectId, int>(capacity);
}
public void Dispose()
@@ -84,7 +84,7 @@ namespace MagicaCloth2
{
int index = 0;
int id = element.GetInstanceID();
MagicaObjectId id = element.GetMagicaId();
if (referenceDict.ContainsKey(id))
{
@@ -122,7 +122,7 @@ namespace MagicaCloth2
{
if (useIndexDict.ContainsKey(index))
{
int id = useIndexDict[index];
MagicaObjectId id = useIndexDict[index];
int cnt = referenceDict[id] - 1;
if (cnt > 0)
{
@@ -150,7 +150,7 @@ namespace MagicaCloth2
{
if (element == null)
return false;
return indexDict.ContainsKey(element.GetInstanceID());
return indexDict.ContainsKey(element.GetMagicaId());
}
/// <summary>
@@ -187,7 +187,7 @@ namespace MagicaCloth2
{
if (element == null)
return -1;
int id = element.GetInstanceID();
MagicaObjectId id = element.GetMagicaId();
if (indexDict.ContainsKey(id))
return indexDict[id];
else

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/Utility/NativeCollection/ExTransformAccessArray.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/FixedList128BytesExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/FixedList32BytesExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/FixedList4096BytesExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/FixedList512BytesExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/FixedList64BytesExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/NativeArrayExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/NativeMultiHashMapExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/NativeParallelHashMapExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/NativeCollection/NativeReferenceExtensions.cs
uploadId: 829902
uploadId: 893596

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/Utility/ResultCode/Exception.cs
uploadId: 829902
uploadId: 893596

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/Utility/ResultCode/ResultCode.cs
uploadId: 829902
uploadId: 893596

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/Utility/Time/TimeSpan.cs
uploadId: 829902
uploadId: 893596

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/Utility/Time/UnityTimeSpan.cs
uploadId: 829902
uploadId: 893596