aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs56
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs22
2 files changed, 50 insertions, 28 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index baf5a5b..e0f16d6 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -160,7 +160,7 @@ public class ExtendedPhysics : INonSharedRegionModule
160 } 160 }
161 161
162 [ScriptConstant] 162 [ScriptConstant]
163 public static int PHYS_CENTER_OF_MASS = 1 << 0; 163 public const int PHYS_CENTER_OF_MASS = 1 << 0;
164 164
165 [ScriptInvocation] 165 [ScriptInvocation]
166 public string physGetEngineType(UUID hostID, UUID scriptID) 166 public string physGetEngineType(UUID hostID, UUID scriptID)
@@ -176,11 +176,11 @@ public class ExtendedPhysics : INonSharedRegionModule
176 } 176 }
177 177
178 [ScriptConstant] 178 [ScriptConstant]
179 public static int PHYS_LINKSET_TYPE_CONSTRAINT = 0; 179 public const int PHYS_LINKSET_TYPE_CONSTRAINT = 0;
180 [ScriptConstant] 180 [ScriptConstant]
181 public static int PHYS_LINKSET_TYPE_COMPOUND = 1; 181 public const int PHYS_LINKSET_TYPE_COMPOUND = 1;
182 [ScriptConstant] 182 [ScriptConstant]
183 public static int PHYS_LINKSET_TYPE_MANUAL = 2; 183 public const int PHYS_LINKSET_TYPE_MANUAL = 2;
184 184
185 [ScriptInvocation] 185 [ScriptInvocation]
186 public int physSetLinksetType(UUID hostID, UUID scriptID, int linksetType) 186 public int physSetLinksetType(UUID hostID, UUID scriptID, int linksetType)
@@ -292,15 +292,15 @@ public class ExtendedPhysics : INonSharedRegionModule
292 } 292 }
293 293
294 [ScriptConstant] 294 [ScriptConstant]
295 public static int PHYS_LINK_TYPE_FIXED = 1234; 295 public const int PHYS_LINK_TYPE_FIXED = 1234;
296 [ScriptConstant] 296 [ScriptConstant]
297 public static int PHYS_LINK_TYPE_HINGE = 4; 297 public const int PHYS_LINK_TYPE_HINGE = 4;
298 [ScriptConstant] 298 [ScriptConstant]
299 public static int PHYS_LINK_TYPE_SPRING = 9; 299 public const int PHYS_LINK_TYPE_SPRING = 9;
300 [ScriptConstant] 300 [ScriptConstant]
301 public static int PHYS_LINK_TYPE_6DOF = 6; 301 public const int PHYS_LINK_TYPE_6DOF = 6;
302 [ScriptConstant] 302 [ScriptConstant]
303 public static int PHYS_LINK_TYPE_SLIDER = 7; 303 public const int PHYS_LINK_TYPE_SLIDER = 7;
304 304
305 // physChangeLinkType(integer linkNum, integer typeCode) 305 // physChangeLinkType(integer linkNum, integer typeCode)
306 [ScriptInvocation] 306 [ScriptInvocation]
@@ -341,42 +341,42 @@ public class ExtendedPhysics : INonSharedRegionModule
341 341
342 // Code for specifying params. 342 // Code for specifying params.
343 // The choice if 14400 is arbitrary and only serves to catch parameter code misuse. 343 // The choice if 14400 is arbitrary and only serves to catch parameter code misuse.
344 public static int PHYS_PARAM_MIN = 14401; 344 public const int PHYS_PARAM_MIN = 14401;
345 [ScriptConstant] 345 [ScriptConstant]
346 public static int PHYS_PARAM_FRAMEINA_LOC = 14401; 346 public const int PHYS_PARAM_FRAMEINA_LOC = 14401;
347 [ScriptConstant] 347 [ScriptConstant]
348 public static int PHYS_PARAM_FRAMEINA_ROT = 14402; 348 public const int PHYS_PARAM_FRAMEINA_ROT = 14402;
349 [ScriptConstant] 349 [ScriptConstant]
350 public static int PHYS_PARAM_FRAMEINB_LOC = 14403; 350 public const int PHYS_PARAM_FRAMEINB_LOC = 14403;
351 [ScriptConstant] 351 [ScriptConstant]
352 public static int PHYS_PARAM_FRAMEINB_ROT = 14404; 352 public const int PHYS_PARAM_FRAMEINB_ROT = 14404;
353 [ScriptConstant] 353 [ScriptConstant]
354 public static int PHYS_PARAM_LINEAR_LIMIT_LOW = 14405; 354 public const int PHYS_PARAM_LINEAR_LIMIT_LOW = 14405;
355 [ScriptConstant] 355 [ScriptConstant]
356 public static int PHYS_PARAM_LINEAR_LIMIT_HIGH = 14406; 356 public const int PHYS_PARAM_LINEAR_LIMIT_HIGH = 14406;
357 [ScriptConstant] 357 [ScriptConstant]
358 public static int PHYS_PARAM_ANGULAR_LIMIT_LOW = 14407; 358 public const int PHYS_PARAM_ANGULAR_LIMIT_LOW = 14407;
359 [ScriptConstant] 359 [ScriptConstant]
360 public static int PHYS_PARAM_ANGULAR_LIMIT_HIGH = 14408; 360 public const int PHYS_PARAM_ANGULAR_LIMIT_HIGH = 14408;
361 [ScriptConstant] 361 [ScriptConstant]
362 public static int PHYS_PARAM_USE_FRAME_OFFSET = 14409; 362 public const int PHYS_PARAM_USE_FRAME_OFFSET = 14409;
363 [ScriptConstant] 363 [ScriptConstant]
364 public static int PHYS_PARAM_ENABLE_TRANSMOTOR = 14410; 364 public const int PHYS_PARAM_ENABLE_TRANSMOTOR = 14410;
365 [ScriptConstant] 365 [ScriptConstant]
366 public static int PHYS_PARAM_TRANSMOTOR_MAXVEL = 14411; 366 public const int PHYS_PARAM_TRANSMOTOR_MAXVEL = 14411;
367 [ScriptConstant] 367 [ScriptConstant]
368 public static int PHYS_PARAM_TRANSMOTOR_MAXFORCE = 14412; 368 public const int PHYS_PARAM_TRANSMOTOR_MAXFORCE = 14412;
369 [ScriptConstant] 369 [ScriptConstant]
370 public static int PHYS_PARAM_CFM = 14413; 370 public const int PHYS_PARAM_CFM = 14413;
371 [ScriptConstant] 371 [ScriptConstant]
372 public static int PHYS_PARAM_ERP = 14414; 372 public const int PHYS_PARAM_ERP = 14414;
373 [ScriptConstant] 373 [ScriptConstant]
374 public static int PHYS_PARAM_SOLVER_ITERATIONS = 14415; 374 public const int PHYS_PARAM_SOLVER_ITERATIONS = 14415;
375 [ScriptConstant] 375 [ScriptConstant]
376 public static int PHYS_PARAM_SPRING_DAMPING = 14416; 376 public const int PHYS_PARAM_SPRING_DAMPING = 14416;
377 [ScriptConstant] 377 [ScriptConstant]
378 public static int PHYS_PARAM_SPRING_STIFFNESS = 14417; 378 public const int PHYS_PARAM_SPRING_STIFFNESS = 14417;
379 public static int PHYS_PARAM_MAX = 14417; 379 public const int PHYS_PARAM_MAX = 14417;
380 380
381 // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...]) 381 // physChangeLinkParams(integer linkNum, [ PHYS_PARAM_*, value, PHYS_PARAM_*, value, ...])
382 [ScriptInvocation] 382 [ScriptInvocation]
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index c09dd42..b72afc0 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -530,6 +530,28 @@ public sealed class BSLinksetConstraints : BSLinkset
530 } 530 }
531 break; 531 break;
532 case ExtendedPhysics.PhysFunctChangeLinkParams: 532 case ExtendedPhysics.PhysFunctChangeLinkParams:
533 int setParam = 2;
534 switch (setParam)
535 {
536 case ExtendedPhysics.PHYS_PARAM_FRAMEINA_LOC:
537 case ExtendedPhysics.PHYS_PARAM_FRAMEINA_ROT:
538 case ExtendedPhysics.PHYS_PARAM_FRAMEINB_LOC:
539 case ExtendedPhysics.PHYS_PARAM_FRAMEINB_ROT:
540 case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_LOW:
541 case ExtendedPhysics.PHYS_PARAM_LINEAR_LIMIT_HIGH:
542 case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_LOW:
543 case ExtendedPhysics.PHYS_PARAM_ANGULAR_LIMIT_HIGH:
544 case ExtendedPhysics.PHYS_PARAM_USE_FRAME_OFFSET:
545 case ExtendedPhysics.PHYS_PARAM_ENABLE_TRANSMOTOR:
546 case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXVEL:
547 case ExtendedPhysics.PHYS_PARAM_TRANSMOTOR_MAXFORCE:
548 case ExtendedPhysics.PHYS_PARAM_CFM:
549 case ExtendedPhysics.PHYS_PARAM_ERP:
550 case ExtendedPhysics.PHYS_PARAM_SOLVER_ITERATIONS:
551 case ExtendedPhysics.PHYS_PARAM_SPRING_DAMPING:
552 case ExtendedPhysics.PHYS_PARAM_SPRING_STIFFNESS:
553 break;
554 }
533 break; 555 break;
534 default: 556 default:
535 ret = base.Extension(pFunct, pParams); 557 ret = base.Extension(pFunct, pParams);