Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改水

Browse Source
This commit is contained in:
BobSong
2026-01-01 22:00:33 +08:00
parent 040a222bd6
commit 9ceffccd39
1800 changed files with 103929 additions and 139495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiBoxShapeTracker2D.cs
View File

@@ -10,7 +10,7 @@ namespace Obi{
this.collider = collider;
}
public override void UpdateIfNeeded (){
public override bool UpdateIfNeeded (){
BoxCollider2D box = collider as BoxCollider2D;
@@ -19,14 +19,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
shape.type = ColliderShape.ShapeType.Box;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = box.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = box.isTrigger ? 1 : 0;
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 + box.edgeRadius;
shape.center = box.offset;
shape.size = box.size;
@@ -39,8 +37,9 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(box.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(box.transform, true);
world.colliderTransforms[index] = trfm;
return false;
}
}

14
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiCapsuleShapeTracker2D.cs
View File

@@ -11,7 +11,7 @@ namespace Obi{
this.collider = collider;
}
public override void UpdateIfNeeded ()
public override bool UpdateIfNeeded ()
{
CapsuleCollider2D capsule = collider as CapsuleCollider2D;
@@ -21,14 +21,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
shape.type = ColliderShape.ShapeType.Capsule;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = capsule.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = capsule.isTrigger ? 1 : 0;
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 = capsule.offset;
Vector2 size = capsule.size;
@@ -44,8 +42,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(capsule.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(capsule.transform,true);
world.colliderTransforms[index] = trfm;
return false;
}
}

14
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiCircleShapeTracker2D.cs
View File

@@ -12,7 +12,7 @@ namespace Obi{
this.collider = collider;
}
public override void UpdateIfNeeded ()
public override bool UpdateIfNeeded ()
{
CircleCollider2D sphere = collider as CircleCollider2D;
@@ -23,14 +23,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
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.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.forceZoneIndex = source.ForceZone != null ? source.ForceZone.Handle.index : -1;
shape.contactOffset = source.Thickness;
shape.center = sphere.offset;
shape.size = Vector3.one * sphere.radius;
@@ -43,8 +41,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(sphere.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(sphere.transform,true);
world.colliderTransforms[index] = trfm;
return true;
}
}

14
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers2D/ObiEdgeShapeTracker2D.cs
View File

@@ -19,7 +19,7 @@ namespace Obi{
ObiColliderWorld.GetInstance().DestroyEdgeMesh(handle);
}
public override void UpdateIfNeeded (){
public override bool UpdateIfNeeded (){
EdgeCollider2D edgeCollider = collider as EdgeCollider2D;
@@ -36,14 +36,12 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = true;
shape.is2D = 1;
shape.type = ColliderShape.ShapeType.EdgeMesh;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = edgeCollider.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = edgeCollider.isTrigger ? 1 : 0;
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.center = edgeCollider.offset;
shape.contactOffset = source.Thickness + edgeCollider.edgeRadius;
shape.dataIndex = handle.index;
@@ -56,8 +54,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform2D(edgeCollider.transform, source.Rigidbody as ObiRigidbody2D);
trfm.FromTransform(edgeCollider.transform, true);
world.colliderTransforms[index] = trfm;
return true;
}
public override void Destroy()

19
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiBoxShapeTracker.cs
View File

@@ -12,10 +12,18 @@ namespace Obi{
this.collider = collider;
}
public override void UpdateIfNeeded (){
public override bool UpdateIfNeeded (){
BoxCollider box = collider as BoxCollider;
/*if (box != null && (box.size != size || box.center != center)){
size = box.size;
center = box.center;
adaptor.Set(center, size);
Oni.UpdateShape(oniShape,ref adaptor);
return true;
}*/
// retrieve collision world and index:
var world = ObiColliderWorld.GetInstance();
int index = source.Handle.index;
@@ -24,11 +32,9 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.Box;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = box.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = box.isTrigger ? 1 : 0;
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 = box.center;
shape.size = box.size;
@@ -41,9 +47,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform3D(box.transform, source.Rigidbody as ObiRigidbody);
trfm.FromTransform(box.transform);
world.colliderTransforms[index] = trfm;
return true;
}
}

12
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiCapsuleShapeTracker.cs
View File

@@ -11,7 +11,7 @@ namespace Obi{
this.source = source;
}
public override void UpdateIfNeeded (){
public override bool UpdateIfNeeded (){
CapsuleCollider capsule = collider as CapsuleCollider;
@@ -23,11 +23,9 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.Capsule;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = capsule.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = capsule.isTrigger ? 1 : 0;
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 = capsule.center;
shape.size = new Vector4(capsule.radius, capsule.height, capsule.direction, 0);
@@ -40,8 +38,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform3D(capsule.transform, source.Rigidbody as ObiRigidbody);
trfm.FromTransform(capsule.transform);
world.colliderTransforms[index] = trfm;
return true;
}
}

12
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiCharacterControllerShapeTracker.cs
View File

@@ -13,7 +13,7 @@ namespace Obi
this.source = source;
}
public override void UpdateIfNeeded()
public override bool UpdateIfNeeded()
{
CharacterController character = collider as CharacterController;
@@ -26,11 +26,9 @@ namespace Obi
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.Capsule;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = character.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = character.isTrigger ? 1 : 0;
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 = character.center;
shape.size = new Vector4(character.radius, character.height, 1, 0);
@@ -43,8 +41,10 @@ namespace Obi
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform3D(character.transform, source.Rigidbody as ObiRigidbody);
trfm.FromTransform(character.transform);
world.colliderTransforms[index] = trfm;
return true;
}
}

