diff options
author | Robert Adams | 2013-08-20 08:14:08 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-11 09:12:02 -0700 |
commit | 4781297b4ee5908b76039ce3b38291eb2e89e157 (patch) | |
tree | 02eda7c6afb4137afbffacb82dc1507a778ffe0f /OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |
parent | BulletSim: adjust avatar capsule height calculation to be closer to defined S... (diff) | |
download | opensim-SC_OLD-4781297b4ee5908b76039ce3b38291eb2e89e157.zip opensim-SC_OLD-4781297b4ee5908b76039ce3b38291eb2e89e157.tar.gz opensim-SC_OLD-4781297b4ee5908b76039ce3b38291eb2e89e157.tar.bz2 opensim-SC_OLD-4781297b4ee5908b76039ce3b38291eb2e89e157.tar.xz |
BulletSim: Extension parameters passed through the classes made to pass just and array of objects rather than a mixture of parameters and array. Makes understanding and parsing what is being passed much easier.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs index 28ea8c0..531f8fb 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |||
@@ -283,17 +283,20 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
283 | #region Extension | 283 | #region Extension |
284 | public override object Extension(string pFunct, params object[] pParams) | 284 | public override object Extension(string pFunct, params object[] pParams) |
285 | { | 285 | { |
286 | DetailLog("{0} BSPrimLinkable.Extension,op={1},nParam={2}", LocalID, pFunct, pParams.Length); | ||
286 | object ret = null; | 287 | object ret = null; |
287 | switch (pFunct) | 288 | switch (pFunct) |
288 | { | 289 | { |
289 | // physGetLinksetType(); | 290 | // physGetLinksetType(); |
291 | // pParams = [] | ||
290 | case ExtendedPhysics.PhysFunctGetLinksetType: | 292 | case ExtendedPhysics.PhysFunctGetLinksetType: |
291 | { | 293 | { |
292 | ret = (object)LinksetType; | 294 | ret = (object)LinksetType; |
293 | m_log.DebugFormat("{0} Extension.physGetLinksetType, type={1}", LogHeader, ret); | 295 | DetailLog("{0},BSPrimLinkable.Extension.physGetLinksetType,type={1}", LocalID, ret); |
294 | break; | 296 | break; |
295 | } | 297 | } |
296 | // physSetLinksetType(type); | 298 | // physSetLinksetType(type); |
299 | // pParams = [ BSPhysObject child, integer type ] | ||
297 | case ExtendedPhysics.PhysFunctSetLinksetType: | 300 | case ExtendedPhysics.PhysFunctSetLinksetType: |
298 | { | 301 | { |
299 | if (pParams.Length > 0) | 302 | if (pParams.Length > 0) |
@@ -304,8 +307,8 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
304 | PhysScene.TaintedObject("BSPrim.PhysFunctSetLinksetType", delegate() | 307 | PhysScene.TaintedObject("BSPrim.PhysFunctSetLinksetType", delegate() |
305 | { | 308 | { |
306 | // Cause the linkset type to change | 309 | // Cause the linkset type to change |
307 | m_log.DebugFormat("{0} Extension.physSetLinksetType, oldType={1}, newType={2}", | 310 | DetailLog("{0},BSPrimLinkable.Extension.physSetLinksetType, oldType={1},newType={2}", |
308 | LogHeader, Linkset.LinksetImpl, linksetType); | 311 | LocalID, Linkset.LinksetImpl, linksetType); |
309 | ConvertLinkset(linksetType); | 312 | ConvertLinkset(linksetType); |
310 | }); | 313 | }); |
311 | } | 314 | } |
@@ -314,21 +317,21 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
314 | break; | 317 | break; |
315 | } | 318 | } |
316 | // physChangeLinkType(linknum, typeCode); | 319 | // physChangeLinkType(linknum, typeCode); |
317 | // Params: PhysActor linkedPrim, int typeCode | 320 | // pParams = [ BSPhysObject child, integer linkType ] |
318 | case ExtendedPhysics.PhysFunctChangeLinkType: | 321 | case ExtendedPhysics.PhysFunctChangeLinkType: |
319 | { | 322 | { |
320 | ret = Linkset.Extension(pFunct, pParams); | 323 | ret = Linkset.Extension(pFunct, pParams); |
321 | break; | 324 | break; |
322 | } | 325 | } |
323 | // physGetLinkType(linknum); | 326 | // physGetLinkType(linknum); |
324 | // Params: PhysActor linkedPrim | 327 | // pParams = [ BSPhysObject child ] |
325 | case ExtendedPhysics.PhysFunctGetLinkType: | 328 | case ExtendedPhysics.PhysFunctGetLinkType: |
326 | { | 329 | { |
327 | ret = Linkset.Extension(pFunct, pParams); | 330 | ret = Linkset.Extension(pFunct, pParams); |
328 | break; | 331 | break; |
329 | } | 332 | } |
330 | // physChangeLinkParams(linknum, [code, value, code, value, ...]); | 333 | // physChangeLinkParams(linknum, [code, value, code, value, ...]); |
331 | // Params: PhysActor linkedPrim, object[] params | 334 | // pParams = [ BSPhysObject child, object[] [ string op, object opParam, string op, object opParam, ... ] ] |
332 | case ExtendedPhysics.PhysFunctChangeLinkParams: | 335 | case ExtendedPhysics.PhysFunctChangeLinkParams: |
333 | { | 336 | { |
334 | ret = Linkset.Extension(pFunct, pParams); | 337 | ret = Linkset.Extension(pFunct, pParams); |