aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BasicPhysicsPlugin
diff options
context:
space:
mode:
authordarok2007-11-03 10:25:43 +0000
committerdarok2007-11-03 10:25:43 +0000
commitf8e0cf0f1de3cabded7bce2e438cc37ce4bb989c (patch)
treefa9f855fc58616c24bdeed613f7f7edef395ee85 /OpenSim/Region/Physics/BasicPhysicsPlugin
parentAdded temporary try catch to udpserver while testing something out (will remo... (diff)
downloadopensim-SC-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.zip
opensim-SC-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.tar.gz
opensim-SC-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.tar.bz2
opensim-SC-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.tar.xz
Changes in BulletXPlugin: Added new class BulletXActor class inherits from PhysicsActor and it's the ancestor for BulletXCharacter and BulletXPrim.Physical modifications: Changes for pass the value of Physical flag in the SceneObjectPart class to the Physics engines. New call for AddPrimShape so it has a new parameter called "isPhysical". The old call will be obselete soon (i believe). PhysActor and its descendants have a new property called IsPhysical. By the way no new special funcionallity added. It's more like preparing the way for new modifications.
Diffstat (limited to 'OpenSim/Region/Physics/BasicPhysicsPlugin')
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index f26b9a1..7c2bbf4 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -101,9 +101,14 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
101 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, 101 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
102 PhysicsVector size, Quaternion rotation) 102 PhysicsVector size, Quaternion rotation)
103 { 103 {
104 return null; 104 return this.AddPrimShape(primName, pbs, position, size, rotation, false);
105 } 105 }
106 106
107 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
108 PhysicsVector size, Quaternion rotation, bool isPhysical)
109 {
110 return null;
111 }
107 112
108 public override void Simulate(float timeStep) 113 public override void Simulate(float timeStep)
109 { 114 {
@@ -186,6 +191,12 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
186 _acceleration = new PhysicsVector(); 191 _acceleration = new PhysicsVector();
187 } 192 }
188 193
194 public override bool IsPhysical
195 {
196 get { return false; }
197 set { return; }
198 }
199
189 public override bool Flying 200 public override bool Flying
190 { 201 {
191 get { return flying; } 202 get { return flying; }