OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

starting to add bits and pieces to physics prims that we will eventually need for collisions. not hooked in yet.

afrisby
Brian McBee 2007-08-18 23:05:02 +00:00
parent 1ae73931da
commit 318376707d
4 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
View File

@ -90,7 +90,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
} }
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
{ {
return null; return null;
} }

5
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -26,6 +26,7 @@
* *
*/ */
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using Axiom.Math;
namespace OpenSim.Physics.Manager namespace OpenSim.Physics.Manager
{ {
@ -43,7 +44,7 @@ namespace OpenSim.Physics.Manager
public abstract void RemoveAvatar(PhysicsActor actor); public abstract void RemoveAvatar(PhysicsActor actor);
public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size); public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation);
public abstract void Simulate(float timeStep); public abstract void Simulate(float timeStep);
@ -73,7 +74,7 @@ namespace OpenSim.Physics.Manager
} }
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
{ {
MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null; return PhysicsActor.Null;

35
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@ -80,6 +80,7 @@ namespace OpenSim.Region.Physics.OdePlugin
private double[] _heightmap; private double[] _heightmap;
static private d.NearCallback nearCallback = near; static private d.NearCallback nearCallback = near;
private List<OdeCharacter> _characters = new List<OdeCharacter>(); private List<OdeCharacter> _characters = new List<OdeCharacter>();
private List<OdePrim> _prims = new List<OdePrim>();
private static d.ContactGeom[] contacts = new d.ContactGeom[30]; private static d.ContactGeom[] contacts = new d.ContactGeom[30];
private static d.Contact contact; private static d.Contact contact;
@ -134,7 +135,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
{ {
PhysicsVector pos = new PhysicsVector(); PhysicsVector pos = new PhysicsVector();
pos.X = position.X; pos.X = position.X;
@ -144,7 +145,14 @@ namespace OpenSim.Region.Physics.OdePlugin
siz.X = size.X; siz.X = size.X;
siz.Y = size.Y; siz.Y = size.Y;
siz.Z = size.Z; siz.Z = size.Z;
return new OdePrim(); Quaternion rot = new Quaternion();
rot.w = rotation.w;
rot.x = rotation.x;
rot.y = rotation.y;
rot.z = rotation.z;
OdePrim newPrim = new OdePrim(this, pos, siz, rot);
this._prims.Add(newPrim);
return newPrim;
} }
public override void Simulate(float timeStep) public override void Simulate(float timeStep)
@ -347,15 +355,29 @@ namespace OpenSim.Region.Physics.OdePlugin
public class OdePrim : PhysicsActor public class OdePrim : PhysicsActor
{ {
private PhysicsVector _position; private PhysicsVector _position;
private PhysicsVector _velocity; private PhysicsVector _velocity;
private PhysicsVector _size;
private PhysicsVector _acceleration; private PhysicsVector _acceleration;
private Quaternion _orientation;
private IntPtr BoundingCapsule;
IntPtr capsule_geom;
d.Mass capsule_mass;
public OdePrim() public OdePrim(OdeScene parent_scene, PhysicsVector pos, PhysicsVector size, Quaternion rotation)
{ {
_velocity = new PhysicsVector(); _velocity = new PhysicsVector();
_position = new PhysicsVector(); _position = pos;
_size = size;
_acceleration = new PhysicsVector(); _acceleration = new PhysicsVector();
d.MassSetCapsule(out capsule_mass, 50.0f, 3, 0.5f, 2f);
capsule_geom = d.CreateBox(OdeScene.space, _size.X, _size.Y, _size.Z);
this.BoundingCapsule = d.BodyCreate(OdeScene.world);
d.BodySetMass(BoundingCapsule, ref capsule_mass);
d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);
d.GeomSetBody(capsule_geom, BoundingCapsule);
_orientation = rotation;
} }
public override bool Flying public override bool Flying
{ {
@ -420,12 +442,11 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
get get
{ {
Quaternion res = new Quaternion(); return _orientation;
return res;
} }
set set
{ {
_orientation = value;
} }
} }

2
OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
View File

@ -103,7 +103,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
} }
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
{ {
Vec3 pos = new Vec3(); Vec3 pos = new Vec3();
pos.X = position.X; pos.X = position.X;