aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs3
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs4
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs2
7 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index 3fb30fb..4e96ce0 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
79 { 79 {
80 80
81 } 81 }
82 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 82 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size)
83 { 83 {
84 BasicActor act = new BasicActor(); 84 BasicActor act = new BasicActor();
85 act.Position = position; 85 act.Position = position;
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index f5f222b..8482e4c 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -413,7 +413,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
413 { 413 {
414 414
415 } 415 }
416 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 416 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size)
417 { 417 {
418 PhysicsVector pos = new PhysicsVector(); 418 PhysicsVector pos = new PhysicsVector();
419 pos.X = position.X; 419 pos.X = position.X;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 5f08898..996aed6 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Physics.Manager
60 60
61 public abstract void Initialise(IMesher meshmerizer); 61 public abstract void Initialise(IMesher meshmerizer);
62 62
63 public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position); 63 public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size);
64 64
65 public abstract void RemoveAvatar(PhysicsActor actor); 65 public abstract void RemoveAvatar(PhysicsActor actor);
66 66
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Physics.Manager
95 // Does nothing right now 95 // Does nothing right now
96 } 96 }
97 97
98 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 98 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size)
99 { 99 {
100 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position); 100 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
101 return PhysicsActor.Null; 101 return PhysicsActor.Null;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 0f1446c..c41f812 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Physics.OdePlugin
104 public d.Mass ShellMass; 104 public d.Mass ShellMass;
105 public bool collidelock = false; 105 public bool collidelock = false;
106 106
107 public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode) 107 public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size)
108 { 108 {
109 ode = dode; 109 ode = dode;
110 _velocity = new PhysicsVector(); 110 _velocity = new PhysicsVector();
@@ -131,6 +131,7 @@ namespace OpenSim.Region.Physics.OdePlugin
131 { 131 {
132 m_colliderarr[i] = false; 132 m_colliderarr[i] = false;
133 } 133 }
134 CAPSULE_LENGTH = (size.Z - ((size.Z * 0.52f)));
134 135
135 lock (OdeScene.OdeLock) 136 lock (OdeScene.OdeLock)
136 { 137 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index c4d249d..3817868 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -702,13 +702,13 @@ namespace OpenSim.Region.Physics.OdePlugin
702 } 702 }
703 } 703 }
704 704
705 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 705 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size)
706 { 706 {
707 PhysicsVector pos = new PhysicsVector(); 707 PhysicsVector pos = new PhysicsVector();
708 pos.X = position.X; 708 pos.X = position.X;
709 pos.Y = position.Y; 709 pos.Y = position.Y;
710 pos.Z = position.Z; 710 pos.Z = position.Z;
711 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode); 711 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size);
712 _characters.Add(newAv); 712 _characters.Add(newAv);
713 return newAv; 713 return newAv;
714 } 714 }
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
index bac61f4..6d1bec7 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Physics.POSPlugin
81 { 81 {
82 82
83 } 83 }
84 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 84 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size)
85 { 85 {
86 POSCharacter act = new POSCharacter(); 86 POSCharacter act = new POSCharacter();
87 act.Position = position; 87 act.Position = position;
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index ffa0838..970f6fb 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
93 93
94 } 94 }
95 95
96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size)
97 { 97 {
98 Vec3 pos = new Vec3(); 98 Vec3 pos = new Vec3();
99 pos.X = position.X; 99 pos.X = position.X;