aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff options
context:
space:
mode:
authordan miller2007-09-29 03:56:36 +0000
committerdan miller2007-09-29 03:56:36 +0000
commita0265300aa09be0bdd2d4629d6a22394d5b219be (patch)
tree80653af30e29c664e4336896f8df239165073958 /OpenSim/Region/Physics/Manager/PhysicsScene.cs
parent* Restored trunk (diff)
downloadopensim-SC_OLD-a0265300aa09be0bdd2d4629d6a22394d5b219be.zip
opensim-SC_OLD-a0265300aa09be0bdd2d4629d6a22394d5b219be.tar.gz
opensim-SC_OLD-a0265300aa09be0bdd2d4629d6a22394d5b219be.tar.bz2
opensim-SC_OLD-a0265300aa09be0bdd2d4629d6a22394d5b219be.tar.xz
Hollow prims (box only), thanks Gerard! Enjoy
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs14
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 9e3f6ea..bd06fa1 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,6 +25,7 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using OpenSim.Framework.Types;
28using OpenSim.Framework.Console; 29using OpenSim.Framework.Console;
29using Axiom.Math; 30using Axiom.Math;
30 31
@@ -40,13 +41,13 @@ namespace OpenSim.Region.Physics.Manager
40 } 41 }
41 } 42 }
42 43
43 public abstract PhysicsActor AddAvatar(PhysicsVector position); 44 public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position);
44 45
45 public abstract void RemoveAvatar(PhysicsActor actor); 46 public abstract void RemoveAvatar(PhysicsActor actor);
46 47
47 public abstract void RemovePrim(PhysicsActor prim); 48 public abstract void RemovePrim(PhysicsActor prim);
48 49
49 public abstract PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation); 50 public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation);
50 51
51 public abstract void Simulate(float timeStep); 52 public abstract void Simulate(float timeStep);
52 53
@@ -65,7 +66,7 @@ namespace OpenSim.Region.Physics.Manager
65 { 66 {
66 private static int m_workIndicator; 67 private static int m_workIndicator;
67 68
68 public override PhysicsActor AddAvatar(PhysicsVector position) 69 public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
69 { 70 {
70 MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); 71 MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
71 return PhysicsActor.Null; 72 return PhysicsActor.Null;
@@ -81,11 +82,18 @@ namespace OpenSim.Region.Physics.Manager
81 82
82 } 83 }
83 84
85/*
84 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 86 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
85 { 87 {
86 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); 88 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
87 return PhysicsActor.Null; 89 return PhysicsActor.Null;
88 } 90 }
91*/
92 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation)
93 {
94 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
95 return PhysicsActor.Null;
96 }
89 97
90 public override void Simulate(float timeStep) 98 public override void Simulate(float timeStep)
91 { 99 {