diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs index 62988d0..59b8d65 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | |||
@@ -355,10 +355,6 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
355 | public float bodyPIDD = 35f; | 355 | public float bodyPIDD = 35f; |
356 | public float bodyPIDG = 25; | 356 | public float bodyPIDG = 25; |
357 | 357 | ||
358 | public int geomCrossingFailuresBeforeOutofbounds = 5; | ||
359 | |||
360 | public float bodyMotorJointMaxforceTensor = 2; | ||
361 | |||
362 | public int bodyFramesAutoDisable = 20; | 358 | public int bodyFramesAutoDisable = 20; |
363 | 359 | ||
364 | private float[] _watermap; | 360 | private float[] _watermap; |
@@ -626,18 +622,9 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
626 | m_config = config; | 622 | m_config = config; |
627 | // Defaults | 623 | // Defaults |
628 | 624 | ||
629 | if (Environment.OSVersion.Platform == PlatformID.Unix) | 625 | avPIDD = 2200.0f; |
630 | { | 626 | avPIDP = 900.0f; |
631 | avPIDD = 3200.0f; | 627 | avStandupTensor = 550000f; |
632 | avPIDP = 1400.0f; | ||
633 | avStandupTensor = 2000000f; | ||
634 | } | ||
635 | else | ||
636 | { | ||
637 | avPIDD = 2200.0f; | ||
638 | avPIDP = 900.0f; | ||
639 | avStandupTensor = 550000f; | ||
640 | } | ||
641 | 628 | ||
642 | int contactsPerCollision = 80; | 629 | int contactsPerCollision = 80; |
643 | 630 | ||
@@ -685,7 +672,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
685 | mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f); | 672 | mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f); |
686 | 673 | ||
687 | ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", ODE_STEPSIZE); | 674 | ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", ODE_STEPSIZE); |
688 | m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10); | 675 | m_physicsiterations = physicsconfig.GetInt("world_solver_iterations", 10); |
689 | 676 | ||
690 | avDensity = physicsconfig.GetFloat("av_density", 80f); | 677 | avDensity = physicsconfig.GetFloat("av_density", 80f); |
691 | // avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f); | 678 | // avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f); |
@@ -701,7 +688,6 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
701 | 688 | ||
702 | geomContactPointsStartthrottle = physicsconfig.GetInt("geom_contactpoints_start_throttling", 5); | 689 | geomContactPointsStartthrottle = physicsconfig.GetInt("geom_contactpoints_start_throttling", 5); |
703 | geomUpdatesPerThrottledUpdate = physicsconfig.GetInt("geom_updates_before_throttled_update", 15); | 690 | geomUpdatesPerThrottledUpdate = physicsconfig.GetInt("geom_updates_before_throttled_update", 15); |
704 | geomCrossingFailuresBeforeOutofbounds = physicsconfig.GetInt("geom_crossing_failures_before_outofbounds", 5); | ||
705 | 691 | ||
706 | geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", 10.000006836f); | 692 | geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", 10.000006836f); |
707 | bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", 20); | 693 | bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", 20); |
@@ -714,23 +700,10 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
714 | meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f); | 700 | meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f); |
715 | MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f); | 701 | MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f); |
716 | m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false); | 702 | m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false); |
717 | |||
718 | |||
719 | 703 | ||
720 | if (Environment.OSVersion.Platform == PlatformID.Unix) | 704 | avPIDD = physicsconfig.GetFloat("av_pid_derivative", 2200.0f); |
721 | { | 705 | avPIDP = physicsconfig.GetFloat("av_pid_proportional", 900.0f); |
722 | avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 2200.0f); | 706 | avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor", 550000f); |
723 | avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 900.0f); | ||
724 | avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 550000f); | ||
725 | bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 5f); | ||
726 | } | ||
727 | else | ||
728 | { | ||
729 | avPIDD = physicsconfig.GetFloat("av_pid_derivative_win", 2200.0f); | ||
730 | avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", 900.0f); | ||
731 | avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_win", 550000f); | ||
732 | bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_win", 5f); | ||
733 | } | ||
734 | 707 | ||
735 | physics_logging = physicsconfig.GetBoolean("physics_logging", false); | 708 | physics_logging = physicsconfig.GetBoolean("physics_logging", false); |
736 | physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0); | 709 | physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0); |