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

升级obi

Browse Source
This commit is contained in:
BobSong
2026-01-22 22:08:21 +08:00
parent 120b8cda26
commit 20f14322bc
1067 changed files with 149894 additions and 29583 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 bool UpdateIfNeeded (){
public override void UpdateIfNeeded (){
BoxCollider2D box = collider as BoxCollider2D;
@@ -19,12 +19,14 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = 1;
shape.is2D = true;
shape.type = ColliderShape.ShapeType.Box;
shape.filter = source.Filter;
shape.flags = box.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.SetSign(source.Inverted);
shape.isTrigger = box.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 + box.edgeRadius;
shape.center = box.offset;
shape.size = box.size;
@@ -37,9 +39,8 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(box.transform, true);
trfm.FromTransform2D(box.transform, source.Rigidbody as ObiRigidbody2D);
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 bool UpdateIfNeeded ()
public override void UpdateIfNeeded ()
{
CapsuleCollider2D capsule = collider as CapsuleCollider2D;
@@ -21,12 +21,14 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = 1;
shape.is2D = true;
shape.type = ColliderShape.ShapeType.Capsule;
shape.filter = source.Filter;
shape.flags = capsule.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.SetSign(source.Inverted);
shape.isTrigger = capsule.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 = capsule.offset;
Vector2 size = capsule.size;
@@ -42,10 +44,8 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(capsule.transform,true);
trfm.FromTransform2D(capsule.transform, source.Rigidbody as ObiRigidbody2D);
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 bool UpdateIfNeeded ()
public override void UpdateIfNeeded ()
{
CircleCollider2D sphere = collider as CircleCollider2D;
@@ -23,12 +23,14 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = 1;
shape.is2D = true;
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.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.offset;
shape.size = Vector3.one * sphere.radius;
@@ -41,10 +43,8 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(sphere.transform,true);
trfm.FromTransform2D(sphere.transform, source.Rigidbody as ObiRigidbody2D);
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 bool UpdateIfNeeded (){
public override void UpdateIfNeeded (){
EdgeCollider2D edgeCollider = collider as EdgeCollider2D;
@@ -36,12 +36,14 @@ namespace Obi{
// update collider:
var shape = world.colliderShapes[index];
shape.is2D = 1;
shape.is2D = true;
shape.type = ColliderShape.ShapeType.EdgeMesh;
shape.filter = source.Filter;
shape.flags = edgeCollider.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.SetSign(source.Inverted);
shape.isTrigger = edgeCollider.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.center = edgeCollider.offset;
shape.contactOffset = source.Thickness + edgeCollider.edgeRadius;
shape.dataIndex = handle.index;
@@ -54,10 +56,8 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(edgeCollider.transform, true);
trfm.FromTransform2D(edgeCollider.transform, source.Rigidbody as ObiRigidbody2D);
world.colliderTransforms[index] = trfm;
return true;
}
public override void Destroy()

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

@@ -12,18 +12,10 @@ namespace Obi{
this.collider = collider;
}
public override bool UpdateIfNeeded (){
public override void 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;
@@ -32,9 +24,11 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.Box;
shape.filter = source.Filter;
shape.flags = box.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.SetSign(source.Inverted);
shape.isTrigger = box.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 = box.center;
shape.size = box.size;
@@ -47,10 +41,9 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(box.transform);
trfm.FromTransform3D(box.transform, source.Rigidbody as ObiRigidbody);
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 bool UpdateIfNeeded (){
public override void UpdateIfNeeded (){
CapsuleCollider capsule = collider as CapsuleCollider;
@@ -23,9 +23,11 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.Capsule;
shape.filter = source.Filter;
shape.flags = capsule.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.SetSign(source.Inverted);
shape.isTrigger = capsule.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 = capsule.center;
shape.size = new Vector4(capsule.radius, capsule.height, capsule.direction, 0);
@@ -38,10 +40,8 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(capsule.transform);
trfm.FromTransform3D(capsule.transform, source.Rigidbody as ObiRigidbody);
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 bool UpdateIfNeeded()
public override void UpdateIfNeeded()
{
CharacterController character = collider as CharacterController;
@@ -26,9 +26,11 @@ namespace Obi
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.Capsule;
shape.filter = source.Filter;
shape.flags = character.isTrigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.SetSign(source.Inverted);
shape.isTrigger = character.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 = character.center;
shape.size = new Vector4(character.radius, character.height, 1, 0);
@@ -41,10 +43,8 @@ namespace Obi
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(character.transform);
trfm.FromTransform3D(character.transform, source.Rigidbody as ObiRigidbody);
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 bool UpdateIfNeeded ()
public override void UpdateIfNeeded ()
{
bool trigger = false;
@@ -55,9 +55,11 @@ namespace Obi{
var shape = world.colliderShapes[index];
shape.type = ColliderShape.ShapeType.SignedDistanceField;
shape.filter = source.Filter;
shape.flags = trigger ? 1 : 0;
shape.rigidbodyIndex = source.Rigidbody != null ? source.Rigidbody.handle.index : -1;
shape.SetSign(source.Inverted);
shape.isTrigger = trigger;
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;
@@ -69,10 +71,8 @@ namespace Obi{
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform(source.transform);
trfm.FromTransform3D(source.transform, source.Rigidbody as ObiRigidbody);
world.colliderTransforms[index] = trfm;
return true;
}
public override void Destroy()

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

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

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

@@ -12,59 +12,37 @@ namespace Obi{
this.collider = collider;
}
public override bool UpdateIfNeeded()
public override void UpdateIfNeeded()
{
SphereCollider sphere = collider as SphereCollider;
// 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;
// retrieve collision world and index:
var world = ObiColliderWorld.GetInstance();
int index = source.Handle.index;
// retrieve collision world and index:
var world = ObiColliderWorld.GetInstance();
int index = source.Handle.index;
// 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;
// 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 bounds:
var aabb = world.colliderAabbs[index];
aabb.FromBounds(sphere.bounds, shape.contactOffset);
world.colliderAabbs[index] = aabb;
// 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;
// update transform:
var trfm = world.colliderTransforms[index];
trfm.FromTransform3D(sphere.transform, source.Rigidbody as ObiRigidbody);
world.colliderTransforms[index] = trfm;
}
}

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

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