diff options
author | Robert Adams | 2013-08-16 13:44:31 -0700 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-20 21:02:50 +0100 |
commit | fd3e267ec65249d323ac69c74699fbb74446cb81 (patch) | |
tree | 1a215460aca2a6427de66e0d88eda78a275ae719 /OpenSim/Region/OptionalModules | |
parent | BulletSim: update DLLs and SOs with Bullet svn version 2644 (no major fixes) ... (diff) | |
download | opensim-SC_OLD-fd3e267ec65249d323ac69c74699fbb74446cb81.zip opensim-SC_OLD-fd3e267ec65249d323ac69c74699fbb74446cb81.tar.gz opensim-SC_OLD-fd3e267ec65249d323ac69c74699fbb74446cb81.tar.bz2 opensim-SC_OLD-fd3e267ec65249d323ac69c74699fbb74446cb81.tar.xz |
BulletSim: add extended physics function physGetLinkType(linkNum). Add implementation of physChangeLinkParams() in BSLinksetConstraint.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rwxr-xr-x | OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs index e0f16d6..d035f7b 100755 --- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs +++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs | |||
@@ -64,6 +64,7 @@ public class ExtendedPhysics : INonSharedRegionModule | |||
64 | public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType"; | 64 | public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType"; |
65 | public const string PhysFunctChangeLinkFixed = "BulletSim.ChangeLinkFixed"; | 65 | public const string PhysFunctChangeLinkFixed = "BulletSim.ChangeLinkFixed"; |
66 | public const string PhysFunctChangeLinkType = "BulletSim.ChangeLinkType"; | 66 | public const string PhysFunctChangeLinkType = "BulletSim.ChangeLinkType"; |
67 | public const string PhysFunctGetLinkType = "BulletSim.GetLinkType"; | ||
67 | public const string PhysFunctChangeLinkParams = "BulletSim.ChangeLinkParams"; | 68 | public const string PhysFunctChangeLinkParams = "BulletSim.ChangeLinkParams"; |
68 | 69 | ||
69 | // ============================================================= | 70 | // ============================================================= |
@@ -320,6 +321,24 @@ public class ExtendedPhysics : INonSharedRegionModule | |||
320 | return ret; | 321 | return ret; |
321 | } | 322 | } |
322 | 323 | ||
324 | // physGetLinkType(integer linkNum) | ||
325 | [ScriptInvocation] | ||
326 | public int physGetLinkType(UUID hostID, UUID scriptID, int linkNum, int typeCode) | ||
327 | { | ||
328 | int ret = -1; | ||
329 | if (!Enabled) return ret; | ||
330 | |||
331 | PhysicsActor rootPhysActor; | ||
332 | PhysicsActor childPhysActor; | ||
333 | |||
334 | if (GetRootAndChildPhysActors(hostID, linkNum, out rootPhysActor, out childPhysActor)) | ||
335 | { | ||
336 | ret = MakeIntError(rootPhysActor.Extension(PhysFunctGetLinkType, childPhysActor)); | ||
337 | } | ||
338 | |||
339 | return ret; | ||
340 | } | ||
341 | |||
323 | // physChangeLinkFixed(integer linkNum) | 342 | // physChangeLinkFixed(integer linkNum) |
324 | // Change the link between the root and the linkNum into a fixed, static physical connection. | 343 | // Change the link between the root and the linkNum into a fixed, static physical connection. |
325 | [ScriptInvocation] | 344 | [ScriptInvocation] |