From 57486cdc664bfbc2d23d7bbb4622dd5ac6a5db34 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Sat, 16 Nov 2024 09:52:49 +0900
Subject: [PATCH] ColliderGroup to VRM10SpringBoneColliderGroup

---
 .../Runtime/RotateParticleSystem.cs             | 10 +++++-----
 .../SphereTriangle/ClothRectCollision.cs        |  2 +-
 .../Runtime/SphereTriangle/ColliderGroup.cs     | 17 -----------------
 .../SphereTriangle/ColliderGroup.cs.meta        | 11 -----------
 4 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs
 delete mode 100644 Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs.meta

diff --git a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/RotateParticleSystem.cs b/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/RotateParticleSystem.cs
index 9a23efd70..5a4be00c2 100644
--- a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/RotateParticleSystem.cs
+++ b/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/RotateParticleSystem.cs
@@ -23,7 +23,7 @@ namespace RotateParticle
         public List<RectCloth> _cloths = new();
 
         [SerializeField]
-        public List<ColliderGroup> _colliderGroups = new();
+        public List<VRM10SpringBoneColliderGroup> _colliderGroups = new();
 
         [Range(0, 1)]
         public float _clothFactor = 0.5f;
@@ -43,7 +43,7 @@ namespace RotateParticle
             Color.magenta,
         };
 
-        Color GetGizmoColor(ColliderGroup g)
+        Color GetGizmoColor(VRM10SpringBoneColliderGroup g)
         {
             for (int i = 0; i < _colliderGroups.Count; ++i)
             {
@@ -287,7 +287,7 @@ namespace RotateParticle
             }
         }
 
-        public ColliderGroup GetOrAddColliderGroup(string groupName)
+        public VRM10SpringBoneColliderGroup GetOrAddColliderGroup(string groupName, GameObject go)
         {
             foreach (var g in _colliderGroups)
             {
@@ -297,7 +297,7 @@ namespace RotateParticle
                 }
             }
 
-            var group = new ColliderGroup { Name = groupName };
+            var group = go.AddComponent<VRM10SpringBoneColliderGroup>();
             _colliderGroups.Add(group);
             return group;
         }
@@ -305,7 +305,7 @@ namespace RotateParticle
         public void AddColliderIfNotExists(string groupName,
            VRM10SpringBoneCollider c)
         {
-            var group = GetOrAddColliderGroup(groupName);
+            var group = GetOrAddColliderGroup(groupName, c.gameObject);
 
             foreach (var collider in group.Colliders)
             {
diff --git a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ClothRectCollision.cs b/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ClothRectCollision.cs
index fa26fdeca..1c5e56c81 100644
--- a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ClothRectCollision.cs
+++ b/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ClothRectCollision.cs
@@ -45,7 +45,7 @@ namespace SphereTriangle
             _d = d;
         }
 
-        public void InitializeColliderSide(PositionList list, IReadOnlyList<ColliderGroup> colliderGroups)
+        public void InitializeColliderSide(PositionList list, IReadOnlyList<VRM10SpringBoneColliderGroup> colliderGroups)
         {
             var a = list.Get(_a);
             var b = list.Get(_b);
diff --git a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs b/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs
deleted file mode 100644
index 989942dae..000000000
--- a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-using UniVRM10;
-
-namespace SphereTriangle
-{
-    [Serializable]
-    public class ColliderGroup
-    {
-        [SerializeField]
-        public string Name;
-
-        [SerializeField]
-        public List<VRM10SpringBoneCollider> Colliders = new();
-    }
-}
\ No newline at end of file
diff --git a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs.meta b/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs.meta
deleted file mode 100644
index c6e6b683c..000000000
--- a/Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/SphereTriangle/ColliderGroup.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 07647b77d9934cd42b0bd0ab880ed321
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: