Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-30 06:43:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

useInheritSettings

Browse Source
This commit is contained in:
ousttrue
2024-11-15 18:49:06 +09:00
parent 894b00b805
commit bcf1991259
2 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/VRM10_Samples/ClothSample/RotateParticle/Editor/RotateParticleRuntimeProviderEditor.cs
View File

@@ -48,18 +48,30 @@ namespace RotateParticle.Components
for (int i = 0; i < joints.Length; ++i)
{
var joint = joints[i];
warp.Particles.Add(new Warp.Particle
var settings = new Warp.ParticleSettings
{
OverrideSettings = new Warp.ParticleSettings
DragForce = joint.m_dragForce,
GravityDir = joint.m_gravityDir,
GravityPower = joint.m_gravityPower,
StiffnessForce = joint.m_stiffnessForce,
};
if (i == 0)
{
settings.HitRadius = joints[0].m_jointRadius;
warp.BaseSettings = settings;
}
else
{
// breaking change from vrm-1.0
settings.HitRadius = joints[i - 1].m_jointRadius;
var useInheritSettings = warp.BaseSettings.Equals(settings);
warp.Particles.Add(new Warp.Particle
{
DragForce = joint.m_dragForce,
GravityDir = joint.m_gravityDir,
GravityPower = joint.m_gravityPower,
StiffnessForce = joint.m_stiffnessForce,
// breaking change from vrm-1.0
HitRadius = i > 0 ? joints[i - 1].m_jointRadius : joints[i].m_jointRadius,
},
});
useInheritSettings = useInheritSettings,
OverrideSettings = settings,
Transform = joint.transform,
});
}
Undo.DestroyObjectImmediate(joint);
}
spring.Joints.Clear();

55
Assets/VRM10_Samples/ClothSample/RotateParticle/Runtime/Components/Warp.cs
View File

@@ -10,7 +10,7 @@ namespace RotateParticle.Components
public class Warp : MonoBehaviour
{
[Serializable]
public class ParticleSettings
public class ParticleSettings : IEquatable<ParticleSettings>
{
[SerializeField]
public float StiffnessForce = 1.0f;
@@ -26,6 +26,27 @@ namespace RotateParticle.Components
[SerializeField]
public float HitRadius = 0.02f;
public override bool Equals(object obj) // Object.Equals(Object)のオーバーライド
{
return Equals(obj as ParticleSettings);
}
public bool Equals(ParticleSettings other)
{
return
StiffnessForce == other.StiffnessForce
&& GravityPower == other.GravityPower
&& GravityDir == other.GravityDir
&& DragForce == other.DragForce
&& HitRadius == other.HitRadius
;
}
public override int GetHashCode()
{
return GravityDir.GetHashCode();
}
}
/// <summary>
@@ -34,8 +55,14 @@ namespace RotateParticle.Components
[Serializable]
public class Particle
{
public bool useInheritSettings;
public ParticleSettings OverrideSettings;
public bool useInheritSettings = true;
public ParticleSettings OverrideSettings = new();
public Transform Transform;
public ParticleSettings GetSettings(ParticleSettings baseSettings)
{
return useInheritSettings ? baseSettings : OverrideSettings;
}
}
[SerializeField]
@@ -68,5 +95,25 @@ namespace RotateParticle.Components
{
throw new NotImplementedException();
}
public void OnDrawGizmosSelected()
{
Gizmos.DrawSphere(transform.position, BaseSettings.HitRadius);
Transform prev = transform;
foreach (var p in Particles)
{
if (p != null && p.Transform != null)
{
Gizmos.DrawWireSphere(p.Transform.position, p.GetSettings(BaseSettings).HitRadius);
if (prev != null)
{
Gizmos.DrawLine(prev.position, p.Transform.position);
}
}
prev = p.Transform;
}
}
}
}
}