diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
| commit | 77bd13f49fb974cb50918b18d166ab61240c0d34 (patch) | |
| tree | 2a824960ef146e23ca772c8dc0215e70f586ed8f /src/object/motion/motiontoto.cpp | |
| parent | 6a059b437dca706a72233a57ba4c22011aba6dde (diff) | |
| parent | c2a7375788aea0cf1c0f4c45e4823a8a9a85264d (diff) | |
| download | colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.gz colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.bz2 colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.zip | |
Merge branch 'dev-opengl' into dev
Diffstat (limited to 'src/object/motion/motiontoto.cpp')
| -rw-r--r-- | src/object/motion/motiontoto.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; |