diff options
author | Robert Adams | 2013-04-29 07:54:50 -0700 |
---|---|---|
committer | Robert Adams | 2013-04-29 07:54:50 -0700 |
commit | 92ee288d666963aae2a058cc964be009a504f084 (patch) | |
tree | 8c18c28f2ca757c6883c4c5d3b82e06d47962ee2 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |
parent | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_phys... (diff) | |
download | opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.zip opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.tar.gz opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.tar.bz2 opensim-SC_OLD-92ee288d666963aae2a058cc964be009a504f084.tar.xz |
BulletSim: remove trailing white space to make git happier. No functional changes.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index bfeec24..3378c93 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -298,7 +298,7 @@ public abstract class BSAPITemplate | |||
298 | { | 298 | { |
299 | // Returns the name of the underlying Bullet engine | 299 | // Returns the name of the underlying Bullet engine |
300 | public abstract string BulletEngineName { get; } | 300 | public abstract string BulletEngineName { get; } |
301 | public abstract string BulletEngineVersion { get; protected set;} | 301 | public abstract string BulletEngineVersion { get; protected set;} |
302 | 302 | ||
303 | // Initialization and simulation | 303 | // Initialization and simulation |
304 | public abstract BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms, | 304 | public abstract BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms, |
@@ -373,7 +373,7 @@ public abstract void DestroyObject(BulletWorld sim, BulletBody obj); | |||
373 | // ===================================================================================== | 373 | // ===================================================================================== |
374 | public abstract BulletShape CreateGroundPlaneShape(UInt32 id, float height, float collisionMargin); | 374 | public abstract BulletShape CreateGroundPlaneShape(UInt32 id, float height, float collisionMargin); |
375 | 375 | ||
376 | public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap, | 376 | public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap, |
377 | float scaleFactor, float collisionMargin); | 377 | float scaleFactor, float collisionMargin); |
378 | 378 | ||
379 | // ===================================================================================== | 379 | // ===================================================================================== |
@@ -388,7 +388,7 @@ public abstract BulletConstraint Create6DofConstraintToPoint(BulletWorld world, | |||
388 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies); | 388 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies); |
389 | 389 | ||
390 | public abstract BulletConstraint Create6DofConstraintFixed(BulletWorld world, BulletBody obj1, | 390 | public abstract BulletConstraint Create6DofConstraintFixed(BulletWorld world, BulletBody obj1, |
391 | Vector3 frameInBloc, Quaternion frameInBrot, | 391 | Vector3 frameInBloc, Quaternion frameInBrot, |
392 | bool useLinearReferenceFrameB, bool disableCollisionsBetweenLinkedBodies); | 392 | bool useLinearReferenceFrameB, bool disableCollisionsBetweenLinkedBodies); |
393 | 393 | ||
394 | public abstract BulletConstraint Create6DofSpringConstraint(BulletWorld world, BulletBody obj1, BulletBody obj2, | 394 | public abstract BulletConstraint Create6DofSpringConstraint(BulletWorld world, BulletBody obj1, BulletBody obj2, |