diff options
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 134 | ||||
-rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 599040 -> 551424 bytes | |||
-rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2778687 -> 1707213 bytes | |||
-rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 765440 -> 699904 bytes | |||
-rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 3034072 -> 1844124 bytes |
5 files changed, 0 insertions, 134 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 07149d8..28fae13 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
@@ -429,140 +429,6 @@ static class BulletSimAPI { | |||
429 | [UnmanagedFunctionPointer(CallingConvention.Cdecl)] | 429 | [UnmanagedFunctionPointer(CallingConvention.Cdecl)] |
430 | public delegate void DebugLogCallback([MarshalAs(UnmanagedType.LPStr)]string msg); | 430 | public delegate void DebugLogCallback([MarshalAs(UnmanagedType.LPStr)]string msg); |
431 | 431 | ||
432 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
433 | [return: MarshalAs(UnmanagedType.LPStr)] | ||
434 | public static extern string GetVersion(); | ||
435 | |||
436 | /* Remove the linkage to the old api methods | ||
437 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
438 | public static extern uint Initialize(Vector3 maxPosition, IntPtr parms, | ||
439 | int maxCollisions, IntPtr collisionArray, | ||
440 | int maxUpdates, IntPtr updateArray, | ||
441 | DebugLogCallback logRoutine); | ||
442 | |||
443 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
444 | public static extern void CreateInitialGroundPlaneAndTerrain(uint worldID); | ||
445 | |||
446 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
447 | public static extern void SetHeightmap(uint worldID, [MarshalAs(UnmanagedType.LPArray)] float[] heightMap); | ||
448 | |||
449 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
450 | public static extern void Shutdown(uint worldID); | ||
451 | |||
452 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
453 | public static extern bool UpdateParameter(uint worldID, uint localID, | ||
454 | [MarshalAs(UnmanagedType.LPStr)]string paramCode, float value); | ||
455 | |||
456 | // =============================================================================== | ||
457 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
458 | public static extern int PhysicsStep(uint worldID, float timeStep, int maxSubSteps, float fixedTimeStep, | ||
459 | out int updatedEntityCount, | ||
460 | out IntPtr updatedEntitiesPtr, | ||
461 | out int collidersCount, | ||
462 | out IntPtr collidersPtr); | ||
463 | |||
464 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
465 | public static extern bool CreateHull(uint worldID, System.UInt64 meshKey, | ||
466 | int hullCount, [MarshalAs(UnmanagedType.LPArray)] float[] hulls | ||
467 | ); | ||
468 | |||
469 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
470 | public static extern bool CreateMesh(uint worldID, System.UInt64 meshKey, | ||
471 | int indexCount, [MarshalAs(UnmanagedType.LPArray)] int[] indices, | ||
472 | int verticesCount, [MarshalAs(UnmanagedType.LPArray)] float[] vertices | ||
473 | ); | ||
474 | |||
475 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
476 | public static extern bool DestroyHull(uint worldID, System.UInt64 meshKey); | ||
477 | |||
478 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
479 | public static extern bool DestroyMesh(uint worldID, System.UInt64 meshKey); | ||
480 | |||
481 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
482 | public static extern bool CreateObject(uint worldID, ShapeData shapeData); | ||
483 | |||
484 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
485 | public static extern Vector3 GetObjectPosition(uint WorldID, uint id); | ||
486 | |||
487 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
488 | public static extern Quaternion GetObjectOrientation(uint WorldID, uint id); | ||
489 | |||
490 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
491 | public static extern bool SetObjectTranslation(uint worldID, uint id, Vector3 position, Quaternion rotation); | ||
492 | |||
493 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
494 | public static extern bool SetObjectVelocity(uint worldID, uint id, Vector3 velocity); | ||
495 | |||
496 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
497 | public static extern bool SetObjectAngularVelocity(uint worldID, uint id, Vector3 angularVelocity); | ||
498 | |||
499 | // Set the current force acting on the object | ||
500 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
501 | public static extern bool SetObjectForce(uint worldID, uint id, Vector3 force); | ||
502 | |||
503 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
504 | public static extern bool SetObjectScaleMass(uint worldID, uint id, Vector3 scale, float mass, bool isDynamic); | ||
505 | |||
506 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
507 | public static extern bool SetObjectCollidable(uint worldID, uint id, bool phantom); | ||
508 | |||
509 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
510 | public static extern bool SetObjectDynamic(uint worldID, uint id, bool isDynamic, float mass); | ||
511 | |||
512 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
513 | public static extern bool SetObjectGhost(uint worldID, uint id, bool ghostly); | ||
514 | |||
515 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
516 | public static extern bool SetObjectProperties(uint worldID, uint id, bool isStatic, bool isSolid, bool genCollisions, float mass); | ||
517 | |||
518 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
519 | public static extern bool SetObjectBuoyancy(uint worldID, uint id, float buoyancy); | ||
520 | |||
521 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
522 | public static extern bool HasObject(uint worldID, uint id); | ||
523 | |||
524 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
525 | public static extern bool DestroyObject(uint worldID, uint id); | ||
526 | |||
527 | // =============================================================================== | ||
528 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
529 | public static extern SweepHit ConvexSweepTest(uint worldID, uint id, Vector3 to, float extraMargin); | ||
530 | |||
531 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
532 | public static extern RaycastHit RayTest(uint worldID, uint id, Vector3 from, Vector3 to); | ||
533 | |||
534 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
535 | public static extern Vector3 RecoverFromPenetration(uint worldID, uint id); | ||
536 | |||
537 | // =============================================================================== | ||
538 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
539 | public static extern void DumpBulletStatistics(); | ||
540 | */ | ||
541 | // Log a debug message | ||
542 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
543 | public static extern void SetDebugLogCallback(DebugLogCallback callback); | ||
544 | |||
545 | // =============================================================================== | ||
546 | // =============================================================================== | ||
547 | // =============================================================================== | ||
548 | // A new version of the API that enables moving all the logic out of the C++ code and into | ||
549 | // the C# code. This will make modifications easier for the next person. | ||
550 | // This interface passes the actual pointers to the objects in the unmanaged | ||
551 | // address space. All the management (calls for creation/destruction/lookup) | ||
552 | // is done in the C# code. | ||
553 | // The names have a "2" tacked on. This will be removed as the C# code gets rebuilt | ||
554 | // and the old code is removed. | ||
555 | |||
556 | // Functions use while converting from API1 to API2. Can be removed when totally converted. | ||
557 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
558 | public static extern IntPtr GetSimHandle2(uint worldID); | ||
559 | |||
560 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
561 | public static extern IntPtr GetBodyHandleWorldID2(uint worldID, uint id); | ||
562 | |||
563 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | ||
564 | public static extern IntPtr GetBodyHandle2(IntPtr world, uint id); | ||
565 | |||
566 | // =============================================================================== | 432 | // =============================================================================== |
567 | // Initialization and simulation | 433 | // Initialization and simulation |
568 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] | 434 | [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity] |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 51526a7..9c8cf00 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 8bb9d10..0277cf1 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
Binary files differ | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 1a07d6a..5675ff3 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index bbdd380..49396a8 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
Binary files differ | |||