diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 86fc9d2..c016402 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -363,7 +363,7 @@ public static extern IntPtr GetSimHandle2(uint worldID); | |||
363 | public static extern IntPtr GetBodyHandleWorldID2(uint worldID, uint id); | 363 | public static extern IntPtr GetBodyHandleWorldID2(uint worldID, uint id); |
364 | 364 | ||
365 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 365 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
366 | public static extern IntPtr GetBodyHandle2(IntPtr sim, uint id); | 366 | public static extern IntPtr GetBodyHandle2(IntPtr world, uint id); |
367 | 367 | ||
368 | // =============================================================================== | 368 | // =============================================================================== |
369 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 369 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
@@ -372,40 +372,43 @@ public static extern IntPtr Initialize2(Vector3 maxPosition, IntPtr parms, | |||
372 | int maxUpdates, IntPtr updateArray); | 372 | int maxUpdates, IntPtr updateArray); |
373 | 373 | ||
374 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 374 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
375 | public static extern bool UpdateParameter2(IntPtr sim, uint localID, String parm, float value); | 375 | public static extern bool UpdateParameter2(IntPtr world, uint localID, String parm, float value); |
376 | 376 | ||
377 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 377 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
378 | public static extern void SetHeightmap2(IntPtr sim, float[] heightmap); | 378 | public static extern void SetHeightmap2(IntPtr world, float[] heightmap); |
379 | 379 | ||
380 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 380 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
381 | public static extern void Shutdown2(IntPtr sim); | 381 | public static extern void Shutdown2(IntPtr sim); |
382 | 382 | ||
383 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 383 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
384 | public static extern int PhysicsStep2(IntPtr sim, float timeStep, int maxSubSteps, float fixedTimeStep, | 384 | public static extern int PhysicsStep2(IntPtr world, float timeStep, int maxSubSteps, float fixedTimeStep, |
385 | out int updatedEntityCount, | 385 | out int updatedEntityCount, |
386 | out IntPtr updatedEntitiesPtr, | 386 | out IntPtr updatedEntitiesPtr, |
387 | out int collidersCount, | 387 | out int collidersCount, |
388 | out IntPtr collidersPtr); | 388 | out IntPtr collidersPtr); |
389 | 389 | ||
390 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
391 | public static extern bool PushUpdate2(IntPtr obj); | ||
392 | |||
390 | /* | 393 | /* |
391 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 394 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
392 | public static extern IntPtr CreateMesh2(IntPtr sim, int indicesCount, int* indices, int verticesCount, float* vertices ); | 395 | public static extern IntPtr CreateMesh2(IntPtr world, int indicesCount, int* indices, int verticesCount, float* vertices ); |
393 | 396 | ||
394 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 397 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
395 | public static extern bool BuildHull2(IntPtr sim, IntPtr mesh); | 398 | public static extern bool BuildHull2(IntPtr world, IntPtr mesh); |
396 | 399 | ||
397 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 400 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
398 | public static extern bool ReleaseHull2(IntPtr sim, IntPtr mesh); | 401 | public static extern bool ReleaseHull2(IntPtr world, IntPtr mesh); |
399 | 402 | ||
400 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 403 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
401 | public static extern bool DestroyMesh2(IntPtr sim, IntPtr mesh); | 404 | public static extern bool DestroyMesh2(IntPtr world, IntPtr mesh); |
402 | 405 | ||
403 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 406 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
404 | public static extern IntPtr CreateObject2(IntPtr sim, ShapeData shapeData); | 407 | public static extern IntPtr CreateObject2(IntPtr world, ShapeData shapeData); |
405 | */ | 408 | */ |
406 | 409 | ||
407 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 410 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
408 | public static extern IntPtr CreateConstraint2(IntPtr sim, IntPtr obj1, IntPtr obj2, | 411 | public static extern IntPtr Create6DofConstraint2(IntPtr world, IntPtr obj1, IntPtr obj2, |
409 | Vector3 frame1loc, Quaternion frame1rot, | 412 | Vector3 frame1loc, Quaternion frame1rot, |
410 | Vector3 frame2loc, Quaternion frame2rot, | 413 | Vector3 frame2loc, Quaternion frame2rot, |
411 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies); | 414 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies); |
@@ -429,7 +432,13 @@ public static extern bool CalculateTransforms2(IntPtr constrain); | |||
429 | public static extern bool SetConstraintParam2(IntPtr constrain, ConstraintParams paramIndex, float value, ConstraintParamAxis axis); | 432 | public static extern bool SetConstraintParam2(IntPtr constrain, ConstraintParams paramIndex, float value, ConstraintParamAxis axis); |
430 | 433 | ||
431 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 434 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
432 | public static extern bool DestroyConstraint2(IntPtr sim, IntPtr constrain); | 435 | public static extern bool DestroyConstraint2(IntPtr world, IntPtr constrain); |
436 | |||
437 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
438 | public static extern Vector3 AddObjectToWorld2(IntPtr world, IntPtr obj); | ||
439 | |||
440 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
441 | public static extern Vector3 RemoveObjectFromWorld2(IntPtr world, IntPtr obj); | ||
433 | 442 | ||
434 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 443 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
435 | public static extern Vector3 GetPosition2(IntPtr obj); | 444 | public static extern Vector3 GetPosition2(IntPtr obj); |
@@ -510,12 +519,6 @@ public static extern bool SetMargin2(IntPtr obj, float val); | |||
510 | public static extern bool UpdateSingleAabb2(IntPtr world, IntPtr obj); | 519 | public static extern bool UpdateSingleAabb2(IntPtr world, IntPtr obj); |
511 | 520 | ||
512 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 521 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
513 | public static extern bool AddObjectToWorld2(IntPtr world, IntPtr obj); | ||
514 | |||
515 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
516 | public static extern bool RemoveObjectFromWorld2(IntPtr world, IntPtr obj); | ||
517 | |||
518 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
519 | public static extern bool DestroyObject2(IntPtr world, uint id); | 522 | public static extern bool DestroyObject2(IntPtr world, uint id); |
520 | 523 | ||
521 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 524 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |