bug fix
This commit is contained in:
@@ -4,122 +4,125 @@ using UnityEngine;
|
||||
|
||||
namespace Gallop
|
||||
{
|
||||
public class CySpringDataContainer:MonoBehaviour
|
||||
public class CySpringDataContainer : MonoBehaviour
|
||||
{
|
||||
public List<CySpringCollisionData> collisionParam;
|
||||
public List<CySpringParamDataElement> springParam;
|
||||
public List<ConnectedBoneData> ConnectedBoneList;
|
||||
public bool enableVerticalWind;
|
||||
public bool enableHorizontalWind;
|
||||
public float centerWindAngleSlow;
|
||||
public float centerWindAngleFast;
|
||||
public float verticalCycleSlow;
|
||||
public float horizontalCycleSlow;
|
||||
public float verticalAngleWidthSlow;
|
||||
public float horizontalAngleWidthSlow;
|
||||
public float verticalCycleFast;
|
||||
public float horizontalCycleFast;
|
||||
public float verticalAngleWidthFast;
|
||||
public float horizontalAngleWidthFast;
|
||||
public bool IsEnableHipMoveParam;
|
||||
public float HipMoveInfluenceDistance;
|
||||
public float HipMoveInfluenceMaxDistance;
|
||||
public List<CySpringCollisionData> collisionParam;
|
||||
public List<CySpringParamDataElement> springParam;
|
||||
public List<ConnectedBoneData> ConnectedBoneList;
|
||||
public bool enableVerticalWind;
|
||||
public bool enableHorizontalWind;
|
||||
public float centerWindAngleSlow;
|
||||
public float centerWindAngleFast;
|
||||
public float verticalCycleSlow;
|
||||
public float horizontalCycleSlow;
|
||||
public float verticalAngleWidthSlow;
|
||||
public float horizontalAngleWidthSlow;
|
||||
public float verticalCycleFast;
|
||||
public float horizontalCycleFast;
|
||||
public float verticalAngleWidthFast;
|
||||
public float horizontalAngleWidthFast;
|
||||
public bool IsEnableHipMoveParam;
|
||||
public float HipMoveInfluenceDistance;
|
||||
public float HipMoveInfluenceMaxDistance;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
SetPhysics();
|
||||
}
|
||||
SetPhysics();
|
||||
}
|
||||
public void SetPhysics()
|
||||
{
|
||||
List<Transform> gameObjects = new List<Transform>();
|
||||
Dictionary<string, DynamicBoneColliderBase> DynamicBoneColliders = new Dictionary<string, DynamicBoneColliderBase>();
|
||||
gameObjects.AddRange(transform.parent.transform.parent.GetComponentsInChildren<Transform>());
|
||||
foreach (CySpringCollisionData collider in collisionParam)
|
||||
{
|
||||
if (collider._isInner) continue;
|
||||
|
||||
var bone = gameObjects.Find(a => { return a.name == collider._targetObjectName; });
|
||||
if (bone)
|
||||
{
|
||||
|
||||
var child = new GameObject(collider._collisionName);
|
||||
child.transform.SetParent(bone);
|
||||
child.transform.localPosition = Vector3.zero;
|
||||
child.transform.localRotation = Quaternion.identity;
|
||||
child.transform.localScale = Vector3.one;
|
||||
|
||||
switch (collider._type){
|
||||
case CySpringCollisionData.CollisionType.Capsule:
|
||||
var dynamic = child.AddComponent<DynamicBoneCollider>();
|
||||
dynamic.ColliderName = collider._collisionName;
|
||||
child.transform.localPosition = (collider._offset+ collider._offset2)/2;
|
||||
child.transform.LookAt(child.transform.TransformPoint(collider._offset2));
|
||||
dynamic.m_Direction = DynamicBoneColliderBase.Direction.Z;
|
||||
dynamic.m_Height = (collider._offset - collider._offset2).magnitude+collider._radius;
|
||||
dynamic.m_Radius = collider._radius;
|
||||
dynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside;
|
||||
DynamicBoneColliders.Add(collider._collisionName, dynamic);
|
||||
break;
|
||||
case CySpringCollisionData.CollisionType.Sphere:
|
||||
var Spheredynamic = child.AddComponent<DynamicBoneCollider>();
|
||||
Spheredynamic.ColliderName = collider._collisionName;
|
||||
child.transform.localPosition = collider._offset;
|
||||
Spheredynamic.m_Radius = collider._radius;
|
||||
Spheredynamic.m_Height = collider._distance;
|
||||
Spheredynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside;
|
||||
DynamicBoneColliders.Add(collider._collisionName, Spheredynamic);
|
||||
break;
|
||||
case CySpringCollisionData.CollisionType.Plane:
|
||||
var planedynamic = child.AddComponent<DynamicBonePlaneCollider>();
|
||||
planedynamic.ColliderName = collider._collisionName;
|
||||
child.transform.localPosition = collider._offset;
|
||||
planedynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside;
|
||||
DynamicBoneColliders.Add(collider._collisionName, planedynamic);
|
||||
break;
|
||||
case CySpringCollisionData.CollisionType.None:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
foreach (CySpringParamDataElement spring in springParam)
|
||||
List<Transform> gameObjects = new List<Transform>();
|
||||
Dictionary<string, DynamicBoneColliderBase> DynamicBoneColliders = new Dictionary<string, DynamicBoneColliderBase>();
|
||||
gameObjects.AddRange(transform.parent.transform.parent.GetComponentsInChildren<Transform>());
|
||||
foreach (CySpringCollisionData collider in collisionParam)
|
||||
{
|
||||
var bone = gameObjects.Find(a => { return a.name == spring._boneName; });
|
||||
if (collider._isInner) continue;
|
||||
|
||||
var bone = gameObjects.Find(a => { return a.name == collider._targetObjectName; });
|
||||
if (bone)
|
||||
{
|
||||
var dynamic = bone.gameObject.AddComponent<DynamicBone>();
|
||||
dynamic.m_Root = bone;
|
||||
dynamic.m_UpdateMode = DynamicBone.UpdateMode.Normal;
|
||||
dynamic.SetupParticles();
|
||||
dynamic.m_Gravity = new Vector3(0, -spring._gravity/80000, 0);
|
||||
dynamic.m_Stiffness = spring._stiffnessForce/8000;
|
||||
dynamic.m_Elasticity = spring._dragForce/9000;
|
||||
dynamic.m_Radius = spring._collisionRadius;
|
||||
foreach (string collisionName in spring._collisionNameList)
|
||||
|
||||
var child = new GameObject(collider._collisionName);
|
||||
child.transform.SetParent(bone);
|
||||
child.transform.localPosition = Vector3.zero;
|
||||
child.transform.localRotation = Quaternion.identity;
|
||||
child.transform.localScale = Vector3.one;
|
||||
|
||||
switch (collider._type)
|
||||
{
|
||||
if (DynamicBoneColliders.TryGetValue(collisionName,out DynamicBoneColliderBase val))
|
||||
{
|
||||
dynamic.m_Particles[0].m_Colliders.Add(val);
|
||||
}
|
||||
case CySpringCollisionData.CollisionType.Capsule:
|
||||
var dynamic = child.AddComponent<DynamicBoneCollider>();
|
||||
dynamic.ColliderName = collider._collisionName;
|
||||
child.transform.localPosition = (collider._offset + collider._offset2) / 2;
|
||||
child.transform.LookAt(child.transform.TransformPoint(collider._offset2));
|
||||
dynamic.m_Direction = DynamicBoneColliderBase.Direction.Z;
|
||||
dynamic.m_Height = (collider._offset - collider._offset2).magnitude + collider._radius;
|
||||
dynamic.m_Radius = collider._radius;
|
||||
dynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside;
|
||||
DynamicBoneColliders.Add(collider._collisionName, dynamic);
|
||||
break;
|
||||
case CySpringCollisionData.CollisionType.Sphere:
|
||||
var Spheredynamic = child.AddComponent<DynamicBoneCollider>();
|
||||
Spheredynamic.ColliderName = collider._collisionName;
|
||||
child.transform.localPosition = collider._offset;
|
||||
Spheredynamic.m_Radius = collider._radius;
|
||||
Spheredynamic.m_Height = collider._distance;
|
||||
Spheredynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside;
|
||||
DynamicBoneColliders.Add(collider._collisionName, Spheredynamic);
|
||||
break;
|
||||
case CySpringCollisionData.CollisionType.Plane:
|
||||
var planedynamic = child.AddComponent<DynamicBonePlaneCollider>();
|
||||
planedynamic.ColliderName = collider._collisionName;
|
||||
child.transform.localPosition = collider._offset;
|
||||
planedynamic.m_Bound = collider._isInner ? DynamicBoneColliderBase.Bound.Inside : DynamicBoneColliderBase.Bound.Outside;
|
||||
DynamicBoneColliders.Add(collider._collisionName, planedynamic);
|
||||
break;
|
||||
case CySpringCollisionData.CollisionType.None:
|
||||
break;
|
||||
}
|
||||
foreach (CySpringParamDataChildElement Childcollision in spring._childElements)
|
||||
{
|
||||
var tempParticle = dynamic.m_Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
foreach (CySpringParamDataElement spring in springParam)
|
||||
{
|
||||
var bone = gameObjects.Find(a => { return a.name == spring._boneName; });
|
||||
if (bone)
|
||||
{
|
||||
var dynamic = bone.gameObject.AddComponent<DynamicBone>();
|
||||
dynamic.m_Root = bone;
|
||||
dynamic.m_UpdateMode = DynamicBone.UpdateMode.Normal;
|
||||
dynamic.SetupParticles();
|
||||
dynamic.m_Gravity = new Vector3(0, -spring._gravity / 80000, 0);
|
||||
dynamic.m_Stiffness = spring._stiffnessForce / 5000;
|
||||
dynamic.m_Elasticity = spring._dragForce / 5000;
|
||||
dynamic.m_Radius = spring._collisionRadius;
|
||||
foreach (string collisionName in spring._collisionNameList)
|
||||
{
|
||||
if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val))
|
||||
{
|
||||
dynamic.m_Particles[0].m_Colliders.Add(val);
|
||||
}
|
||||
}
|
||||
foreach (CySpringParamDataChildElement Childcollision in spring._childElements)
|
||||
{
|
||||
var tempParticle = dynamic.m_Particles.Find(a => { return a.m_Transform.gameObject.name == Childcollision._boneName; });
|
||||
if (tempParticle != null)
|
||||
{
|
||||
foreach (string collisionName in Childcollision._collisionNameList)
|
||||
{
|
||||
if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val))
|
||||
{
|
||||
tempParticle.m_Colliders.Add(val);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
tempParticle.m_Stiffness = Childcollision._stiffnessForce / 5000;
|
||||
tempParticle.m_Elasticity = Childcollision._dragForce / 5000;
|
||||
tempParticle.m_Radius = Childcollision._collisionRadius;
|
||||
foreach (string collisionName in Childcollision._collisionNameList)
|
||||
{
|
||||
if (DynamicBoneColliders.TryGetValue(collisionName, out DynamicBoneColliderBase val))
|
||||
{
|
||||
tempParticle.m_Colliders.Add(val);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user