diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-09-13 12:50:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-13 12:50:54 +0400 |
commit | f9694287d9a9a2ca5d031d6fbf4aa05045944ecc (patch) | |
tree | fce5ed31decd6cd98aa25d3a35e1c116b98bcd6a /source/gameengine/Ketsji/KX_NearSensor.cpp | |
parent | 7eea0b647cbfa7cadec14b07b696bf10830189e8 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.4 -r23172:HEAD
merging now to save confusion later since the changes between last merge and 23172 shouldn't be merged.
brings 2.4 and trunk in sync aside from sequencer edits from Peter.
Diffstat (limited to 'source/gameengine/Ketsji/KX_NearSensor.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp index f7baacdfa61..c6a6304cb2c 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.cpp +++ b/source/gameengine/Ketsji/KX_NearSensor.cpp @@ -142,6 +142,22 @@ KX_NearSensor::~KX_NearSensor() delete m_client_info; } +void KX_NearSensor::SetPhysCtrlRadius() +{ + if (m_bTriggered) + { + if (m_physCtrl) + { + m_physCtrl->SetRadius(m_ResetMargin); + } + } else + { + if (m_physCtrl) + { + m_physCtrl->SetRadius(m_Margin); + } + } +} bool KX_NearSensor::Evaluate() { @@ -151,20 +167,9 @@ bool KX_NearSensor::Evaluate() if (m_bTriggered != m_bLastTriggered) { m_bLastTriggered = m_bTriggered; - if (m_bTriggered) - { - if (m_physCtrl) - { - m_physCtrl->SetRadius(m_ResetMargin); - } - } else - { - if (m_physCtrl) - { - m_physCtrl->SetRadius(m_Margin); - } - - } + + SetPhysCtrlRadius(); + result = true; } |