12
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiDistanceFieldShapeTracker.cs
View File

@@ -26,7 +26,7 @@ namespace Obi{
ObiColliderWorld.GetInstance().DestroyDistanceField(handle);
}
public override void UpdateIfNeeded ()
public override bool UpdateIfNeeded ()
{
bool trigger = false;
@@ -55,11 +55,9 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.SignedDistanceField;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = trigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = trigger ? 1 : 0;
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.dataIndex = handle.index;
world.colliderShapes[index] = shape;
@@ -71,8 +69,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform3D(source.transform, source.Rigidbody as ObiRigidbody);
trfm.FromTransform(source.transform);
world.colliderTransforms[index] = trfm;
return true;
}
public override void Destroy()

20
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiMeshShapeTracker.cs
View File

@@ -9,14 +9,6 @@ namespace Obi{
{
ObiTriangleMeshHandle handle;
public Mesh targetMesh
{
get {
var mc = collider as MeshCollider;
return mc?.sharedMesh;
}
}
public ObiMeshShapeTracker(ObiCollider source, MeshCollider collider){
this.source = source;
@@ -31,7 +23,7 @@ namespace Obi{
ObiColliderWorld.GetInstance().DestroyTriangleMesh(handle);
}
public override void UpdateIfNeeded ()
public override bool UpdateIfNeeded ()
{
MeshCollider meshCollider = collider as MeshCollider;
@@ -59,11 +51,9 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.TriangleMesh;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = meshCollider.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = meshCollider.isTrigger ? 1 : 0;
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.dataIndex = handle.index;
world.colliderShapes[index] = shape;
@@ -75,8 +65,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform3D(meshCollider.transform, source.Rigidbody as ObiRigidbody);
trfm.FromTransform(meshCollider.transform);
world.colliderTransforms[index] = trfm;
return true;
}
public override void Destroy()

2
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiShapeTracker.cs
View File

@@ -11,7 +11,7 @@ namespace Obi{
public virtual void Destroy(){
}
public abstract void UpdateIfNeeded ();
public abstract bool UpdateIfNeeded ();
}

72
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiSphereShapeTracker.cs
View File

@@ -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;
}
}

13
Assets/Obi/Scripts/Common/Collisions/ColliderTrackers/Trackers3D/ObiTerrainShapeTracker.cs
View File

@@ -6,6 +6,7 @@ namespace Obi{
public class ObiTerrainShapeTracker : ObiShapeTracker
{
private bool heightmapDataHasChanged = false;
ObiHeightFieldHandle handle;
public ObiTerrainShapeTracker(ObiCollider source, TerrainCollider collider){
@@ -19,7 +20,7 @@ namespace Obi{
ObiColliderWorld.GetInstance().DestroyHeightField(handle);
}
public override void UpdateIfNeeded ()
public override bool UpdateIfNeeded ()
{
TerrainCollider terrain = collider as TerrainCollider;
@@ -41,11 +42,9 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.Heightmap;
shape.filter = source.Filter;
shape.SetSign(source.Inverted);
shape.isTrigger = terrain.isTrigger;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.Handle.index : -1;
shape.flags = terrain.isTrigger ? 1 : 0;
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.dataIndex = handle.index;
shape.size = terrain.terrainData.size;
@@ -59,8 +58,10 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform3D(terrain.transform, source.Rigidbody as ObiRigidbody);
trfm.FromTransform(terrain.transform);
world.colliderTransforms[index] = trfm;
return true;
}
public override void Destroy()