diff options
author | Robert Adams | 2012-12-29 18:34:46 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-31 19:57:21 -0800 |
commit | 203588e3c0374505a6aa564d8f7a655d968653d7 (patch) | |
tree | 8c4baba73e84f42bbedaca64d5e2ba33bb4e8aa9 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |
parent | Resolve Mantis 6480 (http://opensimulator.org/mantis/view.php?id=6480) (diff) | |
download | opensim-SC-203588e3c0374505a6aa564d8f7a655d968653d7.zip opensim-SC-203588e3c0374505a6aa564d8f7a655d968653d7.tar.gz opensim-SC-203588e3c0374505a6aa564d8f7a655d968653d7.tar.bz2 opensim-SC-203588e3c0374505a6aa564d8f7a655d968653d7.tar.xz |
BulletSim: change physical data structures to classes. Add default
instantiations for PhysBody and PhysShape when BSPhysObject is created
to account for them being classes and not structures.
Update TODO list.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs index 5ad6746..cd5d170 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
35 | // These hold pointers to allocated objects in the unmanaged space. | 35 | // These hold pointers to allocated objects in the unmanaged space. |
36 | 36 | ||
37 | // The physics engine controller class created at initialization | 37 | // The physics engine controller class created at initialization |
38 | public struct BulletWorld | 38 | public class BulletWorld |
39 | { | 39 | { |
40 | public BulletWorld(uint worldId, BSScene bss, IntPtr xx) | 40 | public BulletWorld(uint worldId, BSScene bss, IntPtr xx) |
41 | { | 41 | { |
@@ -50,7 +50,7 @@ public struct BulletWorld | |||
50 | } | 50 | } |
51 | 51 | ||
52 | // An allocated Bullet btRigidBody | 52 | // An allocated Bullet btRigidBody |
53 | public struct BulletBody | 53 | public class BulletBody |
54 | { | 54 | { |
55 | public BulletBody(uint id) : this(id, IntPtr.Zero) | 55 | public BulletBody(uint id) : this(id, IntPtr.Zero) |
56 | { | 56 | { |
@@ -96,9 +96,14 @@ public struct BulletBody | |||
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | public struct BulletShape | 99 | public class BulletShape |
100 | { | 100 | { |
101 | public BulletShape(IntPtr xx) : this(xx, BSPhysicsShapeType.SHAPE_UNKNOWN) | 101 | public BulletShape() |
102 | : this(IntPtr.Zero, BSPhysicsShapeType.SHAPE_UNKNOWN) | ||
103 | { | ||
104 | } | ||
105 | public BulletShape(IntPtr xx) | ||
106 | : this(xx, BSPhysicsShapeType.SHAPE_UNKNOWN) | ||
102 | { | 107 | { |
103 | } | 108 | } |
104 | public BulletShape(IntPtr xx, BSPhysicsShapeType typ) | 109 | public BulletShape(IntPtr xx, BSPhysicsShapeType typ) |
@@ -136,7 +141,7 @@ public struct BulletShape | |||
136 | } | 141 | } |
137 | 142 | ||
138 | // An allocated Bullet btConstraint | 143 | // An allocated Bullet btConstraint |
139 | public struct BulletConstraint | 144 | public class BulletConstraint |
140 | { | 145 | { |
141 | public BulletConstraint(IntPtr xx) | 146 | public BulletConstraint(IntPtr xx) |
142 | { | 147 | { |