Guest User

Untitled

a guest
Apr 8th, 2012
52
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. --- /home/jordan/Desktop/jordan/celeron55-minetest-4232301/src/camera.cpp 2012-04-08 13:17:02.000000000 -0400
  2. +++ /home/jordan/Desktop/minetest/src/camera.cpp 2012-04-08 16:23:12.372768864 -0400
  3. @@ -320,13 +320,13 @@ void Camera::update(LocalPlayer* player,
  4. if (m_digging_button != -1)
  5. {
  6. f32 digfrac = m_digging_anim;
  7. - wield_position.X -= 30 * sin(pow(digfrac, 0.8f) * PI);
  8. - wield_position.Y += 15 * sin(digfrac * 2 * PI);
  9. - wield_position.Z += 5 * digfrac;
  10. + wield_position.X -= 55 * sin(pow(digfrac, 0.8f) * PI);
  11. + wield_position.Y += 24 * sin(digfrac * 1.3 * PI);
  12. + wield_position.Z += 30 * 0.5;
  13.  
  14. // Euler angles are PURE EVIL, so why not use quaternions?
  15. core::quaternion quat_begin(wield_rotation * core::DEGTORAD);
  16. - core::quaternion quat_end(v3f(90, -10, -130) * core::DEGTORAD);
  17. + core::quaternion quat_end(v3f(80, 30, 100) * core::DEGTORAD);
  18. core::quaternion quat_slerp;
  19. quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * PI));
  20. quat_slerp.toEuler(wield_rotation);
RAW Paste Data