diff options
Diffstat (limited to 'src/object/motion')
-rw-r--r-- | src/object/motion/motion.cpp | 2 | ||||
-rw-r--r-- | src/object/motion/motionhuman.cpp | 4 | ||||
-rw-r--r-- | src/object/motion/motiontoto.cpp | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp index 5ffa63c..e0dffc4 100644 --- a/src/object/motion/motion.cpp +++ b/src/object/motion/motion.cpp @@ -99,7 +99,7 @@ bool CMotion::EventProcess(const Event &event) m_engine->RetPause() ) return true; if ( event.event != EVENT_FRAME ) return true; - + m_progress += event.rTime*m_actionTime; if ( m_progress > 1.0f ) m_progress = 1.0f; // (*) diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index 06db454..ba3003a 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -912,7 +912,7 @@ bool CMotionHuman::EventFrame(const Event &event) { armAction = MH_MARCHTAKE; // take walking } - + if ( m_physics->RetLand() ) // on the ground? { a = m_object->RetAngleY(0); @@ -944,7 +944,7 @@ bool CMotionHuman::EventFrame(const Event &event) ar = 0.0f; af = 0.0f; } - + for ( i=0 ; i<4 ; i++ ) // 4 members { if ( m_bArmStop ) // focus? diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index f64570e..7654159 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -605,7 +605,7 @@ bool CMotionToto::EventFrame(const Event &event) pos.z += sinf(m_time*Math::PI*2.11f)*(Math::PI/50.0f)+ sinf(m_time*Math::PI*2.83f)*(Math::PI/70.0f)+ sinf(m_time*Math::PI*3.09f)*(Math::PI/90.0f); - + m_object->SetAngle(4, pos); // left antenna m_object->SetAngle(5, pos); // left antenna m_object->SetAngle(6, pos); // left antenna @@ -623,7 +623,7 @@ bool CMotionToto::EventFrame(const Event &event) pos.z += sinf(m_time*Math::PI*2.05f)*(Math::PI/50.0f)+ sinf(m_time*Math::PI*2.38f)*(Math::PI/70.0f)+ sinf(m_time*Math::PI*2.79f)*(Math::PI/90.0f); - + m_object->SetAngle(7, pos); // right antenna m_object->SetAngle(8, pos); // right antenna m_object->SetAngle(9, pos); // right antenna @@ -716,7 +716,7 @@ bool CMotionToto::EventFrame(const Event &event) m_object->SetAngleX(2, 0.0f); m_object->SetAngleX(3, 0.0f); } - + mat = m_object->RetWorldMatrix(0); // must be done every time! // Generates particles. @@ -741,7 +741,7 @@ bool CMotionToto::EventFrame(const Event &event) speed.y += 5.0f+Math::Rand()*5.0f; speed.x += Math::Rand()*2.0f; speed.z += (Math::Rand()-0.5f)*2.0f; - + pos = Transform(*mat, pos); speed = Transform(*mat, speed)-pos; @@ -759,7 +759,7 @@ bool CMotionToto::EventFrame(const Event &event) speed.y -= (1.5f+Math::Rand()*1.5f) + vibLin.y; speed.x += (Math::Rand()-0.5f)*2.0f; speed.z += (Math::Rand()-0.5f)*2.0f; - + // mat = m_object->RetWorldMatrix(0); pos = Transform(*mat, pos); speed = Transform(*mat, speed)-pos; |