diff options
author | Robert Adams | 2012-12-21 13:35:44 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-21 13:35:44 -0800 |
commit | ae4d932e7f00e781db9c9cdd5c29efc51e2425fb (patch) | |
tree | b03beb291cd35d4227fb82baf04ce14512b859eb /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | BulletSim: small fix to avatar movement motor use which keeps avatar from fly... (diff) | |
download | opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.zip opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.tar.gz opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.tar.bz2 opensim-SC_OLD-ae4d932e7f00e781db9c9cdd5c29efc51e2425fb.tar.xz |
BulletSim: Move all the parameter variables, tables and get and fetch logic to a separate, static class for easier addition and to remove all that bulk from the BSScene class.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 962b540..7857eaa 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -141,6 +141,8 @@ public struct EntityProperties | |||
141 | } | 141 | } |
142 | 142 | ||
143 | // Format of this structure must match the definition in the C++ code | 143 | // Format of this structure must match the definition in the C++ code |
144 | // NOTE: adding the X causes compile breaks if used. These are unused symbols | ||
145 | // that can be removed from both here and the unmanaged definition of this structure. | ||
144 | [StructLayout(LayoutKind.Sequential)] | 146 | [StructLayout(LayoutKind.Sequential)] |
145 | public struct ConfigurationParameters | 147 | public struct ConfigurationParameters |
146 | { | 148 | { |
@@ -150,31 +152,31 @@ public struct ConfigurationParameters | |||
150 | public float collisionMargin; | 152 | public float collisionMargin; |
151 | public float gravity; | 153 | public float gravity; |
152 | 154 | ||
153 | public float linearDamping; | 155 | public float XlinearDamping; |
154 | public float angularDamping; | 156 | public float XangularDamping; |
155 | public float deactivationTime; | 157 | public float XdeactivationTime; |
156 | public float linearSleepingThreshold; | 158 | public float XlinearSleepingThreshold; |
157 | public float angularSleepingThreshold; | 159 | public float XangularSleepingThreshold; |
158 | public float ccdMotionThreshold; | 160 | public float XccdMotionThreshold; |
159 | public float ccdSweptSphereRadius; | 161 | public float XccdSweptSphereRadius; |
160 | public float contactProcessingThreshold; | 162 | public float XcontactProcessingThreshold; |
161 | 163 | ||
162 | public float terrainImplementation; | 164 | public float XterrainImplementation; |
163 | public float terrainFriction; | 165 | public float XterrainFriction; |
164 | public float terrainHitFraction; | 166 | public float XterrainHitFraction; |
165 | public float terrainRestitution; | 167 | public float XterrainRestitution; |
166 | public float terrainCollisionMargin; | 168 | public float XterrainCollisionMargin; |
167 | 169 | ||
168 | public float avatarFriction; | 170 | public float XavatarFriction; |
169 | public float avatarStandingFriction; | 171 | public float XavatarStandingFriction; |
170 | public float avatarDensity; | 172 | public float XavatarDensity; |
171 | public float avatarRestitution; | 173 | public float XavatarRestitution; |
172 | public float avatarCapsuleWidth; | 174 | public float XavatarCapsuleWidth; |
173 | public float avatarCapsuleDepth; | 175 | public float XavatarCapsuleDepth; |
174 | public float avatarCapsuleHeight; | 176 | public float XavatarCapsuleHeight; |
175 | public float avatarContactProcessingThreshold; | 177 | public float XavatarContactProcessingThreshold; |
176 | 178 | ||
177 | public float vehicleAngularDamping; | 179 | public float XvehicleAngularDamping; |
178 | 180 | ||
179 | public float maxPersistantManifoldPoolSize; | 181 | public float maxPersistantManifoldPoolSize; |
180 | public float maxCollisionAlgorithmPoolSize; | 182 | public float maxCollisionAlgorithmPoolSize; |
@@ -185,14 +187,14 @@ public struct ConfigurationParameters | |||
185 | public float shouldEnableFrictionCaching; | 187 | public float shouldEnableFrictionCaching; |
186 | public float numberOfSolverIterations; | 188 | public float numberOfSolverIterations; |
187 | 189 | ||
188 | public float linksetImplementation; | 190 | public float XlinksetImplementation; |
189 | public float linkConstraintUseFrameOffset; | 191 | public float XlinkConstraintUseFrameOffset; |
190 | public float linkConstraintEnableTransMotor; | 192 | public float XlinkConstraintEnableTransMotor; |
191 | public float linkConstraintTransMotorMaxVel; | 193 | public float XlinkConstraintTransMotorMaxVel; |
192 | public float linkConstraintTransMotorMaxForce; | 194 | public float XlinkConstraintTransMotorMaxForce; |
193 | public float linkConstraintERP; | 195 | public float XlinkConstraintERP; |
194 | public float linkConstraintCFM; | 196 | public float XlinkConstraintCFM; |
195 | public float linkConstraintSolverIterations; | 197 | public float XlinkConstraintSolverIterations; |
196 | 198 | ||
197 | public float physicsLoggingFrames; | 199 | public float physicsLoggingFrames; |
198 | 200 | ||