X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fmath%2Fphysic.cpp;h=6276a09187daa2a733725e22c6d24bddd92a37d8;hb=3392b0f249cbb2d1151a145ab3a86b9389a0b36e;hp=09568f852b242f5faa58fd89a1401532a0b60639;hpb=9c511ea692d3a2339597211f08f18ea74fad35ec;p=supertux.git

diff --git a/lib/math/physic.cpp b/lib/math/physic.cpp
index 09568f852..6276a0918 100644
--- a/lib/math/physic.cpp
+++ b/lib/math/physic.cpp
@@ -18,10 +18,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
+#include <config.h>
+
 #include <cstdio>
 
 #include "math/physic.h"
-#include "special/timer.h"
+
+using namespace SuperTux;
 
 Physic::Physic()
     : ax(0), ay(0), vx(0), vy(0), gravity_enabled(true)
@@ -117,24 +120,18 @@ Physic::enable_gravity(bool enable_gravity)
   gravity_enabled = enable_gravity;
 }
 
-void
-Physic::apply(float elapsed_time, float &x, float &y, float& gravity)
+Vector
+Physic::get_movement(float elapsed_time)
 {
-  float grav;
-  if(gravity_enabled)
-    grav = gravity / 100.0;
-  else
-    grav = 0;
-
-  x += vx * elapsed_time + ax * elapsed_time * elapsed_time;
-  y += vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time;
+  float grav = gravity_enabled ? 1000 : 0;
+  
+  Vector result(
+      vx * elapsed_time + ax * elapsed_time * elapsed_time,
+      vy * elapsed_time + (ay + grav) * elapsed_time * elapsed_time
+  );
   vx += ax * elapsed_time;
-  vy += (ay + grav) * elapsed_time;
-}
+  vy += (ay + grav) * elapsed_time;  
 
-void
-Physic::apply(Vector& vector, float elapsed_time, float& gravity)
-{
-  apply(elapsed_time, vector.x, vector.y, gravity);
+  return result;
 }