修改水
This commit is contained in:
@@ -12,37 +12,59 @@ namespace Obi{
|
||||
this.collider = collider;
|
||||
}
|
||||
|
||||
public override void UpdateIfNeeded()
|
||||
public override bool UpdateIfNeeded()
|
||||
{
|
||||
|
||||
SphereCollider sphere = collider as SphereCollider;
|
||||
|
||||
// retrieve collision world and index:
|
||||
var world = ObiColliderWorld.GetInstance();
|
||||
int index = source.Handle.index;
|
||||
// TODO: testing for changes here is not needed? all we do is set variables...
|
||||
//if (sphere != null && (sphere.radius != radius || sphere.center != center))
|
||||
{
|
||||
//radius = sphere.radius;
|
||||
//center = sphere.center;
|
||||
|
||||
// update collider:
|
||||
var shape = world.colliderShapes[index];
|
||||
shape.type = ColliderShape.ShapeType.Sphere;
|
||||
shape.filter = source.Filter;
|
||||
shape.SetSign(source.Inverted);
|
||||
shape.isTrigger = sphere.isTrigger;
|
||||
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
|
||||
shape.materialIndex = source.CollisionMaterial != null ? source.CollisionMaterial.handle.index : -1;
|
||||
shape.forceZoneIndex = source.ForceZone != null ? source.ForceZone.Handle.index : -1;
|
||||
shape.contactOffset = source.Thickness;
|
||||
shape.center = sphere.center;
|
||||
shape.size = Vector3.one * sphere.radius;
|
||||
world.colliderShapes[index] = shape;
|
||||
// retrieve collision world and index:
|
||||
var world = ObiColliderWorld.GetInstance();
|
||||
int index = source.Handle.index;
|
||||
|
||||
// update bounds:
|
||||
var aabb = world.colliderAabbs[index];
|
||||
aabb.FromBounds(sphere.bounds, shape.contactOffset);
|
||||
world.colliderAabbs[index] = aabb;
|
||||
// update collider:
|
||||
var shape = world.colliderShapes[index];
|
||||
shape.type = ColliderShape.ShapeType.Sphere;
|
||||
shape.filter = source.Filter;
|
||||
shape.flags = sphere.isTrigger ? 1 : 0;
|
||||
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
|
||||
shape.materialIndex = source.CollisionMaterial != null ? source.CollisionMaterial.handle.index : -1;
|
||||
shape.contactOffset = source.Thickness;
|
||||
shape.center = sphere.center;
|
||||
shape.size = Vector3.one * sphere.radius;
|
||||
world.colliderShapes[index] = shape;
|
||||
|
||||
// update transform:
|
||||
var trfm = world.colliderTransforms[index];
|
||||
trfm.FromTransform3D(sphere.transform, source.Rigidbody as ObiRigidbody);
|
||||
world.colliderTransforms[index] = trfm;
|
||||
// update bounds:
|
||||
var aabb = world.colliderAabbs[index];
|
||||
aabb.FromBounds(sphere.bounds, shape.contactOffset);
|
||||
world.colliderAabbs[index] = aabb;
|
||||
|
||||
// update transform:
|
||||
var trfm = world.colliderTransforms[index];
|
||||
trfm.FromTransform(sphere.transform);
|
||||
world.colliderTransforms[index] = trfm;
|
||||
|
||||
|
||||
/*var shape = source.colliderWorld.colliderShapes[source.shapeHandle.index];
|
||||
|
||||
// update the transform
|
||||
shape.Set(collider as Collider, source.Phase, source.Thickness);
|
||||
|
||||
// update the shape:
|
||||
shape.SetSphere(sphere.center, sphere.radius);
|
||||
|
||||
source.colliderWorld.colliderShapes[source.shapeHandle.index] = shape;*/
|
||||
|
||||
//adaptor.Set(center, radius);
|
||||
//Oni.UpdateShape(oniShape,ref adaptor);
|
||||
return true;
|
||||
}
|
||||
//return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user